Fixed validation error on the review form

Author: Bitwasp

application/controllers/reviews.php

@@ -111,7 +111,7 @@ public function form($auth_token = NULL, $order_id = NULL) {
 					$this->form_validation->set_rules('vendor_shipping', 'the orders shipping', 'callback_check_numeric_rating');
 					$this->form_validation->set_rules('vendor_comments_source', 'Comments Source', 'callback_check_comments_source');
 					if($this->input->post('vendor_comments_source') == 'prepared') 
-					$this->form_validation->set_rules('vendor_prepared_comments', 'Vendor Comments', 'callback_check_vendor_prepared_comments');					
+						$this->form_validation->set_rules('vendor_prepared_comments', 'Vendor Comments', 'callback_check_vendor_prepared_comments');					
 					// If user wishes to type in their own data?
 					if($this->input->post('vendor_comments_source') == 'input') 
 						$this->form_validation->set_rules('vendor_free_comments', 'Vendor Comments', 'max_length[150]|htmlentities');
@@ -145,6 +145,8 @@ public function form($auth_token = NULL, $order_id = NULL) {
 							}
 						} 
 
+						$full_item_post = $this->input->post("item");
+						
 						// If the review is the long format:
 						if($this->input->post('review_length') == 'long') {
 							$c = 0;
@@ -154,13 +156,14 @@ public function form($auth_token = NULL, $order_id = NULL) {
 								$this->form_validation->set_rules("item[{$c}][quality]", "item ".($c+1)."'s quality", 'callback_check_numeric_rating');
 								$this->form_validation->set_rules("item[{$c}][matches_desc]", "item ".($c+1)."'s matches description", 'callback_check_numeric_rating');
 								$this->form_validation->set_rules("item[{$c}][comments_source]", "item ".($c+1)."'s comments source", "callback_check_comments_source");
-								$item_post = $this->input->post("item[{$c}]");
+								
+								$item_post = $full_item_post[$c];
 								// Comments source will determine what rule to apply
 								if(isset($item_post['comments_source'])) {
-									if($item_post['comments_source'] == 'prepared') 
-										$this->form_validation->set_rules("item[{$c}][prepared_comments]", "item ".($c+1)."'s comments", "callback_check_prepared_comments");
-									if($item_post['comments_source'] == 'input') 
+									if($item_post['comments_source'] == 'input')
 										$this->form_validation->set_rules("item[{$c}][free_comments]", "item ".($c+1)."'s comments","max_length[150]|htmlentities");
+									if($item_post['comments_source'] == 'prepared') 
+										$this->form_validation->set_rules("item[{$c}][prepared_comments]", "item ".($c+1)."'s comments", "callback_check_item_prepared_comments");
 								}
 
 								if($this->form_validation->run() == TRUE) {
@@ -173,7 +176,7 @@ public function form($auth_token = NULL, $order_id = NULL) {
 							}
 						}
 					}
-					
+
 					// If the generated rules are adhered to, we can proceed to store the reviews.
 					if($this->form_validation->run() == TRUE) {
 						if($this->review_model->publish_reviews($all_reviews, 'buyer') == TRUE) {

application/views/accounts/view.php

@@ -42,7 +42,7 @@
 <?php if($reviews !== FALSE) { ?>
 			<div class='row-fluid'>
 				<div class='well'><strong>Recent Reviews</strong><br />
-				<?php echo anchor('reviews/view/user/'.$user['user_hash'], "[All Reviews ({$review_count['all']})]"); ?> <?php echo anchor('reviews/view/user/'.$user['user_hash'].'/0', "[Positive Reviews ({$review_count['positive']})]"); ?> <?php echo anchor('reviews/view/user/'.$user['user_hash'].'/1', "[Disputed Reviews {$review_count['disputed']}]"); ?>
+				<?php echo anchor('reviews/view/user/'.$user['user_hash'], "[All Reviews ({$review_count['all']})]"); ?> <?php echo anchor('reviews/view/user/'.$user['user_hash'].'/0', "[Positive Reviews ({$review_count['positive']})]"); ?> <?php echo anchor('reviews/view/user/'.$user['user_hash'].'/1', "[Disputed Orders {$review_count['disputed']}]"); ?>
 				<?php	foreach($reviews as $review) { ?>
 					<br /><div class='row-fluid'>
 						<div class='span3'><?php foreach($review['rating'] as $rating_name => $rating){ echo ucfirst($rating_name) ." - $rating/5<br />"; } ?>Average: <?php echo $review['average_rating']; ?></div>

application/views/reviews/form.php

@@ -37,7 +37,8 @@
 				<br />
 
 				<?php echo form_open($action_page, array('class' => 'form-horizontal')); ?>
-				<?php echo form_error('review_length'); ?>
+				
+				<?php echo validation_errors().form_error('review_length'); ?>
 					<div class='row-fluid'>
 						<div class='well' style='background-color:white;'>
 							<h4>Vendor Feedback</h4>
@@ -174,7 +175,7 @@
 								<div class='span7'>
 									<?php echo form_error("item[{$c}][comments_source]"); ?>
 									<input type='radio' name='item[<?php echo $c; ?>][comments_source]' value='prepared' /> Use prepared statements? <br />
-									<select name='item[<?php echo $c; ?>][comments_prepared]' autocomplete='off'>
+									<select name='item[<?php echo $c; ?>][prepared_comments]' autocomplete='off'>
 										<option value=''></option>
 										<option value='Did not match description.'>Did not match description.</option>
 										<option value='Poor quality.'>Poor quality.</option>

version.ini

@@ -1 +1 @@
-bitwasp_created_time=1393927781
+bitwasp_created_time=1393929543