Permalink
Browse files

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

Conflicts:
	views/vwm_question_template.php
  • Loading branch information...
2 parents 16859e9 + 3a81521 commit c078a1ed3241a7c92ef14dd35a1f92e8c492136c @vmichnowicz committed Apr 3, 2012
View
@@ -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
@@ -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>
@@ -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; ?>
@@ -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>
@@ -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">

0 comments on commit c078a1e

Please sign in to comment.