Changeset ecb9fb0 in github

Timestamp:

Jun 22, 2009 12:20:34 PM (4 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

ad84f9c

Parents:

11b80e9

Message:

• use RCMAIL_CHARSET instead of hardcoded 'utf-8'

Location:

program

Files:

• include/rcube_html_page.php (modified) (2 diffs)
• include/rcube_imap.php (modified) (1 diff)
• include/rcube_json_output.php (modified) (1 diff)
• steps/addressbook/export.inc (modified) (1 diff)
• steps/mail/rss.inc (modified) (1 diff)
• steps/mail/search.inc (modified) (1 diff)
• steps/mail/sendmail.inc (modified) (1 diff)
• steps/mail/spell_pspell.inc (modified) (1 diff)

program/include/rcube_html_page.php

@@ -30 +30 @@
     protected $script_files = array();
     protected $scripts = array();
-    protected $charset = 'UTF-8';
+    protected $charset = RCMAIL_CHARSET;
 
     protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s\"></script>\n";
@@ -254 +254 @@
         $output = str_replace('$__skin_path', $base_path, $output);
 
-        echo rcube_charset_convert($output, 'UTF-8', $this->charset);
+        if ($this->charset != RCMAIL_CHARSET)
+            echo rcube_charset_convert($output, RCMAIL_CHARSET, $this->charset);
+        else
+            echo $output;
     }
     

program/include/rcube_imap.php

@@ -2691 +2691 @@
 
   /**
-   * Convert body charset to UTF-8 according to the ctype_parameters
+   * Convert body charset to RCMAIL_CHARSET according to the ctype_parameters
    *
    * @param string Part body to decode

program/include/rcube_json_output.php

@@ -30 +30 @@
 {
     private $config;
-    private $charset = 'UTF-8';
+    private $charset = RCMAIL_CHARSET;
     private $env = array();
     private $texts = array();

program/steps/addressbook/export.inc

@@ -27 +27 @@
 // send downlaod headers
 send_nocacheing_headers();
-header('Content-Type: text/x-vcard; charset=UTF-8');
+header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
 header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
 

program/steps/mail/rss.inc

@@ -50 +50 @@
 // Send global XML output
 header('Content-type: text/xml');
-echo '<?xml version="1.0" encoding="UTF-8"?>
+echo '<?xml version="1.0" encoding="'.RCMAIL_CHARSET.'"?>
         <rss version="2.0"
          xmlns:dc="http://purl.org/dc/elements/1.1/"

program/steps/mail/search.inc

@@ -22 +22 @@
 
 // using encodeURI with javascript "should" give us
-// a correctly UTF-8 encoded query string
-$imap_charset = 'UTF-8';
+// a correctly encoded query string
+$imap_charset = RCMAIL_CHARSET;
 
 // get search string

program/steps/mail/sendmail.inc

@@ -312 +312 @@
   if (!empty($CONFIG['generic_message_footer'])) {
     $footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
-    $footer = rcube_charset_convert($footer, 'UTF-8', $message_charset);
+    $footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset);
   }
 }

program/steps/mail/spell_pspell.inc

@@ -50 +50 @@
 
 // send output
-$out = '<?xml version="1.0" encoding="UTF-8"?><spellresult charschecked="'.rc_strlen($text).'">';
+$out = '<?xml version="1.0" encoding="'.RCMAIL_CHARSET.'"?><spellresult charschecked="'.rc_strlen($text).'">';
 
 $diff = 0;