githubFork/roundcubemail.git

			@@ -24,7 +24,8 @@
			$OUTPUT->reset();
			$OUTPUT->framed = TRUE;

			$savedraft = !empty($_POST['_draft']) ? true : false;
			$saveonly = !empty($_GET['_saveonly']);
			$savedraft = !empty($_POST['_draft']) && !$saveonly;
			$sendmail_delay = (int) $RCMAIL->config->get('sendmail_delay');
			$drafts_mbox = $RCMAIL->config->get('drafts_mbox');

			@@ -77,7 +78,7 @@
			$mailcc = rcmail_email_input_format(rcube_utils::get_input_value('_cc', rcube_utils::INPUT_POST, TRUE, $message_charset), true);
			$mailbcc = rcmail_email_input_format(rcube_utils::get_input_value('_bcc', rcube_utils::INPUT_POST, TRUE, $message_charset), true);

			if ($EMAIL_FORMAT_ERROR) {
			if ($EMAIL_FORMAT_ERROR && !$savedraft) {
			$OUTPUT->show_message('emailformaterror', 'error', array('email' => $EMAIL_FORMAT_ERROR));
			$OUTPUT->send('iframe');
			}
			@@ -112,6 +113,12 @@
			$from = null;
			}

			// check 'From' address (identity may be incomplete)
			if (!$savedraft && !$saveonly && empty($from)) {
			$OUTPUT->show_message('nofromaddress', 'error');
			$OUTPUT->send('iframe');
			}

			if (!$from_string && $from) {
			$from_string = $from;
			}
			@@ -144,7 +151,7 @@
			$http_header .= $nldlm . ' via ';
			}

			$host = $_SERVER['REMOTE_ADDR'];
			$host = $_SERVER['REMOTE_ADDR'];
			$hostname = gethostbyaddr($host);

			if ($encrypt) {
			@@ -171,7 +178,7 @@

			$headers['Date'] = $RCMAIL->user_date();
			$headers['From'] = rcube_charset::convert($from_string, RCUBE_CHARSET, $message_charset);
			$headers['To'] = $mailto;
			$headers['To'] = $mailto;

			// additional recipients
			if (!empty($mailcc)) {
			@@ -188,6 +195,10 @@
			}
			}

			$dont_override = (array) $RCMAIL->config->get('dont_override');
			$mdn_enabled = in_array('mdn_default', $dont_override) ? $RCMAIL->config->get('mdn_default') : !empty($_POST['_mdn']);
			$dsn_enabled = in_array('dsn_default', $dont_override) ? $RCMAIL->config->get('dsn_default') : !empty($_POST['_dsn']);

			// add subject
			$headers['Subject'] = trim(rcube_utils::get_input_value('_subject', rcube_utils::INPUT_POST, TRUE, $message_charset));

			@@ -201,7 +212,7 @@
			$headers['Mail-Reply-To'] = $headers['Reply-To'];
			}
			if ($hdr = rcube_utils::get_input_value('_followupto', rcube_utils::INPUT_POST, TRUE, $message_charset)) {
			$headers['Mail-Followup-To'] = rcmail_email_input_format();
			$headers['Mail-Followup-To'] = rcmail_email_input_format($hdr);
			}

			// remember reply/forward UIDs in special headers
			@@ -228,7 +239,7 @@
			}
			}

			if (!empty($_POST['_receipt'])) {
			if ($mdn_enabled) {
			$headers['Return-Receipt-To'] = $from_string;
			$headers['Disposition-Notification-To'] = $from_string;
			}
			@@ -273,20 +284,31 @@
			}

			// append doctype and html/body wrappers
			$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">'
			. "\r\n<html><body" . (!empty($bstyle) ? " style='" . implode($bstyle, '; ') . "'" : '') . ">\r\n"
			. $message_body;
			$bstyle = !empty($bstyle) ? (" style='" . implode($bstyle, '; ') . "'") : '';
			$message_body = '<html><head>'
			. '<meta http-equiv="Content-Type" content="text/html; charset=' . $message_charset . '" /></head>'
			. "<body" . $bstyle . ">\r\n" . $message_body;
			}

			if (!$savedraft) {
			if ($isHtml) {
			// remove signature's div ID
			$message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);
			$b_style = 'padding: 0 0.4em; border-left: #1010ff 2px solid; margin: 0';
			$pre_style = 'margin: 0; padding: 0; font-family: monospace';

			// add inline css for blockquotes
			$bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px';
			$message_body = preg_replace('/<blockquote>/',
			'<blockquote type="cite" style="'.$bstyle.'">', $message_body);
			$message_body = preg_replace(
			array(
			// remove signature's div ID
			'/\s*id="_rc_sig"/',
			// add inline css for blockquotes and container
			'/<blockquote>/',
			'/<div class="pre">/'
			),
			array(
			'',
			'<blockquote type="cite" style="'.$b_style.'">',
			'<div class="pre" style="'.$pre_style.'">'
			),
			$message_body);
			}

			// Check spelling before send
			@@ -300,10 +322,16 @@
			$COMPOSE['spell_checked'] = true;

			if (!$spell_result) {
			$result = $isHtml ? $spellchecker->get_words() : $spellchecker->get_xml();
			if ($isHtml) {
			$result['words'] = $spellchecker->get();
			$result['dictionary'] = (bool) $RCMAIL->config->get('spellcheck_dictionary');
			}
			else {
			$result = $spellchecker->get_xml();
			}

			$OUTPUT->show_message('mispellingsfound', 'error');
			$OUTPUT->command('spellcheck_resume', $isHtml, $result);
			$OUTPUT->command('spellcheck_resume', $result);
			$OUTPUT->send('iframe');
			}
			}
			@@ -411,8 +439,7 @@
			$attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment);

			if ($isHtml) {
			$dispurl = '/\ssrc\s=\s[\'"]*\S+display-attachment\S+file=rcmfile'
			. preg_quote($attachment['id']) . '[\s\'"]*/';
			$dispurl = '/[\'"]\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\'"]/';
			$message_body = $MAIL_MIME->getHTMLBody();
			$is_inline = preg_match($dispurl, $message_body);
			}
			@@ -432,7 +459,7 @@
			$cid .= '@localhost';
			}

			$message_body = preg_replace($dispurl, ' src="cid:' . $cid . '" ', $message_body);
			$message_body = preg_replace($dispurl, '"cid:' . $cid . '"', $message_body);

			$MAIL_MIME->setHTMLBody($message_body);

			@@ -452,7 +479,8 @@
			$attachment['data'] ? false : true,
			$ctype == 'message/rfc822' ? '8bit' : 'base64',
			'attachment',
			'', '', '',
			$attachment['charset'],
			'', '',
			$folding ? 'quoted-printable' : NULL,
			$folding == 2 ? 'quoted-printable' : NULL,
			'', RCUBE_CHARSET
			@@ -467,15 +495,11 @@
			$transfer_encoding = $RCMAIL->config->get('force_7bit') ? 'quoted-printable' : '8bit';
			}
			else {
			$text_charset = '';
			$text_charset = 'US-ASCII';
			$transfer_encoding = '7bit';
			}

			if ($flowed) {
			if (!$text_charset) {
			$text_charset = 'US-ASCII';
			}

			$text_charset .= ";\r\n format=flowed";
			}

			@@ -487,29 +511,17 @@
			$MAIL_MIME->setParam('html_charset', $message_charset);
			$MAIL_MIME->setParam('text_charset', $text_charset);

			// 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', "\r\n", 8);
			mb_internal_encoding(RCUBE_CHARSET);
			}

			// pass headers to message object
			$MAIL_MIME->headers($headers);

			// Begin SMTP Delivery Block
			if (!$savedraft) {
			// check 'From' address (identity may be incomplete)
			if (empty($from)) {
			$OUTPUT->show_message('nofromaddress', 'error');
			$OUTPUT->send('iframe');
			}
			// This hook allows to modify the message before send or save action
			$plugin = $RCMAIL->plugins->exec_hook('message_ready', array('message' => $MAIL_MIME));
			$MAIL_MIME = $plugin['message'];

			// Begin SMTP Delivery Block
			if (!$savedraft && !$saveonly) {
			// Handle Delivery Status Notification request
			if (!empty($_POST['_dsn'])) {
			$smtp_opts['dsn'] = true;
			}
			$smtp_opts['dsn'] = $dsn_enabled;

			$sent = $RCMAIL->deliver_message($MAIL_MIME, $from, $mailto,
			$smtp_error, $mailbody_file, $smtp_opts);
			@@ -535,12 +547,12 @@

			// set replied/forwarded flag
			if ($COMPOSE['reply_uid']) {
			foreach (rcmail_get_uids($COMPOSE['reply_uid'], $COMPOSE['mailbox']) as $mbox => $uids) {
			foreach (rcmail::get_uids($COMPOSE['reply_uid'], $COMPOSE['mailbox']) as $mbox => $uids) {
			$RCMAIL->storage->set_flag($uids, 'ANSWERED', $mbox);
			}
			}
			else if ($COMPOSE['forward_uid']) {
			foreach (rcmail_get_uids($COMPOSE['forward_uid'], $COMPOSE['mailbox']) as $mbox => $uids) {
			foreach (rcmail::get_uids($COMPOSE['forward_uid'], $COMPOSE['mailbox']) as $mbox => $uids) {
			$RCMAIL->storage->set_flag($uids, 'FORWARDED', $mbox);
			}
			}
			@@ -551,9 +563,11 @@
			$store_target = $drafts_mbox;
			}
			else if (!$RCMAIL->config->get('no_save_sent_messages')) {
			$store_target = rcube_utils::get_input_value('_store_target', rcube_utils::INPUT_POST);
			if (!strlen($store_target)) {
			$sore_target = $RCMAIL->config->get('sent_mbox');
			if (isset($_POST['_store_target'])) {
			$store_target = rcube_utils::get_input_value('_store_target', rcube_utils::INPUT_POST);
			}
			else {
			$store_target = $RCMAIL->config->get('sent_mbox');
			}
			}

			@@ -583,8 +597,9 @@
			else {
			$temp_dir = $RCMAIL->config->get('temp_dir');
			$mailbody_file = tempnam($temp_dir, 'rcmMsg');
			$msg = $MAIL_MIME->saveMessageBody($mailbody_file);

			if (!PEAR::isError($msg = $MAIL_MIME->saveMessageBody($mailbody_file))) {
			if (!is_a($msg, 'PEAR_Error')) {
			$msg = $mailbody_file;
			}
			}
			@@ -594,7 +609,7 @@
			$headers = '';
			}

			if (PEAR::isError($msg)) {
			if (is_a($msg, 'PEAR_Error')) {
			rcube::raise_error(array('code' => 650, 'type' => 'php',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => "Could not create message: ".$msg->getMessage()),
			@@ -618,7 +633,8 @@
			'message' => "Could not save message in $store_target"), true, false);

			if ($savedraft) {
			$OUTPUT->show_message('errorsaving', 'error');
			$RCMAIL->display_server_error('errorsaving');

			// start the auto-save timer again
			$OUTPUT->command('auto_save_start');
			$OUTPUT->send('iframe');
			@@ -667,23 +683,40 @@
			$OUTPUT->command('auto_save_start');
			}
			else {
			// Collect folders which could contain the composed message,
			// we'll refresh the list if currently opened folder is one of them (#1490238)
			$folders = array();

			if ($COMPOSE['mode'] == 'reply' \|\| $COMPOSE['mode'] == 'forward') {
			$folders[] = $COMPOSE['mailbox'];
			if (!$saveonly) {
			if (in_array($COMPOSE['mode'], array('reply', 'forward', 'draft'))) {
			$folders[] = $COMPOSE['mailbox'];
			}
			if (!empty($COMPOSE['param']['draft_uid']) && $drafts_mbox) {
			$folders[] = $drafts_mbox;
			}
			}

			rcmail_compose_cleanup($COMPOSE_ID);
			$OUTPUT->command('remove_compose_data', $COMPOSE_ID);

			if ($store_folder && !$saved) {
			$OUTPUT->command('sent_successfully', 'error', $RCMAIL->gettext('errorsavingsent'), $folders);
			$params = $saveonly ? null : array('prefix' => true);
			$RCMAIL->display_server_error('errorsavingsent', null, null, $params);
			if ($saveonly) {
			$OUTPUT->send('iframe');
			}

			$save_error = true;
			}
			else if ($store_folder) {
			$folders[] = $store_target;
			else {
			rcmail_compose_cleanup($COMPOSE_ID);
			$OUTPUT->command('remove_compose_data', $COMPOSE_ID);

			if ($store_folder) {
			$folders[] = $store_target;
			}
			}

			$OUTPUT->command('sent_successfully', 'confirmation', $RCMAIL->gettext('messagesent'), $folders);
			$msg = $RCMAIL->gettext($saveonly ? 'successfullysaved' : 'messagesent');

			$OUTPUT->command('sent_successfully', 'confirmation', $msg, $folders, $save_error);
			}

			$OUTPUT->send('iframe');
			@@ -728,11 +761,11 @@

			/**
			* go from this:
			* <img src="http[s]://.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
			* <img src="http[s]://.../tinymce/plugins/emoticons/img/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
			*
			* to this:
			*
			* <img src="/path/on/server/.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
			* <img src="/path/on/server/.../tinymce/plugins/emoticons/img/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
			*/
			function rcmail_fix_emoticon_paths($mime_message)
			{
			@@ -743,8 +776,10 @@
			// remove any null-byte characters before parsing
			$body = preg_replace('/\x00/', '', $body);

			$searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
			$offset = 0;
			$searchstr = 'program/js/tinymce/plugins/emoticons/img/';
			$assets_dir = $RCMAIL->config->get('assets_dir');
			$path = ($assets_dir ?: INSTALL_PATH) . '/' . $searchstr;
			$offset = 0;

			// keep track of added images, so they're only added once
			$included_images = array();
			@@ -757,12 +792,14 @@

			// 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;
			$img_file = $path . $image_name;

			if (! in_array($image_name, $included_images)) {
			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)) {
			$res = $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name);
			if (is_a($res, 'PEAR_Error')) {
			$RCMAIL->output->show_message("emoticonerror", 'error');
			continue;
			}

			array_push($included_images, $image_name);
			@@ -912,7 +949,8 @@
			if (!preg_match('/\.(php\|ini\|conf)$/', $file) && strpos($file, '/etc/') === false) {
			$footer = file_get_contents($file);
			if ($isHtml && !$html_footer) {
			$footer = '<pre>' . $footer . '</pre>';
			$t2h = new rcube_text2html($footer, false);
			$footer = $t2h->get_html();
			}
			return $footer;
			}