From 7dfb1fba5001299300736e6b5d95d9400575e3e7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Sep 2008 14:59:02 -0400
Subject: [PATCH] Set the right number of arguments for setcookie()
---
program/steps/mail/sendmail.inc | 126 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 58 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 75000d4..543895d 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -21,15 +21,37 @@
*/
-if (!isset($_SESSION['compose']['id']))
- {
- rcmail_overwrite_action('list');
- return;
- }
+// remove all scripts and act as called in frame
+$OUTPUT->reset();
+$OUTPUT->framed = TRUE;
+
+$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
+
+/****** checks ********/
+
+if (!isset($_SESSION['compose']['id'])) {
+ raise_error(array('code' => 500, 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false);
+ console("Sendmail error", $_SESSION['compose']);
+ $OUTPUT->show_message("An internal error occured. Please try again.", 'error');
+ $OUTPUT->send('iframe');
+}
+
+if (!$savedraft && empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) && empty($_POST['_subject']) && $_POST['_message']) {
+ $OUTPUT->show_message('sendingfailed', 'error');
+ $OUTPUT->send('iframe');
+}
+
+if(!$savedraft && !empty($CONFIG['sendmail_delay'])) {
+ $wait_sec = time() - intval($CONFIG['sendmail_delay']) - intval($_SESSION['last_message_time']);
+ if($wait_sec < 0)
+ {
+ $OUTPUT->show_message('senttooquickly', 'error', array('sec' => $wait_sec * -1));
+ $OUTPUT->send('iframe');
+ }
+}
/****** message sending functions ********/
-
// get identity record
function rcmail_get_identity($id)
@@ -110,27 +132,13 @@
$mime_message->setHTMLBody($body);
}
+
+/****** compose message ********/
+
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)), $RCMAIL->config->mail_domain($_SESSION['imap_host']));
-$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
-
-// remove all scripts and act as called in frame
-$OUTPUT->reset();
-$OUTPUT->framed = TRUE;
-
-
-/****** check submission and compose message ********/
-
-
-if (!$savedraft && empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc']) && empty($_POST['_subject']) && $_POST['_message'])
- {
- $OUTPUT->show_message("sendingfailed", 'error');
- $OUTPUT->send('iframe');
- return;
- }
-
// set default charset
$input_charset = $OUTPUT->get_charset();
@@ -221,15 +229,19 @@
if (!empty($CONFIG['useragent']))
$headers['User-Agent'] = $CONFIG['useragent'];
+$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
+$isHtml = ($isHtmlVal == "1");
+
// fetch message body
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
+
+// remove signature's div ID
+if (!$savedraft && $isHtml)
+ $message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);
// append generic footer to all messages
if (!$savedraft && !empty($CONFIG['generic_message_footer']) && ($footer = file_get_contents(realpath($CONFIG['generic_message_footer']))))
$message_body .= "\r\n" . rcube_charset_convert($footer, 'UTF-8', $message_charset);
-
-$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
-$isHtml = ($isHtmlVal == "1");
// create extended PEAR::Mail_mime instance
$MAIL_MIME = new rcube_mail_mime($RCMAIL->config->header_delimiter());
@@ -288,11 +300,11 @@
// .eml attachments send inline
$MAIL_MIME->addAttachment($attachment['path'],
- $ctype,
+ $ctype,
$attachment['name'], true,
- ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
+ ($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
- $message_charset);
+ $message_charset);
}
}
@@ -340,8 +352,11 @@
{
$OUTPUT->show_message("sendingfailed", 'error');
$OUTPUT->send('iframe');
- return;
}
+
+ // save message sent time
+ if (!empty($CONFIG['sendmail_delay']))
+ $_SESSION['last_message_time'] = time();
// set replied/forwarded flag
if ($_SESSION['compose']['reply_uid'])
@@ -355,30 +370,38 @@
// Determine which folder to save message
if ($savedraft)
- $store_target = 'drafts_mbox';
-else
- $store_target = 'sent_mbox';
+ $store_target = $CONFIG['drafts_mbox'];
+else
+ $store_target = isset($_POST['_store_target']) ? get_input_value('_store_target', RCUBE_INPUT_POST) : $CONFIG['sent_mbox'];
-if ($CONFIG[$store_target])
+if ($store_target)
{
// check if mailbox exists
- if (!in_array_nocase($CONFIG[$store_target], $IMAP->list_mailboxes()))
- $store_folder = $IMAP->create_mailbox($CONFIG[$store_target], TRUE);
+ if (!in_array_nocase($store_target, $IMAP->list_mailboxes()))
+ {
+ // folder may be existing but not subscribed (#1485241)
+ if (!in_array_nocase($store_target, $IMAP->list_unsubscribed()))
+ $store_folder = $IMAP->create_mailbox($store_target, TRUE);
+ else if ($IMAP->subscribe($store_target))
+ $store_folder = TRUE;
+ }
else
$store_folder = TRUE;
// append message to sent box
if ($store_folder)
- $saved = $IMAP->save_message($CONFIG[$store_target], $MAIL_MIME->getMessage());
+ $saved = $IMAP->save_message($store_target, $MAIL_MIME->getMessage());
// raise error if saving failed
if (!$saved)
{
raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__,
- 'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE);
+ 'message' => "Could not save message in $store_target"), TRUE, FALSE);
- $OUTPUT->show_message('errorsaving', 'error');
- $OUTPUT->send('iframe');
+ if ($savedraft) {
+ $OUTPUT->show_message('errorsaving', 'error');
+ $OUTPUT->send('iframe');
+ }
}
if ($olddraftmessageid)
@@ -416,25 +439,12 @@
}
else
{
- if ($CONFIG['smtp_log'])
- {
- $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,
- !empty($smtp_response) ? join('; ', $smtp_response) : '');
-
- if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a'))
- {
- fwrite($fp, $log_entry);
- fclose($fp);
- }
- }
-
rcmail_compose_cleanup();
- $OUTPUT->command('sent_successfully', rcube_label('messagesent'));
+
+ if ($store_folder && !$saved)
+ $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
+ else
+ $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'));
$OUTPUT->send('iframe');
}
--
Gitblit v1.9.1