From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001 From: yllar <yllar.pajus@gmail.com> Date: Sat, 16 Dec 2006 13:25:16 -0500 Subject: [PATCH] updated ja and fr translations --- program/steps/mail/sendmail.inc | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 3e368ee..98f413c 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -101,22 +101,20 @@ $pos + strlen($searchstr), $pos2 - ($pos + strlen($searchstr))); -write_log('emoticon', "looking for $image_name in array:" . print_r($included_images, true)); + $body_post = substr($body, $pos2); if (! in_array($image_name, $included_images)) { - $body_post = substr($body, $pos2); - // add the image to the MIME message $img_file = $INSTALL_PATH . '/' . $searchstr . $image_name; if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name)) { show_message("emoticonerror", 'error'); } - - $body = $body_pre . 'cid:_' . $image_name . $body_post; array_push($included_images, $image_name); } + + $body = $body_pre . 'cid:_' . $image_name . $body_post; $last_img_pos = $pos2; } @@ -168,8 +166,8 @@ $identity_arr['string'] = $from; // compose headers array -$headers = array('Date' => date('D, j M Y G:i:s O'), - 'From' => $identity_arr['string'], +$headers = array('Date' => date('D, j M Y H:i:s O'), + 'From' => rcube_charset_convert($identity_arr['string'], $CHARSET, $message_charset), 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset)); // additional recipients @@ -297,12 +295,17 @@ 'text_charset' => $message_charset); // compose message body and get headers -$msg_body = &$MAIL_MIME->get($message_param); +$msg_body = $MAIL_MIME->get($message_param); +// unset to save memory. +unset($MAIL_MIME->_parts); $msg_subject = $headers['Subject']; if ($MBSTRING && function_exists("mb_encode_mimeheader")) - $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset); +{ + mb_internal_encoding($CHARSET); + $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q'); +} // Begin SMTP Delivery Block if (!$savedraft) { @@ -326,7 +329,8 @@ $header_str = $MAIL_MIME->txtHeaders($send_headers); // send message - $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body); + $smtp_response = array(); + $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body, $smtp_response); // log error if (!$sent) @@ -335,7 +339,7 @@ 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__, - 'message' => "SMTP error: $SMTP_ERROR"), TRUE, FALSE); + 'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE); } } @@ -448,12 +452,12 @@ { if ($CONFIG['smtp_log']) { - $log_entry = sprintf("[%s] User: %d on %s; Message for %s; Subject: %s\n", + $log_entry = sprintf("[%s] User: %d on %s; Message for %s; %s\n", date("d-M-Y H:i:s O", mktime()), $_SESSION['user_id'], $_SERVER['REMOTE_ADDR'], $mailto, - $msg_subject); + !empty($smtp_response) ? join('; ', $smtp_response) : ''); if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a')) { -- Gitblit v1.9.1