githubFork/roundcubemail.git

			@@ -273,9 +273,10 @@
			}

			// 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) {
			@@ -310,10 +311,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');
			}
			}
			@@ -421,7 +428,7 @@
			$attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment);

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

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

			$MAIL_MIME->setHTMLBody($message_body);

			@@ -738,11 +745,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)
			{
			@@ -753,7 +760,7 @@
			// remove any null-byte characters before parsing
			$body = preg_replace('/\x00/', '', $body);

			$searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
			$searchstr = 'program/js/tinymce/plugins/emoticons/img/';
			$offset = 0;

			// keep track of added images, so they're only added once