From 82d69583fdef54e70189d3f8eae2d2175ff5b5e2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 02 Mar 2012 08:09:05 -0500
Subject: [PATCH] - Fixed double-quotes handling in recipient names
---
program/steps/mail/sendmail.inc | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index b06c620..bb2bd27 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -179,7 +179,11 @@
// address with name (handle name)
} else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
$address = $matches[0];
- $name = trim(str_replace($address, '', $item), '" ');
+ $name = trim(str_replace($address, '', $item));
+ if ($name[0] == '"' && $name[count($name)-1] == '"') {
+ $name = substr($name, 1, -1);
+ }
+ $name = stripcslashes($name);
$address = rcube_idn_to_ascii(trim($address, '<>'));
$result[] = format_email_recipient($address, $name);
$item = $address;
@@ -740,9 +744,10 @@
$saved = $draft_idx->get_element('FIRST');
}
$COMPOSE['param']['draft_uid'] = $saved;
+ $plugin = $RCMAIL->plugins->exec_hook('message_draftsaved', array('msgid' => $msgid, 'uid' => $saved, 'folder' => $store_target));
// display success
- $OUTPUT->show_message('messagesaved', 'confirmation');
+ $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'messagesaved', 'confirmation');
// update "_draft_saveid" and the "cmp_hash" to prevent "Unsaved changes" warning
$OUTPUT->command('set_draft_id', $msgid);
--
Gitblit v1.9.1