From ecb9fb058da8d0f5a8e59402c1c1ced21122cbc5 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Mon, 22 Jun 2009 12:20:34 -0400 Subject: [PATCH] - use RCMAIL_CHARSET instead of hardcoded 'utf-8' --- program/steps/mail/sendmail.inc | 342 +++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 224 insertions(+), 118 deletions(-) diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 9efb0d7..d550a42 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-2008, RoundCube Dev. - Switzerland | + | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -25,17 +25,46 @@ $OUTPUT->reset(); $OUTPUT->framed = TRUE; +$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE; + +/****** checks ********/ if (!isset($_SESSION['compose']['id'])) { - raise_error(array('code' => 500, 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false); + raise_error(array('code' => 500, 'type' => 'smtp', 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false); console("Sendmail error", $_SESSION['compose']); $OUTPUT->show_message("An internal error occured. Please try again.", 'error'); $OUTPUT->send('iframe'); } +if (!$savedraft) { + if (empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) + && empty($_POST['_subject']) && $_POST['_message']) { + $OUTPUT->show_message('sendingfailed', 'error'); + $OUTPUT->send('iframe'); + } + + if(!empty($CONFIG['sendmail_delay'])) { + $wait_sec = time() - intval($CONFIG['sendmail_delay']) - intval($CONFIG['last_message_time']); + if($wait_sec < 0) { + $OUTPUT->show_message('senttooquickly', 'error', array('sec' => $wait_sec * -1)); + $OUTPUT->send('iframe'); + } + } +} + /****** message sending functions ********/ +// encrypt parts of the header +function rcmail_encrypt_header($what) +{ + global $CONFIG, $RCMAIL; + if (!$CONFIG['http_received_header_encrypt']) + { + return $what; + } + return $RCMAIL->encrypt($what); +} // get identity record function rcmail_get_identity($id) @@ -46,10 +75,17 @@ { $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($name, RCMAIL_CHARSET, $OUTPUT->get_charset()), - $sql_arr['email']); + + // Special chars as defined by RFC 822 need to in quoted string (or escaped). + if (preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $sql_arr['name'])) + $name = '"' . addcslashes($sql_arr['name'], '"') . '"'; + else + $name = $sql_arr['name']; + + $out['string'] = rcube_charset_convert($name, RCMAIL_CHARSET, $OUTPUT->get_charset()); + if ($sql_arr['email']) + $out['string'] .= ' <' . $sql_arr['email'] . '>'; + return $out; } @@ -73,78 +109,100 @@ { global $CONFIG; - $htmlContents = $mime_message->getHtmlBody(); + $body = $mime_message->getHtmlBody(); // remove any null-byte characters before parsing - $body = preg_replace('/\x00/', '', $htmlContents); + $body = preg_replace('/\x00/', '', $body); - $last_img_pos = 0; - $searchstr = 'program/js/tiny_mce/plugins/emotions/img/'; + $offset = 0; // 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); + if (preg_match_all('# src=[\'"]([^\'"]+)#', $body, $matches, PREG_OFFSET_CAPTURE)) { + foreach ($matches[1] as $m) { + // find emoticon image tags + if (preg_match('#'.$searchstr.'(.*)$#', $m[0], $imatches)) { + $image_name = $imatches[1]; - $body_post = substr($body, $pos2); + // sanitize image name so resulting attachment doesn't leave images dir + $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name); + $img_file = INSTALL_PATH . '/' . $searchstr . $image_name; - 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'); + if (! in_array($image_name, $included_images)) { + // add the image to the MIME message + if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) + $OUTPUT->show_message("emoticonerror", 'error'); + array_push($included_images, $image_name); + } - array_push($included_images, $image_name); + $body = substr_replace($body, $img_file, $m[1] + $offset, strlen($m[0])); + $offset += strlen($img_file) - strlen($m[0]); } - - $body = $body_pre . $img_file . $body_post; - - $last_img_pos = $pos2; } - + } + $mime_message->setHTMLBody($body); + + return $body; } + +// parse email address input +function rcmail_email_input_format($mailto) +{ + $regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/', '/(\S{1})(<\S+@\S+>)/U'); + $replace = array(', ', ', ', '', ',', '\\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); + + foreach($items as $item) { + $item = trim($item); + // address in brackets without name (do nothing) + if (preg_match('/^<\S+@\S+>$/', $item)) { + $result[] = $item; + // address without brackets and without name (add brackets) + } else if (preg_match('/^\S+@\S+$/', $item)) { + $result[] = '<'.$item.'>'; + // address with name (handle name) + } else if (preg_match('/\S+@\S+>*$/', $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, '"').'"'; + } + if (!preg_match('/^<\S+@\S+>$/', $address)) + $address = '<'.$address.'>'; + + $result[] = $name.' '.$address; + } else if (trim($item)) { + // @TODO: handle errors + } + } + + return implode(', ', $result); +} + +/****** compose message ********/ 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->config->mail_domain($_SESSION['imap_host'])); -$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE; - - -/****** check submission and compose message ********/ - - -if (!$savedraft && empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) && empty($_POST['_subject']) && $_POST['_message']) - { - $OUTPUT->show_message("sendingfailed", 'error'); - $OUTPUT->send('iframe'); - return; - } - // 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(', ', ', ', '', ','); - -// 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)); +$mailto = rcmail_email_input_format(get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset)); +$mailcc = rcmail_email_input_format(get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset)); +$mailbcc = rcmail_email_input_format(get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset)); if (empty($mailto) && !empty($mailcc)) { $mailto = $mailcc; @@ -154,16 +212,42 @@ $mailto = 'undisclosed-recipients:;'; // get sender name and address -$identity_arr = rcmail_get_identity(get_input_value('_from', RCUBE_INPUT_POST)); -$from = $identity_arr['mailto']; +$from = get_input_value('_from', RCUBE_INPUT_POST, true, $message_charset); +$identity_arr = rcmail_get_identity($from); + +if (!$identity_arr && ($from = rcmail_email_input_format($from))) { + if (preg_match('/(\S+@\S+)/', $from, $m)) + $identity_arr['mailto'] = $m[1]; +} else + $from = $identity_arr['mailto']; if (empty($identity_arr['string'])) $identity_arr['string'] = $from; // compose headers array -$headers = array('Date' => date('r'), - 'From' => rcube_charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset), - 'To' => $mailto); +$headers = array(); + +// if configured, the Received headers goes to top, for good measure +if ($CONFIG['http_received_header']) +{ + $nldlm = $RCMAIL->config->header_delimiter() . "\t"; + $http_header = 'from '; + if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { + $http_header .= rcmail_encrypt_header(gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR'])) . + ' [' . rcmail_encrypt_header($_SERVER['HTTP_X_FORWARDED_FOR']) . ']'; + $http_header .= $nldlm . ' via '; + } + $http_header .= rcmail_encrypt_header(gethostbyaddr($_SERVER['REMOTE_ADDR'])) . + ' [' . rcmail_encrypt_header($_SERVER['REMOTE_ADDR']) .']'; + $http_header .= $nldlm . 'with ' . $_SERVER['SERVER_PROTOCOL'] . + ' ('.$_SERVER['REQUEST_METHOD'] . '); ' . date('r'); + $http_header = wordwrap($http_header, 69, $nldlm); + $headers['Received'] = $http_header; +} + +$headers['Date'] = date('r'); +$headers['From'] = rcube_charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset); +$headers['To'] = $mailto; // additional recipients if (!empty($mailcc)) @@ -176,13 +260,13 @@ $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc']; // add subject -$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, FALSE, $message_charset)); +$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, TRUE, $message_charset)); if (!empty($identity_arr['organization'])) $headers['Organization'] = $identity_arr['organization']; if (!empty($_POST['_replyto'])) - $headers['Reply-To'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset)); + $headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset)); else if (!empty($identity_arr['reply-to'])) $headers['Reply-To'] = $identity_arr['reply-to']; @@ -207,16 +291,6 @@ } // additional headers -if ($CONFIG['http_received_header']) -{ - $nldlm = $RCMAIL->config->header_delimiter() . "\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; @@ -229,13 +303,17 @@ // fetch message body $message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset); -// remove signature's div ID -if (!$savedraft && $isHtml) - $message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body); +if (!$savedraft) { + // remove signature's div ID + if ($isHtml) + $message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body); -// append generic footer to all messages -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); + // generic footer for all messages + if (!empty($CONFIG['generic_message_footer'])) { + $footer = file_get_contents(realpath($CONFIG['generic_message_footer'])); + $footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset); + } +} // create extended PEAR::Mail_mime instance $MAIL_MIME = new rcube_mail_mime($RCMAIL->config->header_delimiter()); @@ -243,77 +321,92 @@ // For HTML-formatted messages, construct the MIME message with both // the HTML part and the plain-text part -if ($isHtml) - { - $MAIL_MIME->setHTMLBody($message_body); +if ($isHtml) { + $plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $message_body, 'type' => 'html', 'message' => $MAIL_MIME)); + $MAIL_MIME->setHTMLBody($plugin['body'] . ($footer ? "\r\n<pre>".$footer.'</pre>' : '')); // 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)) - { + $h2t = new html2text($plugin['body'], false, true, 0); + $plainTextPart = rc_wordwrap($h2t->get_text(), 75, "\r\n") . ($footer ? "\r\n".$footer : ''); + $plainTextPart = wordwrap($plainTextPart, 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')); + } + $plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $plainTextPart, 'type' => 'alternative', 'message' => $MAIL_MIME)); + $MAIL_MIME->setTXTBody($plugin['body']); // look for "emoticon" images from TinyMCE and copy into message as attachments - rcmail_attach_emoticons($MAIL_MIME); - } + $message_body = rcmail_attach_emoticons($MAIL_MIME); +} else { - $message_body = wordwrap($message_body, 75, "\r\n"); + $message_body = rc_wordwrap($message_body, 75, "\r\n"); + if ($footer) + $message_body .= "\r\n" . $footer; $message_body = wordwrap($message_body, 998, "\r\n", true); - if (!strlen($message_body)) - { + if (!strlen($message_body)) { // empty message body breaks attachment handling in drafts $message_body = "\r\n"; - } - $MAIL_MIME->setTXTBody($message_body, FALSE, TRUE); } + $plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $message_body, 'type' => 'plain', 'message' => $MAIL_MIME)); + $MAIL_MIME->setTXTBody($plugin['body'], false, 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'; // add stored attachments, if any -if (is_array($_SESSION['compose']['attachments'])) - 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); +if (is_array($_SESSION['compose']['attachments'])) { + foreach ($_SESSION['compose']['attachments'] as $id => $attachment) { + // This hook retrieves the attachment contents from the file storage backend + $attachment = $RCMAIL->plugins->exec_hook('get_attachment', $attachment); + + $dispurl = '/\ssrc\s*=\s*[\'"]*\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\s\'"]\s*/'; + $message_body = $MAIL_MIME->getHTMLBody(); + if ($isHtml && (preg_match($dispurl, $message_body) > 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']); + + if ($attachment['data']) + $MAIL_MIME->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false); + else + $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name'], true); } - else - { + else { $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914 + $file = $attachment['data'] ? $attachment['data'] : $attachment['path']; // .eml attachments send inline - $MAIL_MIME->addAttachment($attachment['path'], + $MAIL_MIME->addAttachment($file, $ctype, - $attachment['name'], true, + $attachment['name'], + ($attachment['data'] ? false : true), ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'), ($ctype == 'message/rfc822' ? 'inline' : 'attachment'), - $message_charset); + $message_charset, '', '', + $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, + $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL + ); } } +} // add submitted attachments -if (is_array($_FILES['_attachments']['tmp_name'])) - foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) - { +if (is_array($_FILES['_attachments']['tmp_name'])) { + foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) { $ctype = $files['type'][$i]; $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914 $MAIL_MIME->addAttachment($filepath, $ctype, $files['name'][$i], true, - ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'), - 'attachment', $message_charset); - } - + $ctype == 'message/rfc822' ? $transfer_encoding : 'base64', + 'attachment', $message_charset, '', '', + $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, + $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL + ); + } +} // encoding settings for mail composing $MAIL_MIME->setParam(array( @@ -324,6 +417,9 @@ 'html_charset' => $message_charset, 'text_charset' => $message_charset, )); + +$data = $RCMAIL->plugins->exec_hook('outgoing_message_headers', array('headers' => $headers)); +$headers = $data['headers']; // encoding subject header with mb_encode provides better results with asian characters if (function_exists("mb_encode_mimeheader")) @@ -339,6 +435,12 @@ // Begin SMTP Delivery Block if (!$savedraft) { + // check for 'From' address (identity may be incomplete) + if ($identity_arr && !$identity_arr['mailto']) { + $OUTPUT->show_message('nofromaddress', 'error'); + $OUTPUT->send('iframe'); + } + $sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto); // return to compose page if sending failed @@ -346,14 +448,17 @@ { $OUTPUT->show_message("sendingfailed", 'error'); $OUTPUT->send('iframe'); - return; } + + // 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'); + $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'); + $IMAP->set_flag($_SESSION['compose']['forward_uid'], 'FORWARDED', $_SESSION['compose']['mailbox']); } // End of SMTP Delivery Block @@ -398,7 +503,8 @@ if ($olddraftmessageid) { // delete previous saved draft - $a_deleteid = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID', $olddraftmessageid); + $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 @@ -413,7 +519,7 @@ $msgid = strtr($message_id, array('>' => '', '<' => '')); // remember new draft-uid - $draftids = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID', $msgid); + $draftids = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid); $_SESSION['compose']['param']['_draft_uid'] = $IMAP->get_uid($draftids[0], $CONFIG['drafts_mbox']); // display success -- Gitblit v1.9.1