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

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

29 files changed, 34 insertions, 34 deletions

diff --git a/mod/guidtool/views/default/forms/guidtool/export.php b/mod/guidtool/views/default/forms/guidtool/export.php
index fca6fb152..e2a583d6d 100644
--- a/mod/guidtool/views/default/forms/guidtool/export.php
+++ b/mod/guidtool/views/default/forms/guidtool/export.php
@@ -19,5 +19,5 @@
 	
 ?>
 <div id="export">
-<?php echo elgg_view('output/longtext', array('value' => htmlentities(file_get_contents($CONFIG->url . "export/$format/$entity_guid/"), null, 'UTF-8'))) ?>
+<?php echo elgg_view('output/longtext', array('value' => htmlentities(file_get_contents($CONFIG->url . "export/$format/$entity_guid/"), ENT_QUOTES, 'UTF-8'))) ?>
 </div>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index d6b82c831..ac278f7c1 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -19,7 +19,7 @@
 

 		if ($vars['entity'] instanceof ElggUser) {

 			

-		$name = htmlentities($vars['entity']->name, null, 'UTF-8');

+		$name = htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8');

 		$username = $vars['entity']->username;

 		

 		if ($icontime = $vars['entity']->icontime) {

@@ -77,7 +77,7 @@
 		

 	} 

 	

-	?><img src="<?php echo $vars['entity']->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> title="<?php echo htmlentities($vars['entity']->name, null, 'UTF-8'); ?>" <?php echo $vars['js']; ?> /><?php

+	?><img src="<?php echo $vars['entity']->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> title="<?php echo htmlentities($vars['entity']->name, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $vars['js']; ?> /><?php

 

 		if (!$override) {

 	

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
diff --git a/views/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php
index 2c9375bf1..5d1faac81 100644
--- a/views/default/messages/exceptions/exception.php
+++ b/views/default/messages/exceptions/exception.php
@@ -29,7 +29,7 @@ END;
 
 	if ($CONFIG->debug)
 	{
-		$details = autop(htmlentities(print_r($vars['object'], true), null, 'UTF-8'));
+		$details = autop(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
 		$body .= <<< END
 		<hr />
 		<p class="messages-exception-detail">
diff --git a/views/default/output/calendar.php b/views/default/output/calendar.php
index e31290e6a..d08c05cef 100644
--- a/views/default/output/calendar.php
+++ b/views/default/output/calendar.php
@@ -18,7 +18,7 @@
     if (is_int($vars['value'])) {
         echo date("F j, Y", $vars['value']);
     } else {
-        echo htmlentities($vars['value'], null, 'UTF-8');
+        echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
     }
 
 ?>
\ No newline at end of file
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 2ef3ad14b..a51e58af9 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -21,4 +21,4 @@
 	if (!$confirm)

 		$confirm = elgg_echo('question:areyousure');

 ?>

-<a href="<?php echo $vars['href']; ?>" onclick="return confirm('<?php echo addslashes($confirm); ?>');"><?php echo htmlentities($vars['text'], null, 'UTF-8'); ?></a>
\ No newline at end of file
+<a href="<?php echo $vars['href']; ?>" onclick="return confirm('<?php echo addslashes($confirm); ?>');"><?php echo htmlentities($vars['text'], ENT_QUOTES, 'UTF-8'); ?></a>
\ No newline at end of file
diff --git a/views/default/output/email.php b/views/default/output/email.php
index e6b406507..cad9a9348 100644
--- a/views/default/output/email.php
+++ b/views/default/output/email.php
@@ -16,6 +16,6 @@
 	 */

 

     if (!empty($vars['value'])) {

-    	echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlentities($vars['value'], null, 'UTF-8') ."</a>";

+    	echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlentities($vars['value'], ENT_QUOTES, 'UTF-8') ."</a>";

     }

 ?>
\ No newline at end of file
diff --git a/views/default/output/pulldown.php b/views/default/output/pulldown.php
index 8b1173842..1045d19be 100644
--- a/views/default/output/pulldown.php
+++ b/views/default/output/pulldown.php
@@ -15,5 +15,5 @@
 	 * 

 	 */

 

-    echo htmlentities($vars['value'], null, 'UTF-8'); //$vars['value'];

+    echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); //$vars['value'];

 ?>
\ No newline at end of file
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 43f7b80b0..463b25116 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -43,7 +43,7 @@
             if (!empty($cloud)) $cloud .= ", ";

             $size = round((log($tag->total) / log($max)) * 100) + 30;

             if ($size < 60) $size = 60;

-            $cloud .= "<a href=\"" . $vars['url'] . "search/?tag=". urlencode($tag->tag) . $object . $subtype . "\" style=\"font-size: {$size}%\" title=\"".addslashes($tag->tag)." ({$tag->total})\" style=\"text-decoration:none;\">" . htmlentities($tag->tag, null, 'UTF-8') . "</a>";

+            $cloud .= "<a href=\"" . $vars['url'] . "search/?tag=". urlencode($tag->tag) . $object . $subtype . "\" style=\"font-size: {$size}%\" title=\"".addslashes($tag->tag)." ({$tag->total})\" style=\"text-decoration:none;\">" . htmlentities($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";

         }

         echo $cloud;

 

diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index d3d9522bc..d437475f6 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -46,7 +46,7 @@
                $type = "";

            }

            if (is_string($tag)) { 

-               $tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}tag/".urlencode($tag) . "{$type}{$subtype}{$object}\">" . htmlentities($tag, null, 'UTF-8') . "</a>";

+               $tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}tag/".urlencode($tag) . "{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";

            }

         }

          echo $tagstr;

diff --git a/views/default/output/text.php b/views/default/output/text.php
index db7a5ea90..f2911f26d 100644
--- a/views/default/output/text.php
+++ b/views/default/output/text.php
@@ -15,5 +15,5 @@
 	 * 

 	 */

 

-    echo htmlentities($vars['value'], null, 'UTF-8'); // $vars['value'];

+    echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); // $vars['value'];

 ?>
\ No newline at end of file
diff --git a/views/default/output/url.php b/views/default/output/url.php
index af4582fba..07b5622bf 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -20,7 +20,7 @@
 	    if ((substr_count($val, "http://") == 0) && (substr_count($val, "https://") == 0)) {

 	        $val = "http://" . $val;

 	    }

-	    echo "<a href=\"{$val}\" target=\"_blank\">". htmlentities($val, null, 'UTF-8'). "</a>";

+	    echo "<a href=\"{$val}\" target=\"_blank\">". htmlentities($val, ENT_QUOTES, 'UTF-8'). "</a>";

     }

 

 ?>
\ No newline at end of file
diff --git a/views/failsafe/input/button.php b/views/failsafe/input/button.php
index ac1bfe784..4d0da9b72 100644
--- a/views/failsafe/input/button.php
+++ b/views/failsafe/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');
 	$name = $vars['internalname'];
 	$src = $vars['src'];
 	if (strpos($src,$CONFIG->wwwroot)===false) $src = ""; // blank src if trying to access an offsite image.
diff --git a/views/failsafe/input/checkboxes.php b/views/failsafe/input/checkboxes.php
index ccfa17982..a66b2a084 100644
--- a/views/failsafe/input/checkboxes.php
+++ b/views/failsafe/input/checkboxes.php
@@ -43,7 +43,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/failsafe/input/hidden.php b/views/failsafe/input/hidden.php
index 5d3015414..6fcd56e4a 100644
--- a/views/failsafe/input/hidden.php
+++ b/views/failsafe/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/failsafe/input/text.php b/views/failsafe/input/text.php
index 9f8ab79f7..94559afd6 100644
--- a/views/failsafe/input/text.php
+++ b/views/failsafe/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/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index c36be0baa..91fe35928 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -32,7 +32,7 @@
 	<p class="messages-exception-detail" style="background:#FDFFC3;display:block;padding:10px;">
 		<?php
 
-			echo nl2br(htmlentities(print_r($vars['object'], true), null, 'UTF-8'));
+			echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
 		
 		?>
 	</p>