From 2b962c1074c45695da0376f830ec63923743c39e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 21 May 2008 16:35:32 -0400
Subject: [PATCH] -typo (#1485079)
---
program/steps/mail/sendmail.inc | 458 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 279 insertions(+), 179 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 33f023d..72ef9f4 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -5,12 +5,12 @@
| program/steps/mail/sendmail.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
| Compose a new mail message with all headers and attachments |
- | and send it using IlohaMail's SMTP methods or with PHP mail() |
+ | and send it using the PEAR::Net_SMTP class or with PHP mail() |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
@@ -19,11 +19,6 @@
$Id$
*/
-
-
-//require_once('lib/smtp.inc');
-require_once('include/rcube_smtp.inc');
-require_once('Mail/mime.php');
if (!isset($_SESSION['compose']['id']))
@@ -36,41 +31,103 @@
/****** message sending functions ********/
-
+// get identity record
function rcmail_get_identity($id)
{
- global $DB, $CHARSET, $OUTPUT;
+ global $USER, $OUTPUT;
- // get identity record
- $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))
+ if ($sql_arr = $USER->get_identity($id))
{
- $sql_arr = $DB->fetch_assoc($sql_result);
$out = $sql_arr;
+ $out['mailto'] = $sql_arr['email'];
+ $name = strpos($sql_arr['name'], ",") ? '"'.$sql_arr['name'].'"' : $sql_arr['name'];
$out['string'] = sprintf('%s <%s>',
- rcube_charset_convert($sql_arr['name'], $CHARSET, $OUTPUT->get_charset()),
- $sql_arr['mailto']);
+ rcube_charset_convert($name, RCMAIL_CHARSET, $OUTPUT->get_charset()),
+ $sql_arr['email']);
return $out;
}
return FALSE;
}
+/**
+ * go from this:
+ * <img src=".../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
+ *
+ * to this:
+ *
+ * <IMG src="cid:smiley-cool.gif"/>
+ * ...
+ * ------part...
+ * Content-Type: image/gif
+ * Content-Transfer-Encoding: base64
+ * Content-ID: <smiley-cool.gif>
+ */
+function rcmail_attach_emoticons(&$mime_message)
+{
+ global $CONFIG;
+
+ $htmlContents = $mime_message->getHtmlBody();
+
+ // remove any null-byte characters before parsing
+ $body = preg_replace('/\x00/', '', $htmlContents);
+
+ $last_img_pos = 0;
+
+ $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
+
+ // keep track of added images, so they're only added once
+ $included_images = array();
+
+ // find emoticon image tags
+ while ($pos = strpos($body, $searchstr, $last_img_pos))
+ {
+ $pos2 = strpos($body, '"', $pos);
+ $body_pre = substr($body, 0, $pos);
+ $image_name = substr($body,
+ $pos + strlen($searchstr),
+ $pos2 - ($pos + strlen($searchstr)));
+ // sanitize image name so resulting attachment doesn't leave images dir
+ $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i','',$image_name);
+
+ $body_post = substr($body, $pos2);
+
+ if (! in_array($image_name, $included_images))
+ {
+ // 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))
+ $OUTPUT->show_message("emoticonerror", 'error');
+
+ array_push($included_images, $image_name);
+ }
+
+ $body = $body_pre . 'cid:_' . $image_name . $body_post;
+
+ $last_img_pos = $pos2;
+ }
+
+ $mime_message->setHTMLBody($body);
+}
+
+if (strlen($_POST['_draft_saveid']) > 3)
+ $olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST);
+
+$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), rcmail_mail_domain($_SESSION['imap_host']));
+$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
+
+// remove all scripts and act as called in frame
+$OUTPUT->reset();
+$OUTPUT->framed = TRUE;
/****** check submission and compose message ********/
-if (empty($_POST['_to']) && empty($_POST['_subject']) && $_POST['_message'])
+if (!$savedraft && empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) && empty($_POST['_subject']) && $_POST['_message'])
{
- show_message("sendingfailed", 'error');
- rcmail_overwrite_action('compose');
+ $OUTPUT->show_message("sendingfailed", 'error');
+ $OUTPUT->send('iframe');
return;
}
@@ -79,36 +136,39 @@
$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(', ', ', ', '');
+$mailto_regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/');
+$mailto_replace = array(', ', ', ', '', ',');
-// repalce new lines and strip ending ', '
+// replace new lines and strip ending ', '
$mailto = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset));
+$mailcc = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset));
+$mailbcc = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset));
-// decode address strings
-$to_address_arr = $IMAP->decode_address_list($mailto);
-$identity_arr = rcmail_get_identity($_POST['_from']);
+if (empty($mailto) && !empty($mailcc)) {
+ $mailto = $mailcc;
+ $mailcc = null;
+}
+else if (empty($mailto))
+ $mailto = 'undisclosed-recipients:;';
-
+// get sender name and address
+$identity_arr = rcmail_get_identity(get_input_value('_from', RCUBE_INPUT_POST));
$from = $identity_arr['mailto'];
-$first_to = is_array($to_address_arr[0]) ? $to_address_arr[0]['mailto'] : $mailto;
-
-// create unique message-id
-$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail')), $_SESSION['imap_host']);
-
+if (empty($identity_arr['string']))
+ $identity_arr['string'] = $from;
// compose headers array
-$headers = array('Date' => date('D, j M Y G:i:s O'),
- 'From' => $identity_arr['string'],
- 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset));
+$headers = array('Date' => date('r'),
+ 'From' => rcube_charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset),
+ 'To' => $mailto);
// additional recipients
-if (!empty($_POST['_cc']))
- $headers['Cc'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset));
+if (!empty($mailcc))
+ $headers['Cc'] = $mailcc;
-if (!empty($_POST['_bcc']))
- $headers['Bcc'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset));
+if (!empty($mailbcc))
+ $headers['Bcc'] = $mailbcc;
if (!empty($identity_arr['bcc']))
$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
@@ -119,7 +179,9 @@
if (!empty($identity_arr['organization']))
$headers['Organization'] = $identity_arr['organization'];
-if (!empty($identity_arr['reply-to']))
+if (!empty($_POST['_replyto']))
+ $headers['Reply-To'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
+else if (!empty($identity_arr['reply-to']))
$headers['Reply-To'] = $identity_arr['reply-to'];
if (!empty($_SESSION['compose']['reply_msgid']))
@@ -130,14 +192,29 @@
if (!empty($_POST['_priority']))
{
- $priority = (int)$_POST['_priority'];
- $a_priorities = array(1=>'lowest', 2=>'low', 4=>'high', 5=>'highest');
+ $priority = intval($_POST['_priority']);
+ $a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
if ($str_priority = $a_priorities[$priority])
$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
}
+if (!empty($_POST['_receipt']))
+ {
+ $headers['Return-Receipt-To'] = $identity_arr['string'];
+ $headers['Disposition-Notification-To'] = $identity_arr['string'];
+ }
// additional headers
+if ($CONFIG['http_received_header'])
+{
+ $nldlm = rcmail_header_delm() . "\t";
+ $headers['Received'] = wordwrap('from ' . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
+ gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].']'.$nldlm.' via ' : '') .
+ gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].']'.$nldlm.'with ' .
+ $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
+ 69, $nldlm);
+}
+
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;
@@ -148,44 +225,77 @@
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
// append generic footer to all messages
-if (!empty($CONFIG['generic_message_footer']))
+if (!$savedraft && !empty($CONFIG['generic_message_footer']) && ($footer = file_get_contents(realpath($CONFIG['generic_message_footer']))))
+ $message_body .= "\r\n" . rcube_charset_convert($footer, 'UTF-8', $message_charset);
+
+$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
+$isHtml = ($isHtmlVal == "1");
+
+// create extended PEAR::Mail_mime instance
+$MAIL_MIME = new rcube_mail_mime(rcmail_header_delm());
+
+// For HTML-formatted messages, construct the MIME message with both
+// the HTML part and the plain-text part
+
+if ($isHtml)
{
- $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);
+ $MAIL_MIME->setHTMLBody($message_body);
+
+ // add a plain text version of the e-mail as an alternative part.
+ $h2t = new html2text($message_body);
+ $plainTextPart = wordwrap($h2t->get_text(), 998, "\r\n", true);
+ if (!strlen($plainTextPart))
+ {
+ // empty message body breaks attachment handling in drafts
+ $plainTextPart = "\r\n";
}
+ $MAIL_MIME->setTXTBody(html_entity_decode($plainTextPart, ENT_COMPAT, 'utf-8'));
+
+ // look for "emoticon" images from TinyMCE and copy into message as attachments
+ rcmail_attach_emoticons($MAIL_MIME);
}
-
-// try to autodetect operating system and use the correct line endings
-// use the configured delimiter for headers
-if (!empty($CONFIG['mail_header_delimiter']))
- $header_delm = $CONFIG['mail_header_delimiter'];
-else if (strtolower(substr(PHP_OS, 0, 3)=='win'))
- $header_delm = "\r\n";
-else if (strtolower(substr(PHP_OS, 0, 3)=='mac'))
- $header_delm = "\r\n";
-else
- $header_delm = "\n";
-
-// create PEAR::Mail_mime instance
-$MAIL_MIME = new Mail_mime($header_delm);
-$MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
-//$MAIL_MIME->setTXTBody(wordwrap($message_body), FALSE, TRUE);
+else
+ {
+ $message_body = wordwrap($message_body, 75, "\r\n");
+ $message_body = wordwrap($message_body, 998, "\r\n", true);
+ if (!strlen($message_body))
+ {
+ // empty message body breaks attachment handling in drafts
+ $message_body = "\r\n";
+ }
+ $MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
+ }
// add stored attachments, if any
if (is_array($_SESSION['compose']['attachments']))
- foreach ($_SESSION['compose']['attachments'] as $attachment)
- $MAIL_MIME->addAttachment($attachment['path'], $attachment['mimetype'], $attachment['name'], TRUE);
+ foreach ($_SESSION['compose']['attachments'] as $id => $attachment)
+ {
+ $dispurl = '/\ssrc\s*=\s*[\'"]?\S+display-attachment\S+file=rcmfile' . $id . '[\'"]?/';
+ $match = preg_match($dispurl, $message_body);
+ if ($isHtml && ($match > 0))
+ {
+ $message_body = preg_replace($dispurl, ' src="'.$attachment['name'].'"', $message_body);
+ $MAIL_MIME->setHTMLBody($message_body);
+ $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name']);
+ }
+ else
+ {
+ /*
+ We need to replace mime_content_type in a later release because the function
+ is deprecated in favour of File_Info
+ */
+ $MAIL_MIME->addAttachment($attachment['path'],
+ rc_mime_content_type($attachment['path'], $attachment['mimetype']),
+ $attachment['name'], true, 'base64',
+ 'attachment', $message_charset);
+ }
+ }
-
// add submitted attachments
if (is_array($_FILES['_attachments']['tmp_name']))
foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
- $MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], TRUE);
+ $MAIL_MIME->addAttachment($filepath, $files['type'][$i], $files['name'][$i], true, 'base64', 'attachment', $message_charset);
// chose transfer encoding
@@ -193,134 +303,124 @@
$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);
+$MAIL_MIME->setParam(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($message_param);
+// encoding subject header with mb_encode provides better results with asian characters
+if (function_exists("mb_encode_mimeheader"))
+{
+ mb_internal_encoding($message_charset);
+ $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q');
+ mb_internal_encoding(RCMAIL_CHARSET);
+}
-$msg_subject = $headers['Subject'];
+// pass headers to message object
+$MAIL_MIME->headers($headers);
-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'])
- {
- // generate list of recipients
- $a_recipients = array($mailto);
-
- 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
+// Begin SMTP Delivery Block
+if (!$savedraft)
+{
+ $sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto);
+
+ // return to compose page if sending failed
if (!$sent)
{
- raise_error(array('code' => 800,
- 'type' => 'smtp',
- 'line' => __LINE__,
- 'file' => __FILE__,
- 'message' => "SMTP error: $SMTP_ERROR"), TRUE, FALSE);
+ $OUTPUT->show_message("sendingfailed", 'error');
+ $OUTPUT->send('iframe');
+ return;
}
- }
-
-// send mail using PHP's mail() function
-else
- {
- // unset some headers because they will be added by the mail() function
- $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);
+ // set repliead flag
+ if ($_SESSION['compose']['reply_uid'])
+ $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
- 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");
- }
+ } // End of SMTP Delivery Block
-// return to compose page if sending failed
-if (!$sent)
+
+// Determine which folder to save message
+if ($savedraft)
+ $store_target = 'drafts_mbox';
+else
+ $store_target = 'sent_mbox';
+
+if ($CONFIG[$store_target])
{
- show_message("sendingfailed", 'error');
- rcmail_overwrite_action('compose');
- return;
- }
-
-
-// set repliead flag
-if ($_SESSION['compose']['reply_uid'])
- $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
-
-
-// copy message to sent folder
-if ($CONFIG['sent_mbox'])
- {
- // create string of complete message headers
- $header_str = $MAIL_MIME->txtHeaders($headers);
-
// check if mailbox exists
- if (!in_array_nocase($CONFIG['sent_mbox'], $IMAP->list_mailboxes()))
- $mbox = $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE);
+ if (!in_array_nocase($CONFIG[$store_target], $IMAP->list_mailboxes()))
+ $store_folder = $IMAP->create_mailbox($CONFIG[$store_target], TRUE);
else
- $mbox = TRUE;
-
+ $store_folder = TRUE;
+
// append message to sent box
- if ($mbox)
- $saved = $IMAP->save_message($CONFIG['sent_mbox'], $header_str."\r\n".$msg_body);
+ if ($store_folder)
+ $saved = $IMAP->save_message($CONFIG[$store_target], $MAIL_MIME->getMessage());
// 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 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($CONFIG['log_dir'].'/sendmail', 'a'))
{
- fwrite($fp, $log_entry);
- fclose($fp);
+ raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__,
+ 'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE);
+
+ $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->send('iframe');
+ }
+
+ if ($olddraftmessageid)
+ {
+ // delete previous saved draft
+ $a_deleteid = $IMAP->search($CONFIG['drafts_mbox'],'HEADER Message-ID',$olddraftmessageid);
+ $deleted = $IMAP->delete_message($IMAP->get_uid($a_deleteid[0],$CONFIG['drafts_mbox']),$CONFIG['drafts_mbox']);
+
+ // raise error if deletion of old draft failed
+ if (!$deleted)
+ raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__,
+ 'message' => "Could not delete message from ".$CONFIG['drafts_mbox']), TRUE, FALSE);
}
}
+if ($savedraft)
+ {
+ // display success
+ $OUTPUT->show_message('messagesaved', 'confirmation');
-// show confirmation
-show_message('messagesent', 'confirmation');
+ // update "_draft_saveid" and the "cmp_hash" to prevent "Unsaved changes" warning
+ $OUTPUT->command('set_draft_id', str_replace(array('<','>'), "", $message_id));
+ $OUTPUT->command('compose_field_hash', true);
+ // start the auto-save timer again
+ $OUTPUT->command('auto_save_start');
-// kill compose entry from session
-rcmail_compose_cleanup();
+ $OUTPUT->send('iframe');
+ }
+else
+ {
+ if ($CONFIG['smtp_log'])
+ {
+ $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,
+ !empty($smtp_response) ? join('; ', $smtp_response) : '');
-?>
\ No newline at end of file
+ if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a'))
+ {
+ fwrite($fp, $log_entry);
+ fclose($fp);
+ }
+ }
+
+ rcmail_compose_cleanup();
+ $OUTPUT->command('sent_successfully', rcube_label('messagesent'));
+ $OUTPUT->send('iframe');
+ }
+
+?>
--
Gitblit v1.9.1