From f5121b5639992fc9e51fd551bac2254429b638fa Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 04 Mar 2006 08:43:25 -0500
Subject: [PATCH] Updated localizations
---
program/steps/mail/sendmail.inc | 182 +++++++++++++++++++++++++++++++--------------
1 files changed, 125 insertions(+), 57 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index e335931..70baba0 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -21,13 +21,14 @@
*/
-require_once('lib/smtp.inc');
+//require_once('lib/smtp.inc');
+require_once('include/rcube_smtp.inc');
require_once('Mail/mime.php');
if (!isset($_SESSION['compose']['id']))
{
- $_action = 'list';
+ rcmail_overwrite_action('list');
return;
}
@@ -38,23 +39,23 @@
function rcmail_get_identity($id)
{
- global $DB;
+ global $DB, $CHARSET, $OUTPUT;
// get identity record
- $sql_result = $DB->query(sprintf("SELECT *, email AS mailto
- FROM %s
- WHERE identity_id=%d
- AND user_id=%d
- AND del!='1'",
- get_table_name('identities'),
- $id,
- $_SESSION['user_id']));
+ $sql_result = $DB->query("SELECT *, email AS mailto
+ FROM ".get_table_name('identities')."
+ WHERE identity_id=?
+ AND user_id=?
+ AND del<>1",
+ $id,$_SESSION['user_id']);
if ($DB->num_rows($sql_result))
{
$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;
}
@@ -66,10 +67,23 @@
/****** check submission and compose message ********/
-$mailto_regexp = '/,\s*$/';
+if (empty($_POST['_to']) && empty($_POST['_subject']) && $_POST['_message'])
+ {
+ show_message("sendingfailed", 'error');
+ rcmail_overwrite_action('compose');
+ return;
+ }
-// trip ending ', ' from
-$mailto = preg_replace($mailto_regexp, '', $_POST['_to']);
+
+// set default charset
+$input_charset = $OUTPUT->get_charset();
+$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;
+
+$mailto_regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m');
+$mailto_replace = array(', ', ', ', '');
+
+// repalce new lines and strip ending ', '
+$mailto = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset));
// decode address strings
$to_address_arr = $IMAP->decode_address_list($mailto);
@@ -87,32 +101,34 @@
// compose headers array
$headers = array('Date' => date('D, j M Y G:i:s O'),
'From' => $identity_arr['string'],
- 'To' => $mailto);
+ 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset));
// additional recipients
-if ($_POST['_cc'])
- $headers['Cc'] = preg_replace($mailto_regexp, '', $_POST['_cc']);
+if (!empty($_POST['_cc']))
+ $headers['Cc'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset));
-if ($_POST['_bcc'])
- $headers['Bcc'] = preg_replace($mailto_regexp, '', $_POST['_bcc']);
+if (!empty($_POST['_bcc']))
+ $headers['Bcc'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset));
-if (strlen($identity_arr['bcc']))
+if (!empty($identity_arr['bcc']))
$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
// add subject
-$headers['Subject'] = trim(stripslashes($_POST['_subject']));
+$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, FALSE, $message_charset));
-if (strlen($identity_arr['organization']))
+if (!empty($identity_arr['organization']))
$headers['Organization'] = $identity_arr['organization'];
-if (strlen($identity_arr['reply-to']))
+if (!empty($identity_arr['reply-to']))
$headers['Reply-To'] = $identity_arr['reply-to'];
-if ($_SESSION['compose']['reply_msgid'])
+if (!empty($_SESSION['compose']['reply_msgid']))
$headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
+if (!empty($_SESSION['compose']['references']))
+ $headers['References'] = $_SESSION['compose']['references'];
-if ($_POST['_priority'])
+if (!empty($_POST['_priority']))
{
$priority = (int)$_POST['_priority'];
$a_priorities = array(1=>'lowest', 2=>'low', 4=>'high', 5=>'highest');
@@ -125,14 +141,32 @@
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;
-if ($CONFIG['useragent'])
+if (!empty($CONFIG['useragent']))
$headers['User-Agent'] = $CONFIG['useragent'];
+// fetch message body
+$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
+
+// append generic footer to all messages
+if (!empty($CONFIG['generic_message_footer']))
+ {
+ $file = realpath($CONFIG['generic_message_footer']);
+ if($fp = fopen($file, 'r'))
+ {
+ $content = fread($fp, filesize($file));
+ fclose($fp);
+ $message_body .= "\r\n" . rcube_charset_convert($content, 'UTF-8', $message_charset);
+ }
+ }
+
+
+// use the configured delimiter for headers
+$header_delm = $CONFIG['mail_header_delimiter'] ? $CONFIG['mail_header_delimiter'] : "\r\n";
// create PEAR::Mail_mime instance
-$MAIL_MIME = new Mail_mime();
-$MAIL_MIME->setTXTBody(stripslashes($_POST['_message']), FALSE, TRUE);
-//$MAIL_MIME->setTXTBody(wordwrap(stripslashes($_POST['_message'])), FALSE, TRUE);
+$MAIL_MIME = new Mail_mime($header_delm);
+$MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
+//$MAIL_MIME->setTXTBody(wordwrap($message_body), FALSE, TRUE);
// add stored attachments, if any
@@ -147,38 +181,55 @@
$MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], TRUE);
+// chose transfer encoding
+$charset_7bit = array('ASCII', 'ISO-2022-JP', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-15');
+$transfer_encoding = in_array(strtoupper($message_charset), $charset_7bit) ? '7bit' : '8bit';
+
+// encoding settings for mail composing
+$message_param = array('text_encoding' => $transfer_encoding,
+ 'html_encoding' => 'quoted-printable',
+ 'head_encoding' => 'quoted-printable',
+ 'head_charset' => $message_charset,
+ 'html_charset' => $message_charset,
+ 'text_charset' => $message_charset);
+
// compose message body and get headers
-$msg_body = $MAIL_MIME->get();
+$msg_body = $MAIL_MIME->get($message_param);
+
$msg_subject = $headers['Subject'];
+if ($MBSTRING && function_exists("mb_encode_mimeheader"))
+ $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset);
// send thru SMTP server using cusotm SMTP library
if ($CONFIG['smtp_server'])
{
- // connect to SMTP server
- $smtp_conn = smtp_connect($CONFIG['smtp_server'], '25', $CONFIG['smtp_user'], $CONFIG['smtp_pass']);
-
- if ($smtp_conn)
- {
- // generate list of recipients
- $recipients = $mailto.', '.$headers['Cc'].', '.$headers['Bcc'];
- $a_recipients = smtp_expand($recipients);
+ // generate list of recipients
+ $a_recipients = array($mailto);
- // generate message headers
- $header_str = $MAIL_MIME->txtHeaders($headers);
-
- // send message
- $sent = smtp_mail($smtp_conn, $from, $a_recipients, $header_str."\r\n".$msg_body, FALSE);
- }
-
+ if (strlen($headers['Cc']))
+ $a_recipients[] = $headers['Cc'];
+ if (strlen($headers['Bcc']))
+ $a_recipients[] = $headers['Bcc'];
+
+ // clean Bcc from header for recipients
+ $send_headers = $headers;
+ unset($send_headers['Bcc']);
+
+ // generate message headers
+ $header_str = $MAIL_MIME->txtHeaders($send_headers);
+
+ // send message
+ $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body);
+
// log error
- if (!$smtp_conn || !$sent)
+ if (!$sent)
{
raise_error(array('code' => 800,
'type' => 'smtp',
'line' => __LINE__,
'file' => __FILE__,
- 'message' => "Connection failed: $smtp_error"), TRUE, FALSE);
+ 'message' => "SMTP error: $SMTP_ERROR"), TRUE, FALSE);
}
}
@@ -186,20 +237,26 @@
else
{
// unset some headers because they will be added by the mail() function
- $headers_php = $headers;
+ $headers_enc = $MAIL_MIME->headers($headers);
+ $headers_php = $MAIL_MIME->_headers;
unset($headers_php['To'], $headers_php['Subject']);
-
+
+ // reset stored headers and overwrite
+ $MAIL_MIME->_headers = array();
$header_str = $MAIL_MIME->txtHeaders($headers_php);
- $sent = mail($mailto, $msg_subject, $msg_body, $header_str, "-f$from");
+
+ if (ini_get('safe_mode'))
+ $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
+ else
+ $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
}
// return to compose page if sending failed
if (!$sent)
{
- $_action = 'compose';
- $OUTPUT->add_script(sprintf("\n%s.set_env('action', '%s');", $JS_OBJECT_NAME, $_action));
show_message("sendingfailed", 'error');
+ rcmail_overwrite_action('compose');
return;
}
@@ -217,23 +274,34 @@
// check if mailbox exists
if (!in_array_nocase($CONFIG['sent_mbox'], $IMAP->list_mailboxes()))
- $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE);
+ $mbox = $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE);
+ else
+ $mbox = TRUE;
// append message to sent box
- $saved = $IMAP->save_message($CONFIG['sent_mbox'], $header_str."\r\n".$msg_body);
+ if ($mbox)
+ $saved = $IMAP->save_message($CONFIG['sent_mbox'], $header_str."\r\n".$msg_body);
+
+ // raise error if saving failed
+ if (!$saved)
+ raise_error(array('code' => 800,
+ 'type' => 'imap',
+ 'file' => __FILE__,
+ 'message' => "Could not save message in $CONFIG[sent_mbox]"), TRUE, FALSE);
}
// log mail sending
if ($CONFIG['smtp_log'])
{
- $log_entry = sprintf("[%s] User: %d; Message for %s; Subject: %s\n",
+ $log_entry = sprintf("[%s] User: %d on %s; Message for %s; Subject: %s\n",
date("d-M-Y H:i:s O", mktime()),
$_SESSION['user_id'],
+ $_SERVER['REMOTE_ADDR'],
$mailto,
$msg_subject);
- if ($fp = fopen($INSTALL_PATH.'logs/sendmail', 'a'))
+ if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a'))
{
fwrite($fp, $log_entry);
fclose($fp);
--
Gitblit v1.9.1