From 6084d782f2e6e57248463bf10b99eeee543e0049 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 14 Nov 2010 06:35:38 -0500
Subject: [PATCH] - Fix hanling of HTML entity strings in plai text messages
---
program/steps/mail/compose.inc | 150 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 109 insertions(+), 41 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 406033c..3f2b8c5 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -33,9 +33,17 @@
// Since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear
-if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET))
+$MESSAGE_ID = get_input_value('_id', RCUBE_INPUT_GET);
+if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != $MESSAGE_ID)
{
rcmail_compose_cleanup();
+
+ // Infinite redirect prevention in case of broken session (#1487028)
+ if ($MESSAGE_ID)
+ raise_error(array('code' => 500, 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Invalid session"), true, true);
+
$_SESSION['compose'] = array(
'id' => uniqid(mt_rand()),
'param' => request2param(RCUBE_INPUT_GET),
@@ -92,12 +100,8 @@
}
// check if folder for saving sent messages exists and is subscribed (#1486802)
- if (($sent_folder = $_SESSION['compose']['param']['sent_mbox']) && !$IMAP->mailbox_exists($sent_folder, true)) {
- // folder may exist but isn't subscribed (#1485241)
- if (!$IMAP->mailbox_exists($sent_folder))
- $IMAP->create_mailbox($sent_folder, true);
- else
- $IMAP->subscribe($sent_folder);
+ if ($sent_folder = $_SESSION['compose']['param']['sent_mbox']) {
+ rcmail_check_sent_folder($sent_folder, true);
}
// redirect to a unique URL with all parameters stored in session
@@ -108,7 +112,8 @@
// add some labels to client
$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage',
- 'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'fileuploaderror');
+ 'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'fileuploaderror',
+ 'autocompletechars');
// add config parameters to client script
if (!empty($CONFIG['drafts_mbox'])) {
@@ -119,6 +124,7 @@
$OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
$OUTPUT->set_env('sig_above', $CONFIG['sig_above']);
$OUTPUT->set_env('top_posting', $CONFIG['top_posting']);
+$OUTPUT->set_env('autocomplete_min_length', $CONFIG['autocomplete_min_length']);
// get reference message and set compose mode
if ($msg_uid = $_SESSION['compose']['param']['reply_uid'])
@@ -169,6 +175,13 @@
$MESSAGE->reply_all = $_SESSION['compose']['param']['all'];
$OUTPUT->set_env('compose_mode', 'reply');
+
+ // Save the sent message in the same folder of the message being replied to
+ if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $_SESSION['compose']['mailbox'])
+ && rcmail_check_sent_folder($sent_folder, false)
+ ) {
+ $_SESSION['compose']['param']['sent_mbox'] = $sent_folder;
+ }
}
else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
{
@@ -183,8 +196,15 @@
$_SESSION['compose']['forward_uid'] = $info['uid'];
$_SESSION['compose']['mailbox'] = $info['folder'];
+
+ // Save the sent message in the same folder of the message being replied to
+ if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $info['folder'])
+ && rcmail_check_sent_folder($sent_folder, false)
+ ) {
+ $_SESSION['compose']['param']['sent_mbox'] = $sent_folder;
+ }
}
-
+
if ($MESSAGE->headers->in_reply_to)
$_SESSION['compose']['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';
@@ -248,19 +268,19 @@
$header = 'reply-to';
case 'mailreplyto':
- case 'mailreply-to':
+ case 'mail-reply-to':
if (!$fname) {
$fname = '_mailreplyto';
$param = 'mailreplyto';
- $header = 'mailreply-to';
+ $header = 'mail-reply-to';
}
case 'mailfollowupto':
- case 'mailfollowup-to':
+ case 'mail-followup-to':
if (!$fname) {
$fname = '_mailfollowupto';
$param = 'mailfollowupto';
- $header = 'mailfollowup-to';
+ $header = 'mail-followup-to';
}
$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
@@ -452,16 +472,17 @@
$from_id = get_input_value('_from', RCUBE_INPUT_POST);
else if (!empty($_SESSION['compose']['param']['from']))
$from_id = $_SESSION['compose']['param']['from'];
- else {
+ else if (count($user_identities) > 1) {
$return_path = $MESSAGE->headers->others['return-path'];
// Set identity
foreach ($user_identities as $sql_arr) {
// set draft's identity
- if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
- if (strstr($MESSAGE->headers->from, $sql_arr['email']))
+ if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
+ if ($MESSAGE->headers->from == format_email_recipient($sql_arr['email'], $sql_arr['name'])) {
$from_id = $sql_arr['identity_id'];
break;
+ }
}
// set identity if it's one of the reply-message recipients (with prio for default identity)
else if (in_array($sql_arr['email'], $a_recipients) && (empty($from_id) || $sql_arr['standard']))
@@ -537,7 +558,12 @@
$body = $MESSAGE->first_html_part();
}
else {
- $body = rcmail_plain_body($MESSAGE->first_text_part());
+ $body = $MESSAGE->first_text_part();
+ // try to remove the signature
+ if ($RCMAIL->config->get('strip_existing_sig', true))
+ $body = rcmail_remove_signature($body);
+ // add HTML formatting
+ $body = rcmail_plain_body($body);
if ($body)
$body = '<pre>' . $body . '</pre>';
}
@@ -620,9 +646,20 @@
$out .= $msgtype->show();
// If desired, set this textarea to be editable by TinyMCE
- if ($isHtml) $attrib['class'] = 'mce_editor';
- $textarea = new html_textarea($attrib);
- $out .= $textarea->show($MESSAGE_BODY);
+ if ($isHtml) {
+ $attrib['class'] = 'mce_editor';
+ $textarea = new html_textarea($attrib);
+ $out .= $textarea->show($MESSAGE_BODY);
+ }
+ else {
+ $textarea = new html_textarea($attrib);
+ $out .= $textarea->show('');
+ // quote plain text, inject into textarea
+ $table = get_html_translation_table(HTML_SPECIALCHARS);
+ $MESSAGE_BODY = strtr($MESSAGE_BODY, $table);
+ $out = substr($out, 0, -11) . $MESSAGE_BODY . '</textarea>';
+ }
+
$out .= $form_end ? "\n$form_end" : '';
$OUTPUT->set_env('composebody', $attrib['id']);
@@ -710,18 +747,8 @@
$body = preg_replace('/\r?\n/', "\n", $body);
// try to remove the signature
- if ($RCMAIL->config->get('strip_existing_sig', true)) {
- $len = strlen($body);
- while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
- if ($sp == 0 || $body[$sp-1] == "\n") {
- // do not touch blocks with more that X lines
- if (substr_count($body, "\n", $sp) < $RCMAIL->config->get('sig_max_lines', 15)) {
- $body = substr($body, 0, max(0, $sp-1));
- }
- break;
- }
- }
- }
+ if ($RCMAIL->config->get('strip_existing_sig', true))
+ $body = rcmail_remove_signature($body);
// soft-wrap and quote message text
$body = rcmail_wrap_and_quote(rtrim($body, "\n"), $LINE_LENGTH);
@@ -835,11 +862,32 @@
return $body;
}
-
-
+
+
+function rcmail_remove_signature($body)
+{
+ global $RCMAIL;
+
+ $len = strlen($body);
+ $sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);
+
+ while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
+ if ($sp == 0 || $body[$sp-1] == "\n") {
+ // do not touch blocks with more that X lines
+ if (substr_count($body, "\n", $sp) < $sig_max_lines) {
+ $body = substr($body, 0, max(0, $sp-1));
+ }
+ break;
+ }
+ }
+
+ return $body;
+}
+
+
function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
{
- global $OUTPUT;
+ global $RCMAIL;
$cid_map = $messages = array();
foreach ((array)$message->mime_parts as $pid => $part)
@@ -863,7 +911,7 @@
if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) {
$_SESSION['compose']['attachments'][$attachment['id']] = $attachment;
if ($bodyIsHtml && ($part->content_id || $part->content_location)) {
- $url = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
+ $url = $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
if ($part->content_id)
$cid_map['cid:'.$part->content_id] = $url;
else
@@ -881,14 +929,14 @@
function rcmail_write_inline_attachments(&$message)
{
- global $OUTPUT;
+ global $RCMAIL;
$cid_map = array();
foreach ((array)$message->mime_parts as $pid => $part) {
if (($part->content_id || $part->content_location) && $part->filename) {
if ($attachment = rcmail_save_attachment($message, $pid)) {
$_SESSION['compose']['attachments'][$attachment['id']] = $attachment;
- $url = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
+ $url = $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
if ($part->content_id)
$cid_map['cid:'.$part->content_id] = $url;
else
@@ -1236,6 +1284,26 @@
}
+function rcmail_check_sent_folder($folder, $create=false)
+{
+ global $IMAP;
+
+ if ($IMAP->mailbox_exists($folder, true)) {
+ return true;
+ }
+
+ // folder may exist but isn't subscribed (#1485241)
+ if ($create) {
+ if (!$IMAP->mailbox_exists($folder))
+ return $IMAP->create_mailbox($folder, true);
+ else
+ return $IMAP->subscribe($folder);
+ }
+
+ return false;
+}
+
+
function get_form_tags($attrib)
{
global $RCMAIL, $MESSAGE_FORM;
@@ -1249,13 +1317,13 @@
$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
$form_start .= $hiddenfields->show();
}
-
+
$form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '</form>' : '';
$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
-
+
if (!$MESSAGE_FORM)
$RCMAIL->output->add_gui_object('messageform', $form_name);
-
+
$MESSAGE_FORM = $form_name;
return array($form_start, $form_end);
--
Gitblit v1.9.1