Merge branch 'master' of github.com:vmichnowicz/vwm_surveys into develop

Conflicts: views/vwm_question_template.php
vmichnowicz · Apr 3, 2012 · c078a1e · c078a1e
2 parents 16859e9 + 3a81521
commit c078a1e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,10 @@ VWM Surveys is licensed under the [Apache 2 License](http://www.apache.org/licen
 
 ## Change Log
 
+### 0.3.5
+
+* Added URL encoding for checkbox, radio matrix, and radio question types
+
 ### 0.3.4
 
 * Fixed MySQL default value bug for survey questions

diff --git a/views/questions_edit/vwm_checkboxes_edit.php b/views/questions_edit/vwm_checkboxes_edit.php
@@ -3,7 +3,7 @@
 	<?php if (isset($options['checkboxes'])): ?>
 		<?php foreach($options['checkboxes'] as $key => $checkbox): ?>
 			<li>
-				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][checkboxes][<?php echo $key; ?>][text]" value="<?php echo $checkbox['text']; ?>"/>
+				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][checkboxes][<?php echo $key; ?>][text]" value="<?php echo htmlspecialchars($checkbox['text'], ENT_QUOTES, 'UTF-8'); ?>"/>
 				<select name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][checkboxes][<?php echo $key; ?>][type]">
 					<?php if ($checkbox['type'] == 'defined'): ?>
 						<option value="defined" selected="selected">Defined</option>

diff --git a/views/questions_edit/vwm_radio_matrix_edit.php b/views/questions_edit/vwm_radio_matrix_edit.php
@@ -4,7 +4,7 @@
 	<?php if (isset($options['x'])): ?>
 		<?php foreach ($options['x'] as $key => $option): ?>
 			<li>
-				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][x][<?php echo $key; ?>][text]" value="<?php echo $option['text']; ?>" />
+				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][x][<?php echo $key; ?>][text]" value="<?php echo htmlspecialchars($option['text'], ENT_QUOTES, 'UTF-8'); ?>" />
 				<input type="button" class="remove" value="Remove" />
 			</li>
 		<?php endforeach; ?>
@@ -17,7 +17,7 @@
 	<?php if (isset($options['y'])): ?>
 		<?php foreach ($options['y'] as $key => $option): ?>
 			<li>
-				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][y][<?php echo $key; ?>][text]" value="<?php echo $option['text']; ?>" />
+				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][y][<?php echo $key; ?>][text]" value="<?php echo htmlspecialchars($option['text'], ENT_QUOTES, 'UTF-8'); ?>" />
 				<input type="button" class="remove" value="Remove" />
 			</li>
 		<?php endforeach; ?>

diff --git a/views/questions_edit/vwm_radios_edit.php b/views/questions_edit/vwm_radios_edit.php
@@ -3,7 +3,7 @@
 	<?php if (isset($options['radios'])): ?>
 		<?php foreach($options['radios'] as $key => $radio): ?>
 			<li>
-				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][radios][<?php echo $key; ?>][text]" value="<?php echo $radio['text']; ?>"/>
+				<input type="text" name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][radios][<?php echo $key; ?>][text]" value="<?php echo htmlspecialchars($radio['text'], ENT_QUOTES, 'UTF-8'); ?>"/>
 				<select name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][options][radios][<?php echo $key; ?>][type]">
 					<?php if ($radio['type'] == 'defined'): ?>
 						<option value="defined" selected="selected">Defined</option>

diff --git a/views/vwm_question_template.php b/views/vwm_question_template.php
@@ -1,7 +1,7 @@
 <!-- Question title -->
 <label class="question_title">
 	<span>Title:</span>
-	<textarea name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][title]" cols="64" rows="3"><?php echo $question['title']; ?></textarea>
+	<textarea name="vwm_surveys_pages[<?php echo $page_number; ?>][questions][<?php echo $question_number; ?>][title]" cols="64" rows="3"><?php echo htmlspecialchars($question['title'], ENT_QUOTES, 'UTF-8'); ?></textarea>
 </label>
 
 <div class="question_controls">