Changeset 2608 in subversion

Timestamp:

Jun 5, 2009 2:08:46 AM (4 years ago)

Author:

alec

Message:

• fix rep_specialchars_output() performance, remove old 'charset' option use

Location:

trunk/roundcubemail/program/include

Files:

• main.inc (modified) (4 diffs)
• rcmail.php (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -446 +446 @@
   static $xml_rep_table = false;
 
-  $charset = rcmail::get_instance()->config->get('charset', RCMAIL_CHARSET);
-  $is_iso_8859_1 = false;
-  if ($charset == 'ISO-8859-1') {
-    $is_iso_8859_1 = true;
-  }
   if (!$enctype)
     $enctype = $OUTPUT->type;
-
-  // encode for plaintext
-  if ($enctype=='text')
-    return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);
 
   // encode for HTML output
@@ -487 +478 @@
     }
 
+  // encode for javascript use
+  if ($enctype=='js')
+    return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), strtr($str, $js_rep_table));
+
+  // encode for plaintext
+  if ($enctype=='text')
+    return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);
+
   if ($enctype=='url')
     return rawurlencode($str);
@@ -497 +496 @@
 
     for ($c=160; $c<256; $c++)  // can be increased to support more charsets
-      {
       $xml_rep_table[Chr($c)] = "&#$c;";
-      
-      if ($is_iso_8859_1)
-        $js_rep_table[Chr($c)] = sprintf("\\u%04x", $c);
-      }
 
     $xml_rep_table['"'] = '&quot;';
@@ -513 +507 @@
   if ($enctype=='xml')
     return strtr($str, $xml_rep_table);
-
-  // encode for javascript use
-  if ($enctype=='js')
-    {
-    if ($charset!='UTF-8')
-      $str = rcube_charset_convert($str, RCMAIL_CHARSET, $charset);
-      
-    return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), strtr($str, $js_rep_table));
-    }
 
   // no encoding given -> return original string

trunk/roundcubemail/program/include/rcmail.php

@@ -322 +322 @@
     $this->output->set_env('action', $this->action);
     $this->output->set_env('comm_path', $this->comm_path);
-    $this->output->set_charset($this->config->get('charset', RCMAIL_CHARSET));
+    $this->output->set_charset(RCMAIL_CHARSET);
 
     // add some basic label to client