Changeset 2717f9f in github

Timestamp:

Dec 11, 2009 11:53:54 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

7a05909

Parents:

f47e2dc

Message:

• use proper unicode cleanup for JSON, fixes #1486356

Location:

program

Files:

• include/rcube_json_output.php (modified) (2 diffs)
• include/rcube_shared.inc (modified) (2 diffs)
• include/rcube_template.php (modified) (1 diff)
• steps/mail/compose.inc (modified) (1 diff)
• steps/mail/func.inc (modified) (2 diffs)
• steps/mail/headers.inc (modified) (1 diff)

program/include/rcube_json_output.php

@@ -240 +240 @@
           $response['callbacks'] = $this->callbacks;
 
-        echo json_encode($response);
+        echo json_serialize($response);
     }
     
@@ -252 +252 @@
     {
         $out = '';
-        
+
         foreach ($this->commands as $i => $args) {
             $method = array_shift($args);
             foreach ($args as $i => $arg) {
-                $args[$i] = json_encode($arg);
+                $args[$i] = json_serialize($arg);
             }
 

program/include/rcube_shared.inc

@@ -511 +511 @@
   if (!is_string($input) || $input == '')
     return $input;
-  
+
   // iconv/mbstring are much faster (especially with long strings)
   if (function_exists('mb_convert_encoding') && ($res = mb_convert_encoding($input, 'UTF8', 'UTF8')))
@@ -564 +564 @@
 }
 
+
+/**
+ * Convert a variable into a javascript object notation
+ *
+ * @param mixed Input value
+ * @return string Serialized JSON string
+ */
+function json_serialize($input)
+{
+  $input = rc_utf8_clean($input);
+  
+  return json_encode($input);
+}
+
+
 /**
  * Explode quoted string

program/include/rcube_template.php

@@ -415 +415 @@
         $out = '';
         if (!$this->framed && !empty($this->js_env)) {
-            $out .= JS_OBJECT_NAME . '.set_env('.json_encode($this->js_env).");\n";
+            $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
         }
         foreach ($this->js_commands as $i => $args) {
             $method = array_shift($args);
             foreach ($args as $i => $arg) {
-                $args[$i] = json_encode($arg);
+                $args[$i] = json_serialize($arg);
             }
             $parent = $this->framed || preg_match('/^parent\./', $method);

program/steps/mail/compose.inc

@@ -506 +506 @@
       JQ(Q(rcube_label('revertto'))),
       JQ(Q(rcube_label('nospellerrors'))),
-      json_encode($spellcheck_langs),
+      json_serialize($spellcheck_langs),
       $lang,
       $attrib['id'],

program/steps/mail/func.inc

@@ -459 +459 @@
       $a_msg_flags['flagged'] = 1;
       
-    if ($browser->ie)
-      $a_msg_cols = rc_utf8_clean($a_msg_cols);
-    
     $OUTPUT->command('add_message_row',
       $header->uid,
@@ -523 +520 @@
   if (is_array($quota)) {
     $OUTPUT->add_script('$(document).ready(function(){
-        rcmail.set_quota('.json_encode($quota).')});', 'foot');
+        rcmail.set_quota('.json_serialize($quota).')});', 'foot');
     $quota = '';
     }

program/steps/mail/headers.inc

@@ -25 +25 @@
   if ($source)
     {
-    $browser = new rcube_browser;
-    
-    if ($browser->ie)
-      $source = rc_utf8_clean($source);   
-
     $source = htmlspecialchars(trim($source));
     $source = preg_replace('/\t/', '    ', $source);