From e237eec8468e99b65a9160a0a3f07529b92725e3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 02 Dec 2011 04:58:03 -0500
Subject: [PATCH] - Applied fixes from trunk up to r5526
---
program/steps/mail/sendmail.inc | 247 +++++++++++++++++++++++++++++--------------------
1 files changed, 145 insertions(+), 102 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 54ded7a..64deb73 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -5,7 +5,7 @@
| program/steps/mail/sendmail.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -26,9 +26,12 @@
$savedraft = !empty($_POST['_draft']) ? true : false;
+$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GPC);
+$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
+
/****** checks ********/
-if (!isset($_SESSION['compose']['id'])) {
+if (!isset($COMPOSE['id'])) {
raise_error(array('code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Invalid compose ID"), true, false);
@@ -70,7 +73,7 @@
function rcmail_get_identity($id)
{
global $USER, $OUTPUT;
-
+
if ($sql_arr = $USER->get_identity($id)) {
$out = $sql_arr;
$out['mailto'] = $sql_arr['email'];
@@ -100,7 +103,7 @@
// remove any null-byte characters before parsing
$body = preg_replace('/\x00/', '', $body);
-
+
$searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
$offset = 0;
@@ -135,44 +138,47 @@
return $body;
}
-// parse email address input (and count addresses)
+/**
+ * Parse and cleanup email address input (and count addresses)
+ *
+ * @param string Address input
+ * @param boolean Do count recipients (saved in global $RECIPIENT_COUNT)
+ * @param boolean Validate addresses (errors saved in global $EMAIL_FORMAT_ERROR)
+ * @return string Canonical recipients string separated by comma
+ */
function rcmail_email_input_format($mailto, $count=false, $check=true)
{
- global $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;
+ global $RCMAIL, $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;
- $regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/', '/(\S{1})(<\S+@\S+>)/U');
- $replace = array(', ', ', ', '', ',', '\\1 \\2');
+ // simplified email regexp, supporting quoted local part
+ $email_regexp = '(\S+|("[^"]+"))@\S+';
+
+ $delim = trim($RCMAIL->config->get('recipients_separator', ','));
+ $regexp = array("/[,;$delim]\s*[\r\n]+/", '/[\r\n]+/', "/[,;$delim]\s*\$/m", '/;/', '/(\S{1})(<'.$email_regexp.'>)/U');
+ $replace = array($delim.' ', ', ', '', $delim, '\\1 \\2');
// replace new lines and strip ending ', ', make address input more valid
$mailto = trim(preg_replace($regexp, $replace, $mailto));
$result = array();
- $items = rcube_explode_quoted_string(',', $mailto);
+ $items = rcube_explode_quoted_string($delim, $mailto);
foreach($items as $item) {
$item = trim($item);
// address in brackets without name (do nothing)
- if (preg_match('/^<\S+@\S+>$/', $item)) {
- $item = idn_to_ascii($item);
- $result[] = $item;
+ if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
+ $item = rcube_idn_to_ascii(trim($item, '<>'));
+ $result[] = '<' . $item . '>';
// address without brackets and without name (add brackets)
- } else if (preg_match('/^\S+@\S+$/', $item)) {
- $item = idn_to_ascii($item);
- $result[] = '<'.$item.'>';
+ } else if (preg_match('/^'.$email_regexp.'$/', $item)) {
+ $item = rcube_idn_to_ascii($item);
+ $result[] = '<' . $item . '>';
// address with name (handle name)
- } else if (preg_match('/\S+@\S+>*$/', $item, $matches)) {
+ } else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
$address = $matches[0];
- $name = str_replace($address, '', $item);
- $name = trim($name);
- if ($name && ($name[0] != '"' || $name[strlen($name)-1] != '"')
- && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name)) {
- $name = '"'.addcslashes($name, '"').'"';
- }
- $address = idn_to_ascii($address);
- if (!preg_match('/^<\S+@\S+>$/', $address))
- $address = '<'.$address.'>';
-
- $result[] = $name.' '.$address;
+ $name = trim(str_replace($address, '', $item), '" ');
+ $address = rcube_idn_to_ascii(trim($address, '<>'));
+ $result[] = format_email_recipient($address, $name);
$item = $address;
} else if (trim($item)) {
continue;
@@ -192,6 +198,7 @@
return implode(', ', $result);
}
+
/****** compose message ********/
@@ -297,12 +304,12 @@
$headers['To'] = $mailto;
// additional recipients
-if (!empty($mailcc))
+if (!empty($mailcc)) {
$headers['Cc'] = $mailcc;
-
-if (!empty($mailbcc))
+}
+if (!empty($mailbcc)) {
$headers['Bcc'] = $mailbcc;
-
+}
if (!empty($identity_arr['bcc'])) {
$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
$RECIPIENT_COUNT ++;
@@ -318,36 +325,43 @@
// add subject
$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $message_charset));
-if (!empty($identity_arr['organization']))
+if (!empty($identity_arr['organization'])) {
$headers['Organization'] = $identity_arr['organization'];
-
-if (!empty($_POST['_replyto']))
+}
+if (!empty($_POST['_replyto'])) {
$headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
-else if (!empty($identity_arr['reply-to']))
+}
+else if (!empty($identity_arr['reply-to'])) {
$headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true);
-
-if (!empty($_POST['_mailfollowupto']))
- $headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_mailfollowupto', RCUBE_INPUT_POST, TRUE, $message_charset));
-if (!empty($_POST['_mailreplyto']))
- $headers['Mail-Reply-To'] = rcmail_email_input_format(get_input_value('_mailreplyto', RCUBE_INPUT_POST, TRUE, $message_charset));
-
-if (!empty($_SESSION['compose']['reply_msgid']))
- $headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];
+}
+if (!empty($headers['Reply-To'])) {
+ $headers['Mail-Reply-To'] = $headers['Reply-To'];
+}
+if (!empty($_POST['_followupto'])) {
+ $headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', RCUBE_INPUT_POST, TRUE, $message_charset));
+}
+if (!empty($COMPOSE['reply_msgid'])) {
+ $headers['In-Reply-To'] = $COMPOSE['reply_msgid'];
+}
// remember reply/forward UIDs in special headers
-if (!empty($_SESSION['compose']['reply_uid']) && $savedraft)
- $headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $_SESSION['compose']['reply_uid']);
-else if (!empty($_SESSION['compose']['forward_uid']) && $savedraft)
- $headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $_SESSION['compose']['forward_uid']);
+if (!empty($COMPOSE['reply_uid']) && $savedraft) {
+ $headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $COMPOSE['reply_uid']);
+}
+else if (!empty($COMPOSE['forward_uid']) && $savedraft) {
+ $headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $COMPOSE['forward_uid']);
+}
-if (!empty($_SESSION['compose']['references']))
- $headers['References'] = $_SESSION['compose']['references'];
+if (!empty($COMPOSE['references'])) {
+ $headers['References'] = $COMPOSE['references'];
+}
if (!empty($_POST['_priority'])) {
$priority = intval($_POST['_priority']);
$a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
- if ($str_priority = $a_priorities[$priority])
+ if ($str_priority = $a_priorities[$priority]) {
$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
+ }
}
if (!empty($_POST['_receipt'])) {
@@ -359,11 +373,12 @@
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;
-if (is_array($headers['X-Draft-Info']))
- $headers['X-Draft-Info'] = rcmail_draftinfo_encode($headers['X-Draft-Info'] + array('folder' => $_SESSION['compose']['mailbox']));
-
-if (!empty($CONFIG['useragent']))
+if (is_array($headers['X-Draft-Info'])) {
+ $headers['X-Draft-Info'] = rcmail_draftinfo_encode($headers['X-Draft-Info'] + array('folder' => $COMPOSE['mailbox']));
+}
+if (!empty($CONFIG['useragent'])) {
$headers['User-Agent'] = $CONFIG['useragent'];
+}
// exec hook for header checking and manipulation
$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));
@@ -390,7 +405,28 @@
// add inline css for blockquotes
$bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%';
$message_body = preg_replace('/<blockquote>/',
- '<blockquote type="cite" style="'.$bstyle.'">', $message_body);
+ '<blockquote type="cite" style="'.$bstyle.'">', $message_body);
+
+ // append doctype and html/body wrappers
+ $message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .
+ "\r\n<html><body>\r\n" . $message_body;
+ }
+
+ // Check spelling before send
+ if ($CONFIG['spellcheck_before_send'] && $CONFIG['enable_spellcheck']
+ && empty($COMPOSE['spell_checked']) && !empty($message_body)
+ ) {
+ $spellchecker = new rcube_spellchecker(get_input_value('_lang', RCUBE_INPUT_GPC));
+ $spell_result = $spellchecker->check($message_body, $isHtml);
+
+ $COMPOSE['spell_checked'] = true;
+
+ if (!$spell_result) {
+ $result = $isHtml ? $spellchecker->get_words() : $spellchecker->get_xml();
+ $OUTPUT->show_message('mispellingsfound', 'error');
+ $OUTPUT->command('spellcheck_resume', $isHtml, $result);
+ $OUTPUT->send('iframe');
+ }
}
// generic footer for all messages
@@ -404,8 +440,11 @@
if ($isHtml)
$footer = '<pre>'.$footer.'</pre>';
}
+
if ($footer)
$message_body .= "\r\n" . $footer;
+ if ($isHtml)
+ $message_body .= "\r\n</body></html>\r\n";
}
// set line length for body wrapping
@@ -419,12 +458,12 @@
// Check if we have enough memory to handle the message in it
// It's faster than using files, so we'll do this if we only can
-if (is_array($_SESSION['compose']['attachments']) && $CONFIG['smtp_server']
+if (is_array($COMPOSE['attachments']) && $CONFIG['smtp_server']
&& ($mem_limit = parse_bytes(ini_get('memory_limit'))))
{
$memory = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
- foreach ($_SESSION['compose']['attachments'] as $id => $attachment)
+ foreach ($COMPOSE['attachments'] as $id => $attachment)
$memory += $attachment['size'];
// Yeah, Net_SMTP needs up to 12x more memory, 1.33 is for base64
@@ -441,13 +480,16 @@
$MAIL_MIME->setHTMLBody($plugin['body']);
+ // replace emoticons
+ $plugin['body'] = rcmail_replace_emoticons($plugin['body']);
+
// add a plain text version of the e-mail as an alternative part.
$h2t = new html2text($plugin['body'], false, true, 0);
$plainTextPart = rc_wordwrap($h2t->get_text(), $LINE_LENGTH, "\r\n");
$plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);
if (!$plainTextPart) {
- // empty message body breaks attachment handling in drafts
- $plainTextPart = "\r\n";
+ // empty message body breaks attachment handling in drafts
+ $plainTextPart = "\r\n";
}
else {
// make sure all line endings are CRLF (#1486712)
@@ -485,9 +527,9 @@
}
// add stored attachments, if any
-if (is_array($_SESSION['compose']['attachments']))
+if (is_array($COMPOSE['attachments']))
{
- foreach ($_SESSION['compose']['attachments'] as $id => $attachment) {
+ foreach ($COMPOSE['attachments'] as $id => $attachment) {
// This hook retrieves the attachment contents from the file storage backend
$attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment);
@@ -508,14 +550,15 @@
// .eml attachments send inline
$MAIL_MIME->addAttachment($file,
- $ctype,
+ $ctype,
$attachment['name'],
($attachment['data'] ? false : true),
($ctype == 'message/rfc822' ? '8bit' : 'base64'),
($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
'', '', '',
$CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
- $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
+ $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL,
+ '', RCMAIL_CHARSET
);
}
}
@@ -581,12 +624,12 @@
// save message sent time
if (!empty($CONFIG['sendmail_delay']))
$RCMAIL->user->save_prefs(array('last_message_time' => time()));
-
+
// set replied/forwarded flag
- if ($_SESSION['compose']['reply_uid'])
- $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED', $_SESSION['compose']['mailbox']);
- else if ($_SESSION['compose']['forward_uid'])
- $IMAP->set_flag($_SESSION['compose']['forward_uid'], 'FORWARDED', $_SESSION['compose']['mailbox']);
+ if ($COMPOSE['reply_uid'])
+ $IMAP->set_flag($COMPOSE['reply_uid'], 'ANSWERED', $COMPOSE['mailbox']);
+ else if ($COMPOSE['forward_uid'])
+ $IMAP->set_flag($COMPOSE['forward_uid'], 'FORWARDED', $COMPOSE['mailbox']);
} // End of SMTP Delivery Block
@@ -594,11 +637,10 @@
// Determine which folder to save message
if ($savedraft)
$store_target = $CONFIG['drafts_mbox'];
-else
+else
$store_target = isset($_POST['_store_target']) ? get_input_value('_store_target', RCUBE_INPUT_POST) : $CONFIG['sent_mbox'];
-if ($store_target)
- {
+if ($store_target) {
// check if folder is subscribed
if ($IMAP->mailbox_exists($store_target, true))
$store_folder = true;
@@ -610,11 +652,10 @@
// append message to sent box
if ($store_folder) {
-
// message body in file
if ($mailbody_file || $MAIL_MIME->getParam('delay_file_io')) {
$headers = $MAIL_MIME->txtHeaders();
-
+
// file already created
if ($mailbody_file)
$msg = $mailbody_file;
@@ -623,67 +664,72 @@
$mailbody_file = tempnam($temp_dir, 'rcmMsg');
if (!PEAR::isError($msg = $MAIL_MIME->saveMessageBody($mailbody_file)))
$msg = $mailbody_file;
- }
}
+ }
else {
$msg = $MAIL_MIME->getMessage();
$headers = '';
- }
+ }
if (PEAR::isError($msg))
- raise_error(array('code' => 600, 'type' => 'php',
+ raise_error(array('code' => 650, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Could not create message: ".$msg->getMessage()),
TRUE, FALSE);
else {
$saved = $IMAP->save_message($store_target, $msg, $headers, $mailbody_file ? true : false);
- }
+ }
if ($mailbody_file) {
unlink($mailbody_file);
$mailbody_file = null;
- }
+ }
// raise error if saving failed
if (!$saved) {
raise_error(array('code' => 800, 'type' => 'imap',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Could not save message in $store_target"), TRUE, FALSE);
-
+
if ($savedraft) {
$OUTPUT->show_message('errorsaving', 'error');
$OUTPUT->send('iframe');
- }
}
}
+ }
- if ($olddraftmessageid)
- {
+ if ($olddraftmessageid) {
// delete previous saved draft
+ // @TODO: use message UID (remember to check UIDVALIDITY) to skip this SEARCH
$a_deleteid = $IMAP->search_once($CONFIG['drafts_mbox'],
'HEADER Message-ID '.$olddraftmessageid, true);
- $deleted = $IMAP->delete_message($a_deleteid, $CONFIG['drafts_mbox']);
- // raise error if deletion of old draft failed
- if (!$deleted)
- raise_error(array('code' => 800, 'type' => 'imap',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Could not delete message from ".$CONFIG['drafts_mbox']), TRUE, FALSE);
+ if (!empty($a_deleteid)) {
+ $deleted = $IMAP->delete_message($a_deleteid, $CONFIG['drafts_mbox']);
+
+ // raise error if deletion of old draft failed
+ if (!$deleted)
+ raise_error(array('code' => 800, 'type' => 'imap',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Could not delete message from ".$CONFIG['drafts_mbox']), TRUE, FALSE);
}
}
+}
// remove temp file
else if ($mailbody_file) {
unlink($mailbody_file);
- }
+}
-if ($savedraft)
- {
+if ($savedraft) {
$msgid = strtr($message_id, array('>' => '', '<' => ''));
-
- // remember new draft-uid
- $draftuids = $IMAP->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid, true);
- $_SESSION['compose']['param']['_draft_uid'] = $draftuids[0];
+
+ // remember new draft-uid ($saved could be an UID or TRUE here)
+ if (is_bool($saved)) {
+ $draftuids = $IMAP->search_once($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid, true);
+ $saved = $draftuids[0];
+ }
+ $COMPOSE['param']['draft_uid'] = $saved;
// display success
$OUTPUT->show_message('messagesaved', 'confirmation');
@@ -696,16 +742,13 @@
$OUTPUT->command('auto_save_start');
$OUTPUT->send('iframe');
- }
-else
- {
- rcmail_compose_cleanup();
+}
+else {
+ rcmail_compose_cleanup($COMPOSE_ID);
if ($store_folder && !$saved)
$OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
else
$OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'));
$OUTPUT->send('iframe');
- }
-
-
+}
--
Gitblit v1.9.1