extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed charset-detection from lang('charset') to translation::charset()

Browse Source
This commit is contained in:
Ralf Becker 2003-11-03 10:35:32 +00:00
parent 8ee52d717c
commit cccbba347d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.send.inc.php
View File

@ -37,6 +37,7 @@
$this->err['code'] = ' '; $this->err['code'] = ' ';
$this->err['msg'] = ' '; $this->err['msg'] = ' ';
$this->err['desc'] = ' '; $this->err['desc'] = ' ';
$this->charset = $GLOBALS['phpgw']->translation->charset();
} }
function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='', $content_type='', $boundary='Message-Boundary') function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='', $content_type='', $boundary='Message-Boundary')
@ -96,7 +97,7 @@
. 'Content-Type: multipart/mixed;'."\n" . 'Content-Type: multipart/mixed;'."\n"
. " boundary=\"$boundary\"\n\n" . " boundary=\"$boundary\"\n\n"
. "--$boundary\n" . "--$boundary\n"
. 'Content-type: text/' .$content_type . '; charset="'.lang('charset').'"'."\n"; . 'Content-type: text/' .$content_type . '; charset="'.$this->charset.'"'."\n";
// if (!empty($msgtype)) // if (!empty($msgtype))
// { // {
// $header .= "Content-type: text/' .$content_type . '; phpgw-type=".$msgtype."\n"; // $header .= "Content-type: text/' .$content_type . '; phpgw-type=".$msgtype."\n";
@ -111,7 +112,7 @@
{ {
$header .= 'Subject: '.stripslashes($subject)."\n" $header .= 'Subject: '.stripslashes($subject)."\n"
. 'MIME-version: 1.0'."\n" . 'MIME-version: 1.0'."\n"
. 'Content-type: text/' .$content_type . '; charset="'.lang('charset').'"'."\n"; . 'Content-type: text/' .$content_type . '; charset="'.$this->charset.'"'."\n";
if (!empty($msgtype)) if (!empty($msgtype))
{ {
$header .= 'Content-type: text/' .$content_type . '; phpgw-type='.$msgtype."\n"; $header .= 'Content-type: text/' .$content_type . '; phpgw-type='.$msgtype."\n";
@ -199,7 +200,7 @@
if ($enc_start == $w+1) // first word to encode if ($enc_start == $w+1) // first word to encode
{ {
$str .= '=?'.lang('charset').'?Q?'; $str .= '=?'.$this->charset.'?Q?';
} }
$str .= $w+1 > $enc_end ? str_replace('=3D','=',$s) : $s; $str .= $w+1 > $enc_end ? str_replace('=3D','=',$s) : $s;