From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 29 Jul 2009 19:25:49 +0000 (-0600)
Subject: Use Horde::escapeJson()
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=32b8d7d18cb8987b1235005df6567d4d37e87950;p=horde.git

Use Horde::escapeJson()
---

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 7b0148a64..4684e9943 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -598,7 +598,7 @@ class IMP
             $js_params = array(
                 'dialog_load' => Horde::applicationUrl('ajax.php', true, -1) . '/FetchmailDialog'
             );
-            $menu->add('javascript:IMPDialog.display(\'' . self::escapeJSON($js_params) . '\')', _("Fetch Mail"), 'fetchmail.png');
+            $menu->add('javascript:IMPDialog.display(\'' . Horde::escapeJson($js_params, array('urlencode' => true)) . '\')', _("Fetch Mail"), 'fetchmail.png');
         }
 
         if ($prefs->getValue('filter_menuitem')) {
@@ -1208,18 +1208,6 @@ class IMP
     }
 
     /**
-     * Do necessary escaping to output JSON in a HTML parameter.
-     *
-     * @param mixed $json  The data to JSON-ify.
-     *
-     * @return string  The escaped string.
-     */
-    static public function escapeJSON($json)
-    {
-        return '/*-secure-' . rawurlencode(Horde_Serialize::serialize($json, Horde_Serialize::JSON, Horde_Nls::getCharset())) . '*/';
-    }
-
-    /**
      * Outputs the necessary script tags, honoring local configuration
      * choices as to script caching.
      */
@@ -1588,7 +1576,7 @@ class IMP
             'cancel_text' => _("Cancel")
         );
 
-        return 'IMPDialog.display(\'' . self::escapeJSON($js_params) . '\')';
+        return 'IMPDialog.display(\'' . Horde::escapeJson($js_params, array('urlencode' => true)) . '\')';
     }
 
     /**