Escape HTML output and add vim syntax hint.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7267 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/squirrelspell/modules/check_me.mod b/plugins/squirrelspell/modules/check_me.mod
index 66ff26065213d7fb7ab2ecd101b59fc349f0847f..ebc1dc1ff8790201f41c928f9c01827adb966ff5 100644 (file)
--- a/plugins/squirrelspell/modules/check_me.mod
+++ b/plugins/squirrelspell/modules/check_me.mod
@@ -116,7 +116,7 @@ if ($sqspell_exitcode){
   $msg= "<div align='center'>"
      . sprintf(_("I tried to execute '%s', but it returned:"),
                $sqspell_command) . "<pre>"
-     . nl2br(join("\n", $sqspell_output)) . "</pre>"
+     . join("\n", htmlspecialchars($sqspell_output)) . "</pre>"
      . "<form onsubmit=\"return false\">"
      . "<input type=\"submit\" value=\"  " . _("Close")
      . "  \" onclick=\"self.close()\"></form></div>";
@@ -442,5 +442,6 @@ if ($errors){
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
 ?>

diff --git a/plugins/squirrelspell/modules/crypto.mod b/plugins/squirrelspell/modules/crypto.mod
index cabd5c7322a28ead273b7d52f2259b60a153fef2..f06ab0491265422c889a5c23b9972bbc4c6d8977 100644 (file)
--- a/plugins/squirrelspell/modules/crypto.mod
+++ b/plugins/squirrelspell/modules/crypto.mod
@@ -70,6 +70,7 @@ sqspell_makePage( _("Personal Dictionary Crypto Settings"), null, $msg);
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
 
 ?>

diff --git a/plugins/squirrelspell/modules/crypto_badkey.mod b/plugins/squirrelspell/modules/crypto_badkey.mod
index 72203cc181249440201163f777c9fed0630cdc0f..b817f531bfe9470d1ae00295d0ed815af670f702 100644 (file)
--- a/plugins/squirrelspell/modules/crypto_badkey.mod
+++ b/plugins/squirrelspell/modules/crypto_badkey.mod
@@ -92,5 +92,6 @@ if ($old_key){
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */    
 ?>

diff --git a/plugins/squirrelspell/modules/edit_dic.mod b/plugins/squirrelspell/modules/edit_dic.mod
index d96fe3220eb0500c8f8282889010038b2c9f8e90..ffbad5684c83fa88470846b8a127936b2581cb04 100644 (file)
--- a/plugins/squirrelspell/modules/edit_dic.mod
+++ b/plugins/squirrelspell/modules/edit_dic.mod
@@ -82,7 +82,8 @@ if (!$words){
          $msg .= "</td><td valign=\"top\">\n";
        }
        $msg .= "<input type=\"checkbox\" name=\"words_ary[]\" "
-          . "value=\"$words_ary[$j]\"> $words_ary[$j]<br>";
+          . 'value="'.htmlspecialchars($words_ary[$j]). '"> '
+           . htmlspecialchars($words_ary[$j]) . "<br>\n";
       }
       $msg .= '</td></tr></table></td></tr>'
         . "<tr bgcolor=\"$color[0]\" align=\"center\"><td>"
@@ -108,6 +109,7 @@ if (!$words){
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
 
 ?>

diff --git a/plugins/squirrelspell/modules/enc_setup.mod b/plugins/squirrelspell/modules/enc_setup.mod
index cfdd783ac7b4b62d77eeb0fc2372bb32d837d7ad..0feb306717d11dc09d96e1cf3f457d433fa2e501 100644 (file)
--- a/plugins/squirrelspell/modules/enc_setup.mod
+++ b/plugins/squirrelspell/modules/enc_setup.mod
@@ -81,6 +81,7 @@ sqspell_makePage(_("Personal Dictionary Crypto Settings"),
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */ 
 
 ?>

diff --git a/plugins/squirrelspell/modules/forget_me.mod b/plugins/squirrelspell/modules/forget_me.mod
index 24a5421d181b0bd68fa9b7b9f6486352deb7f75b..f33a69f1770d04f516b952e21ab1a1396178316f 100644 (file)
--- a/plugins/squirrelspell/modules/forget_me.mod
+++ b/plugins/squirrelspell/modules/forget_me.mod
@@ -37,7 +37,7 @@ if (sizeof($words_ary)){
      * Remove word by word...
      */
     $lang_words=str_replace("$words_ary[$i]\n", "", $lang_words);
-    $msg .= "<li>$words_ary[$i]</li>\n";
+    $msg .= '<li>' . htmlspecialchars($words_ary[$i]) . "</li>\n";
   }
   $new_words_ary=split("\n", $lang_words);
   /**
@@ -87,5 +87,6 @@ if (sizeof($words_ary)){
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */    
 ?>

diff --git a/plugins/squirrelspell/modules/forget_me_not.mod b/plugins/squirrelspell/modules/forget_me_not.mod
index b74b2fcbaa1d741cf97a11caf085f4df27864837..cbfd5611b56a6675212a82bb5bd60530c76327a0 100644 (file)
--- a/plugins/squirrelspell/modules/forget_me_not.mod
+++ b/plugins/squirrelspell/modules/forget_me_not.mod
@@ -79,6 +79,7 @@ sqspell_makeWindow($onload, _("Personal Dictionary Updated"), null, $msg);
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
 
 ?>

diff --git a/plugins/squirrelspell/modules/init.mod b/plugins/squirrelspell/modules/init.mod
index 0a44899fda9e93c3981d6633d8dd978254c245b9..4b8d3d8da431d267a438af1eb53150a2a6c93b70 100644 (file)
--- a/plugins/squirrelspell/modules/init.mod
+++ b/plugins/squirrelspell/modules/init.mod
@@ -61,6 +61,7 @@ sqspell_makeWindow($onload, _("SquirrelSpell Initiating"), "init.js", $msg);
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
     
 ?>

diff --git a/plugins/squirrelspell/modules/lang_change.mod b/plugins/squirrelspell/modules/lang_change.mod
index 8f1805067dc7ab1fa938ca8a3b198952883a8f48..909b0441b9878a96d13e15db5c23ae6972e065bc 100644 (file)
--- a/plugins/squirrelspell/modules/lang_change.mod
+++ b/plugins/squirrelspell/modules/lang_change.mod
@@ -99,5 +99,6 @@ sqspell_makePage(_("International Dictionaries Preferences Updated"),
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
 ?>

diff --git a/plugins/squirrelspell/modules/lang_setup.mod b/plugins/squirrelspell/modules/lang_setup.mod
index 25013f8bc6bb4ad8669e36614a62b494cc028882..36c445d69179401099f4dfd610a165cb653de917 100644 (file)
--- a/plugins/squirrelspell/modules/lang_setup.mod
+++ b/plugins/squirrelspell/modules/lang_setup.mod
@@ -54,6 +54,7 @@ sqspell_makePage(_("Add International Dictionaries"), null, $msg);
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
  
 ?>

diff --git a/plugins/squirrelspell/modules/options_main.mod b/plugins/squirrelspell/modules/options_main.mod
index ea58a26bc04872f9860a910c5a73ce9655eb51b6..8ebe5193f19f5d1c69627442428df62466f536d9 100644 (file)
--- a/plugins/squirrelspell/modules/options_main.mod
+++ b/plugins/squirrelspell/modules/options_main.mod
@@ -52,5 +52,6 @@ sqspell_makePage( _("SquirrelSpell Options Menu"), null, $msg);
  * Local variables:
  * mode: php
  * End:
+ * vim: syntax=php
  */
 ?>