Changeset 147 in subversion for trunk/roundcubemail/program/steps/mail/sendmail.inc

Timestamp:

Feb 20, 2006 6:29:14 PM (7 years ago)

Author:

roundcube

Message:

Fixed some charset bugs

File:

• trunk/roundcubemail/program/steps/mail/sendmail.inc (modified) (6 diffs)

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

@@ -40 +40 @@
 function rcmail_get_identity($id)
   {
-  global $DB;
+  global $DB, $CHARSET, $OUTPUT;
   
   // get identity record
@@ -54 +54 @@
     $sql_arr = $DB->fetch_assoc($sql_result);
     $out = $sql_arr;
-    $out['string'] = sprintf('%s <%s>', $sql_arr['name'], $sql_arr['mailto']);
+    $out['string'] = sprintf('%s <%s>',
+                             rcube_charset_convert($sql_arr['name'], $CHARSET, $OUTPUT->get_charset()),
+                             $sql_arr['mailto']);
     return $out;
     }
@@ -75 +77 @@
 
 // set default charset
-if (empty($CHARSET))
-  $CHARSET = 'ISO-8859-1';
-
-$input_charset = $CHARSET;
+$input_charset = $OUTPUT->get_charset();
 $message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;
 
@@ -163 +162 @@
 
 // use the configured delimiter for headers
-$header_delm = $rcmail_config['mail_header_delimiter'] ? $rcmail_config['mail_header_delimiter'] : "\r\n";
+$header_delm = $CONFIG['mail_header_delimiter'] ? $CONFIG['mail_header_delimiter'] : "\r\n";
 
 // create PEAR::Mail_mime instance
@@ -199 +198 @@
 
 $msg_subject = $headers['Subject'];
-global $MBSTRING;
-if ($MBSTRING&&function_exists( "mb_encode_mimeheader"))
-  $headers['Subject'] = mb_encode_mimeheader( $headers['Subject'],$message_charset);
+
+if ($MBSTRING && function_exists("mb_encode_mimeheader"))
+  $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset);
 
 // send thru SMTP server using cusotm SMTP library
@@ -239 +238 @@
   {
   // unset some headers because they will be added by the mail() function
+  $headers_enc = $MAIL_MIME->headers($headers);
   $headers_php = $MAIL_MIME->_headers;
-  $headers_enc = $MAIL_MIME->headers($headers);
   unset($headers_php['To'], $headers_php['Subject']);
-
+  
   // reset stored headers and overwrite
   $MAIL_MIME->_headers = array();
   $header_str = $MAIL_MIME->txtHeaders($headers_php);
 
-  if(ini_get('safe_mode'))
+  if (ini_get('safe_mode'))
     $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
   else