Changeset 2672 in subversion


Ignore:
Timestamp:
Jun 22, 2009 12:20:34 PM (4 years ago)
Author:
alec
Message:
  • use RCMAIL_CHARSET instead of hardcoded 'utf-8'
Location:
trunk/roundcubemail/program
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/include/rcube_html_page.php

    r2654 r2672  
    3030    protected $script_files = array(); 
    3131    protected $scripts = array(); 
    32     protected $charset = 'UTF-8'; 
     32    protected $charset = RCMAIL_CHARSET; 
    3333 
    3434    protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s\"></script>\n"; 
    … …  
    254254        $output = str_replace('$__skin_path', $base_path, $output); 
    255255 
    256         echo rcube_charset_convert($output, 'UTF-8', $this->charset); 
     256        if ($this->charset != RCMAIL_CHARSET) 
     257            echo rcube_charset_convert($output, RCMAIL_CHARSET, $this->charset); 
     258        else 
     259            echo $output; 
    257260    } 
    258261     

  • trunk/roundcubemail/program/include/rcube_imap.php

    r2651 r2672  
    26912691 
    26922692  /** 
    2693    * Convert body charset to UTF-8 according to the ctype_parameters 
     2693   * Convert body charset to RCMAIL_CHARSET according to the ctype_parameters 
    26942694   * 
    26952695   * @param string Part body to decode 

  • trunk/roundcubemail/program/include/rcube_json_output.php

    r2589 r2672  
    3030{ 
    3131    private $config; 
    32     private $charset = 'UTF-8'; 
     32    private $charset = RCMAIL_CHARSET; 
    3333    private $env = array(); 
    3434    private $texts = array(); 

  • trunk/roundcubemail/program/steps/addressbook/export.inc

    r2237 r2672  
    2727// send downlaod headers 
    2828send_nocacheing_headers(); 
    29 header('Content-Type: text/x-vcard; charset=UTF-8'); 
     29header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET); 
    3030header('Content-Disposition: attachment; filename="rcube_contacts.vcf"'); 
    3131 

  • trunk/roundcubemail/program/steps/mail/rss.inc

    r2223 r2672  
    5050// Send global XML output 
    5151header('Content-type: text/xml'); 
    52 echo '<?xml version="1.0" encoding="UTF-8"?> 
     52echo '<?xml version="1.0" encoding="'.RCMAIL_CHARSET.'"?> 
    5353        <rss version="2.0" 
    5454         xmlns:dc="http://purl.org/dc/elements/1.1/" 

  • trunk/roundcubemail/program/steps/mail/search.inc

    r2446 r2672  
    2222 
    2323// using encodeURI with javascript "should" give us 
    24 // a correctly UTF-8 encoded query string 
    25 $imap_charset = 'UTF-8'; 
     24// a correctly encoded query string 
     25$imap_charset = RCMAIL_CHARSET; 
    2626 
    2727// get search string 

  • trunk/roundcubemail/program/steps/mail/sendmail.inc

    r2604 r2672  
    312312  if (!empty($CONFIG['generic_message_footer'])) { 
    313313    $footer = file_get_contents(realpath($CONFIG['generic_message_footer'])); 
    314     $footer = rcube_charset_convert($footer, 'UTF-8', $message_charset); 
     314    $footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset); 
    315315  } 
    316316} 

  • trunk/roundcubemail/program/steps/mail/spell_pspell.inc

    r2445 r2672  
    5050 
    5151// send output 
    52 $out = '<?xml version="1.0" encoding="UTF-8"?><spellresult charschecked="'.rc_strlen($text).'">'; 
     52$out = '<?xml version="1.0" encoding="'.RCMAIL_CHARSET.'"?><spellresult charschecked="'.rc_strlen($text).'">'; 
    5353 
    5454$diff = 0; 
Note: See TracChangeset for help on using the changeset viewer.