Closes #651: I agree, changed to convert both quotes.

git-svn-id: https://code.elgg.org/elgg/trunk@2979 36083f99-b078-4883-b0ff-0f9b5a30f544

13 files changed, 17 insertions, 17 deletions

diff --git a/views/default/input/access.php b/views/default/input/access.php
index e08eca13a..68cfcce71 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -39,9 +39,9 @@
 

     foreach($vars['options'] as $key => $option) {

         if ($key != $vars['value']) {

-            echo "<option value=\"{$key}\">". htmlentities($option, null, 'UTF-8') ."</option>";

+            echo "<option value=\"{$key}\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

         } else {

-            echo "<option value=\"{$key}\" selected=\"selected\">". htmlentities($option, null, 'UTF-8') ."</option>";

+            echo "<option value=\"{$key}\" selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

         }

     }

 

diff --git a/views/default/input/button.php b/views/default/input/button.php
index 198f29dcf..72a1f653d 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -33,7 +33,7 @@
 		default: $type = 'submit';
 	}
 	
-	$value = htmlentities($vars['value'], null, 'UTF-8');
+	$value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
 	if (isset($vars['internalname'])) $name = $vars['internalname'];
 	if (isset($vars['src'])) $src = $vars['src'];
 	if (strpos($src,$CONFIG->wwwroot)===false) $src = ""; // blank src if trying to access an offsite image.
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index fefcecc2c..620ee9cbc 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -45,7 +45,7 @@
         
         $disabled = "";
         if ($vars['disabled']) $disabled = ' disabled="yes" '; 

-        echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, null, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";

+        echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";

     }

 

 ?> 
\ No newline at end of file
diff --git a/views/default/input/email.php b/views/default/input/email.php
index 9c1f9920a..d9516fd2b 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -21,4 +21,4 @@
 	if (!$class) $class = "input-text";

 ?>

 

-<input type="text" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file
+<input type="text" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file
diff --git a/views/default/input/hidden.php b/views/default/input/hidden.php
index 5d3015414..6fcd56e4a 100644
--- a/views/default/input/hidden.php
+++ b/views/default/input/hidden.php
@@ -17,4 +17,4 @@
 	 * 
 	 */
 ?>
-<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" /> 
\ No newline at end of file
+<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" /> 
\ No newline at end of file
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index ef7cd0efb..b199ef2aa 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -22,4 +22,4 @@
 	

 ?>

 

-<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea> 
\ No newline at end of file
+<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?></textarea> 
\ No newline at end of file
diff --git a/views/default/input/password.php b/views/default/input/password.php
index e93864bce..ecc02c365 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -21,4 +21,4 @@
 	if (!$class) $class = "input-password";

 ?>

 

-<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" class="<?php echo $class; ?>" /> 
\ No newline at end of file
+<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" /> 
\ No newline at end of file
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index 6b4fea344..a957940cf 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -22,4 +22,4 @@
 	

 ?>

 

-<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea> 
\ No newline at end of file
+<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?></textarea> 
\ No newline at end of file
diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 8d7d94e75..42a72259c 100644
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -32,9 +32,9 @@
 	{
 		foreach($vars['options_values'] as $value => $option) {
 	        if ($value != $vars['value']) {
-	            echo "<option value=\"$value\">". htmlentities($option, null, 'UTF-8') ."</option>";
+	            echo "<option value=\"$value\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";
 	        } else {
-	            echo "<option value=\"$value\" selected=\"selected\">". htmlentities($option, null, 'UTF-8') ."</option>";
+	            echo "<option value=\"$value\" selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";
 	        }
 	    }
 	}
@@ -42,9 +42,9 @@
 	{

 	    foreach($vars['options'] as $option) {

 	        if ($option != $vars['value']) {

-	            echo "<option>". htmlentities($option, null, 'UTF-8') ."</option>";

+	            echo "<option>". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

 	        } else {

-	            echo "<option selected=\"selected\">". htmlentities($option, null, 'UTF-8') ."</option>";

+	            echo "<option selected=\"selected\">". htmlentities($option, ENT_QUOTES, 'UTF-8') ."</option>";

 	        }

 	    }

 	}

diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index 8be62c752..6dfa3a7ae 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -33,7 +33,7 @@
         }
         
         if ($vars['disabled']) $disabled = ' disabled="yes" '; 

-        echo "<label><input type=\"radio\" $disabled {$vars['js']} name=\"{$vars['internalname']}\" value=\"".htmlentities($option, null, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";

+        echo "<label><input type=\"radio\" $disabled {$vars['js']} name=\"{$vars['internalname']}\" value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";

     }

 

 ?> 
\ No newline at end of file
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index c5d8454da..b3c69ae76 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -42,4 +42,4 @@
     }

     

 ?>

-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?><?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($tags, null, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file
+<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?><?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($tags, ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file
diff --git a/views/default/input/text.php b/views/default/input/text.php
index 9f8ab79f7..94559afd6 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -24,4 +24,4 @@
 	

 ?>

 

-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" class="<?php echo $class ?>"/> 
\ No newline at end of file
+<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/> 
\ No newline at end of file
diff --git a/views/default/input/url.php b/views/default/input/url.php
index 5de25f283..1bfe04fe4 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -21,4 +21,4 @@
 	if (!$class) $class = "input-url";

 ?>

 

-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file
+<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>"/> 
\ No newline at end of file