diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-10-24 12:24:37 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-10-24 12:24:37 +0200 |
| commit | e04e3144407b7a863999d8aeaf6c3a653219359f (patch) | |
| tree | a384120c20254a15b831980970e51f0800f4f032 /program/steps | |
| parent | e377ed30d204f6b7315df98443f20c6628cb9673 (diff) | |
Add option to disable saving sent mail in Sent folder - no_save_sent_messages (#1488686)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 5 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 691eca2db..7ac9a8d39 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1528,6 +1528,11 @@ function rcmail_check_sent_folder($folder, $create=false) { global $RCMAIL; + // we'll not save the message, so it doesn't matter + if ($RCMAIL->config->get('no_save_sent_messages')) { + return true; + } + if ($RCMAIL->storage->folder_exists($folder, true)) { return true; } diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 9fe510794..4fac872d1 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -49,7 +49,7 @@ if (!$savedraft) { if(!empty($CONFIG['sendmail_delay'])) { $wait_sec = time() - intval($CONFIG['sendmail_delay']) - intval($CONFIG['last_message_time']); - if($wait_sec < 0) { + if ($wait_sec < 0) { $OUTPUT->show_message('senttooquickly', 'error', array('sec' => $wait_sec * -1)); $OUTPUT->send('iframe'); } @@ -676,19 +676,18 @@ if (!$savedraft) $smtp_error, $mailbody_file, $smtp_opts); // return to compose page if sending failed - if (!$sent) - { + if (!$sent) { // remove temp file if ($mailbody_file) { unlink($mailbody_file); - } + } if ($smtp_error) $OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']); else $OUTPUT->show_message('sendingfailed', 'error'); $OUTPUT->send('iframe'); - } + } // save message sent time if (!empty($CONFIG['sendmail_delay'])) @@ -706,7 +705,7 @@ if (!$savedraft) // Determine which folder to save message if ($savedraft) $store_target = $CONFIG['drafts_mbox']; -else +else if (!$RCMAIL->config->get('no_save_sent_messages')) $store_target = isset($_POST['_store_target']) ? get_input_value('_store_target', RCUBE_INPUT_POST) : $CONFIG['sent_mbox']; if ($store_target) { |