From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations
---
program/steps/mail/sendmail.inc | 163 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 37 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index d0e0f78..98f413c 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -23,6 +23,7 @@
//require_once('lib/smtp.inc');
require_once('include/rcube_smtp.inc');
+require_once('lib/html2text.inc');
require_once('Mail/mime.php');
@@ -34,7 +35,6 @@
/****** message sending functions ********/
-
function rcmail_get_identity($id)
@@ -53,8 +53,9 @@
{
$sql_arr = $DB->fetch_assoc($sql_result);
$out = $sql_arr;
+ $name = strpos($sql_arr['name'], ",") ? '"'.$sql_arr['name'].'"' : $sql_arr['name'];
$out['string'] = sprintf('%s <%s>',
- rcube_charset_convert($sql_arr['name'], $CHARSET, $OUTPUT->get_charset()),
+ rcube_charset_convert($name, $CHARSET, $OUTPUT->get_charset()),
$sql_arr['mailto']);
return $out;
}
@@ -62,12 +63,75 @@
return FALSE;
}
+/**
+ * go from this:
+ * <img src=".../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
+ *
+ * to this:
+ *
+ * <IMG src="cid:smiley-cool.gif"/>
+ * ...
+ * ------part...
+ * Content-Type: image/gif
+ * Content-Transfer-Encoding: base64
+ * Content-ID: <smiley-cool.gif>
+ */
+function rcmail_attach_emoticons(&$mime_message)
+{
+ global $CONFIG, $INSTALL_PATH;
+
+ $htmlContents = $mime_message->getHtmlBody();
+
+ // remove any null-byte characters before parsing
+ $body = preg_replace('/\x00/', '', $htmlContents);
+
+ $last_img_pos = 0;
+
+ $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
+
+ // 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)));
+
+ $body_post = substr($body, $pos2);
+
+ 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))
+ {
+ show_message("emoticonerror", 'error');
+ }
+ array_push($included_images, $image_name);
+ }
+
+ $body = $body_pre . 'cid:_' . $image_name . $body_post;
+
+ $last_img_pos = $pos2;
+ }
+
+ $mime_message->setHTMLBody($body);
+}
+
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)), $_SESSION['imap_host']);
-
+$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), rcmail_mail_domain($_SESSION['imap_host']));
$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
+
+// remove all scripts and act as called in frame
+$OUTPUT->reset();
+$_framed = TRUE;
+
/****** check submission and compose message ********/
@@ -75,7 +139,8 @@
if (empty($_POST['_to']) && empty($_POST['_subject']) && $_POST['_message'])
{
show_message("sendingfailed", 'error');
- rcmail_overwrite_action('compose');
+ //rcmail_overwrite_action('compose');
+ rcube_iframe_response();
return;
}
@@ -87,7 +152,7 @@
$mailto_regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m');
$mailto_replace = array(', ', ', ', '');
-// repalce new lines and strip ending ', '
+// replace new lines and strip ending ', '
$mailto = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset));
// decode address strings
@@ -101,8 +166,8 @@
$identity_arr['string'] = $from;
// compose headers array
-$headers = array('Date' => date('D, j M Y G:i:s O'),
- 'From' => $identity_arr['string'],
+$headers = array('Date' => date('D, j M Y H:i:s O'),
+ 'From' => rcube_charset_convert($identity_arr['string'], $CHARSET, $message_charset),
'To' => rcube_charset_convert($mailto, $input_charset, $message_charset));
// additional recipients
@@ -133,7 +198,7 @@
if (!empty($_POST['_priority']))
{
$priority = (int)$_POST['_priority'];
- $a_priorities = array(1=>'lowest', 2=>'low', 4=>'high', 5=>'highest');
+ $a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
if ($str_priority = $a_priorities[$priority])
$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
}
@@ -178,9 +243,31 @@
$header_delm = "\n";
// create PEAR::Mail_mime instance
+
+$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
+$isHtml = ($isHtmlVal == "1");
+
$MAIL_MIME = new Mail_mime($header_delm);
-$MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
-//$MAIL_MIME->setTXTBody(wordwrap($message_body), FALSE, TRUE);
+
+// 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);
+
+ // add a plain text version of the e-mail as an alternative part.
+ $h2t = new html2text($message_body);
+ $plainTextPart = $h2t->get_text();
+ $MAIL_MIME->setTXTBody($plainTextPart);
+
+ // look for "emoticon" images from TinyMCE and copy into message as attachments
+ rcmail_attach_emoticons($MAIL_MIME);
+ }
+else
+ {
+ $MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
+ }
// add stored attachments, if any
@@ -208,12 +295,17 @@
'text_charset' => $message_charset);
// compose message body and get headers
-$msg_body = &$MAIL_MIME->get($message_param);
+$msg_body = $MAIL_MIME->get($message_param);
+// unset to save memory.
+unset($MAIL_MIME->_parts);
$msg_subject = $headers['Subject'];
if ($MBSTRING && function_exists("mb_encode_mimeheader"))
- $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset);
+{
+ mb_internal_encoding($CHARSET);
+ $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q');
+}
// Begin SMTP Delivery Block
if (!$savedraft) {
@@ -237,7 +329,8 @@
$header_str = $MAIL_MIME->txtHeaders($send_headers);
// send message
- $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body);
+ $smtp_response = array();
+ $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body, $smtp_response);
// log error
if (!$sent)
@@ -246,7 +339,7 @@
'type' => 'smtp',
'line' => __LINE__,
'file' => __FILE__,
- 'message' => "SMTP error: $SMTP_ERROR"), TRUE, FALSE);
+ 'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE);
}
}
@@ -273,7 +366,7 @@
if (!$sent)
{
show_message("sendingfailed", 'error');
- rcmail_overwrite_action('compose');
+ rcube_iframe_response();
return;
}
@@ -283,6 +376,8 @@
$IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
} // End of SMTP Delivery Block
+
+
// Determine which folder to save message
if ($savedraft)
@@ -311,17 +406,13 @@
// raise error if saving failed
if (!$saved)
{
- // clear the "saving message" busy status, and display failure
- $errorout = sprintf("parent.%s.display_message('%s', '%s');",
- $JS_OBJECT_NAME,
- addslashes(rep_specialchars_output(rcube_label(array('name' => 'errorsaving', 'vars' => NULL)))),
- 'error');
- print "<html><script type=\"text/javascript\">$errorout</script></html>";
raise_error(array('code' => 800,
'type' => 'imap',
'file' => __FILE__,
'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE);
- exit;
+
+ show_message('errorsaving', 'error');
+ rcube_iframe_response($errorout);
}
if ($olddraftmessageid)
@@ -342,35 +433,31 @@
if ($savedraft)
{
// clear the "saving message" busy status, and display success
- $frameout = sprintf("parent.%s.display_message('%s', '%s');",
- $JS_OBJECT_NAME,
- addslashes(rep_specialchars_output(rcube_label(array('name' => 'messagesaved', 'vars' => NULL)))),
- 'confirmation');
+ show_message('messagesaved', 'confirmation');
// update "_draft_saveid" on the page, which is used to delete a previous draft
- $frameout .= 'var foundid = parent.rcube_find_object("_draft_saveid",parent.document);';
- $frameout .= sprintf('foundid.value = "%s";',str_replace(array('<','>'),"",$message_id));
+ $frameout = "var foundid = parent.rcube_find_object('_draft_saveid', parent.document);\n";
+ $frameout .= sprintf("foundid.value = '%s';\n", str_replace(array('<','>'), "", $message_id));
// update the "cmp_hash" to prevent "Unsaved changes" warning
- $frameout .= sprintf("parent.%s.cmp_hash = parent.%s.compose_field_hash();",$JS_OBJECT_NAME,$JS_OBJECT_NAME);
-
+ $frameout .= sprintf("parent.%s.cmp_hash = parent.%s.compose_field_hash();\n", $JS_OBJECT_NAME, $JS_OBJECT_NAME);
+
// start the auto-save timer again
- $frameout .= sprintf("parent.%s.auto_save_start();",$JS_OBJECT_NAME);
+ $frameout .= sprintf("parent.%s.auto_save_start();", $JS_OBJECT_NAME);
// send html page with JS calls as response
- print "<html><script type=\"text/javascript\">$frameout</script></html>";
- exit;
+ rcube_iframe_response($frameout);
}
else
{
if ($CONFIG['smtp_log'])
{
- $log_entry = sprintf("[%s] User: %d on %s; Message for %s; Subject: %s\n",
+ $log_entry = sprintf("[%s] User: %d on %s; Message for %s; %s\n",
date("d-M-Y H:i:s O", mktime()),
$_SESSION['user_id'],
$_SERVER['REMOTE_ADDR'],
$mailto,
- $msg_subject);
+ !empty($smtp_response) ? join('; ', $smtp_response) : '');
if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a'))
{
@@ -378,8 +465,10 @@
fclose($fp);
}
}
- show_message('messagesent', 'confirmation');
+
rcmail_compose_cleanup();
+ rcube_iframe_response(sprintf("parent.$JS_OBJECT_NAME.sent_successfully('%s');",
+ rep_specialchars_output(rcube_label('messagesent'), 'js')));
}
--
Gitblit v1.9.1