- use RCMAIL_CHARSET instead of hardcoded 'utf-8'

release-0.6
alecpl 16 years ago
parent 11b80e9e33
commit ecb9fb058d

@ -29,7 +29,7 @@ class rcube_html_page
protected $scripts_path = '';
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";
protected $script_tag = "<script type=\"text/javascript\">\n/* <![CDATA[ */\n%s\n/* ]]> */\n</script>";
@ -253,7 +253,10 @@ class rcube_html_page
$output = preg_replace_callback('!(src|href)=(["\']?)([a-z0-9/_.-]+.(css|js))(["\'\s>])!i', array($this, 'add_filemtime'), $output);
$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;
}
/**

@ -2690,7 +2690,7 @@ class rcube_imap
/**
* 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
* @param string Charset to convert from

@ -29,7 +29,7 @@
class rcube_json_output
{
private $config;
private $charset = 'UTF-8';
private $charset = RCMAIL_CHARSET;
private $env = array();
private $texts = array();
private $commands = array();

@ -26,7 +26,7 @@ $result = $CONTACTS->list_records();
// 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"');
while ($result && ($row = $result->next())) {

@ -49,7 +49,7 @@ $sort_order = 'DESC';
// 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/"
xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"

@ -21,8 +21,8 @@ $IMAP->set_search_set(NULL);
$_SESSION['page'] = 1;
// 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
$str = get_input_value('_q', RCUBE_INPUT_GET);

@ -311,7 +311,7 @@ if (!$savedraft) {
// generic footer for all messages
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);
}
}

@ -49,7 +49,7 @@ $words = preg_split('/[ !"#$%&()*+\\,-.\/\n:;<=>?@\[\]^_{|}]+/', $text, NULL, P
$plink = pspell_new(get_input_value('lang', RCUBE_INPUT_GET), null, null, RCMAIL_CHARSET, PSPELL_FAST);
// 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;
foreach ($words as $w) {

Loading…
Cancel
Save