diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 129 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 5 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 215 |
3 files changed, 241 insertions, 108 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 139af6556..ba80a54f1 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -26,6 +26,7 @@ require_once('Mail/mimeDecode.php'); $MESSAGE_FORM = NULL; $REPLY_MESSAGE = NULL; $FORWARD_MESSAGE = NULL; +$DRAFT_MESSAGE = NULL; if (!is_array($_SESSION['compose'])) @@ -33,12 +34,12 @@ if (!is_array($_SESSION['compose'])) // add some labels to client -rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'sendingmessage', 'notsentwarning'); +rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'savingmessage', 'messagesaved'); -if ($_GET['_reply_uid'] || $_GET['_forward_uid']) +if ($_GET['_reply_uid'] || $_GET['_forward_uid'] || $_GET['_draft_uid']) { - $msg_uid = $_GET['_reply_uid'] ? $_GET['_reply_uid'] : $_GET['_forward_uid']; + $msg_uid = ($_GET['_reply_uid'] ? $_GET['_reply_uid'] : ($_GET['_forward_uid'] ? $_GET['_forward_uid'] : $_GET['_draft_uid'])); // similar as in program/steps/mail/show.inc $MESSAGE = array(); @@ -53,7 +54,7 @@ if ($_GET['_reply_uid'] || $_GET['_forward_uid']) $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject); $MESSAGE['parts'] = $mmd->getMimeNumbers($MESSAGE['structure']); - + if ($_GET['_reply_uid']) { $REPLY_MESSAGE = &$MESSAGE; @@ -65,22 +66,27 @@ if ($_GET['_reply_uid'] || $_GET['_forward_uid']) if ($_GET['_all']) $REPLY_MESSAGE['reply_all'] = 1; + } - else + else if ($_GET['_forward_uid']) { $FORWARD_MESSAGE = $MESSAGE; $_SESSION['compose']['forward_uid'] = $_GET['_forward_uid']; } - } - + else + { + $DRAFT_MESSAGE = $MESSAGE; + $_SESSION['compose']['draft_uid'] = $_GET['_draft_uid']; + } + } /****** compose mode functions ********/ function rcmail_compose_headers($attrib) { - global $IMAP, $REPLY_MESSAGE, $DB; + global $IMAP, $REPLY_MESSAGE, $DRAFT_MESSAGE, $DB; static $sa_recipients = array(); list($form_start, $form_end) = get_form_tags($attrib); @@ -139,8 +145,7 @@ function rcmail_compose_headers($attrib) break; } - - + if ($fname && !empty($_POST[$fname])) $fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE); else if ($header && is_object($REPLY_MESSAGE['headers'])) @@ -182,6 +187,19 @@ function rcmail_compose_headers($attrib) } } } + else if ($header && is_object($DRAFT_MESSAGE['headers'])) + { + // get drafted headers + if ($header=='to' && $DRAFT_MESSAGE['headers']->to) + $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->to); + + if ($header=='cc' && $DRAFT_MESSAGE['headers']->cc) + $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->cc); + + if ($header=='bcc' && $DRAFT_MESSAGE['headers']->bcc) + $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->bcc); + + } if ($fname && $field_type) @@ -199,7 +217,7 @@ function rcmail_compose_headers($attrib) if ($form_start) $out = $form_start.$out; - + return $out; } @@ -207,7 +225,7 @@ function rcmail_compose_headers($attrib) function rcmail_compose_header_from($attrib) { - global $IMAP, $REPLY_MESSAGE, $DB, $OUTPUT, $JS_OBJECT_NAME; + global $IMAP, $REPLY_MESSAGE, $DRAFT_MESSAGE, $DB, $OUTPUT, $JS_OBJECT_NAME; // pass the following attributes to the form class $field_attrib = array('name' => '_from'); @@ -269,6 +287,10 @@ function rcmail_compose_header_from($attrib) if ($REPLY_MESSAGE && is_array($REPLY_MESSAGE['FROM'])) $REPLY_MESSAGE['FROM'][] = $sql_arr['email']; + + if (strstr($DRAFT_MESSAGE['headers']->from,$sql_arr['email'])) + $from_id = $sql_arr['identity_id']; + } // overwrite identity selection with post parameter @@ -286,7 +308,7 @@ function rcmail_compose_header_from($attrib) $input_from = new textfield($field_attrib); $out = $input_from->show($_POST['_from']); } - + if ($form_start) $out = $form_start.$out; @@ -297,7 +319,7 @@ function rcmail_compose_header_from($attrib) function rcmail_compose_body($attrib) { - global $CONFIG, $OUTPUT, $REPLY_MESSAGE, $FORWARD_MESSAGE, $JS_OBJECT_NAME; + global $CONFIG, $OUTPUT, $REPLY_MESSAGE, $FORWARD_MESSAGE, $DRAFT_MESSAGE, $JS_OBJECT_NAME; list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); @@ -329,8 +351,32 @@ function rcmail_compose_body($attrib) if (strlen($body)) $body = rcmail_create_forward_body($body); } + + // forward message body inline + else if (is_array($DRAFT_MESSAGE['parts'])) + { + $body = rcmail_first_text_part($DRAFT_MESSAGE['parts']); + if (strlen($body)) + $body = rcmail_create_draft_body($body); + } $out = $form_start ? "$form_start\n" : ''; + + // Check if a previous save was done so we can delete it upon the next save + if (!empty($_POST['_draft_newsaveid'])) + $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => $_POST['_draft_newsaveid'])); + else if (strlen($DRAFT_MESSAGE['headers']->messageID) > 6) + $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => str_replace(array('<','>'),"",$DRAFT_MESSAGE['headers']->messageID) )); + + if ($saveid) + $out .= $saveid->show(); + + $newsaveid = new hiddenfield(array('name' => '_draft_newsaveid', 'value' => sprintf('%s@%s', md5(uniqid('rcmail'.rand(),true)), $_SESSION['imap_host']) )); + $out .= $newsaveid->show(); + + $drafttoggle = new hiddenfield(array('name' => '_draft', 'value' => 'yes')); + $out .= $drafttoggle->show(); + $out .= $textarea->show($body); $out .= $form_end ? "\n$form_end" : ''; @@ -456,11 +502,57 @@ function rcmail_create_forward_body($body) return $prefix.$body; } +function rcmail_create_draft_body($body) + { + global $IMAP, $DRAFT_MESSAGE; + + // add attachments + if (!isset($_SESSION['compose']['forward_attachments']) && is_array($DRAFT_MESSAGE['parts']) && sizeof($DRAFT_MESSAGE['parts'])>1) + { + $temp_dir = rcmail_create_compose_tempdir(); + + if (!is_array($_SESSION['compose']['attachments'])) + $_SESSION['compose']['attachments'] = array(); + + foreach ($DRAFT_MESSAGE['parts'] as $part) + { + if ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] || + (empty($part->disposition) && ($part->d_parameters['filename'] || $part->ctype_parameters['name']))) + { + $tmp_path = tempnam($temp_dir, 'rcmAttmnt'); + if ($fp = fopen($tmp_path, 'w')) + { + fwrite($fp, $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding'])); + fclose($fp); + + if ($part->d_parameters['filename']) + $_SESSION['compose']['attachments'][] = array('name' => $part->d_parameters['filename'], + 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary, + 'path' => $tmp_path); + + else if ($part->ctype_parameters['name']) + $_SESSION['compose']['attachments'][] = array('name' => $part->ctype_parameters['name'], + 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary, + 'path' => $tmp_path); + + else if ($part->headers['content-description']) + $_SESSION['compose']['attachments'][] = array('name' => $part->headers['content-description'], + 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary, + 'path' => $tmp_path); + } + } + } + + $_SESSION['compose']['forward_attachments'] = TRUE; + } + + return $body; + } function rcmail_compose_subject($attrib) { - global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE; + global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE, $DRAFT_MESSAGE; list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); @@ -492,6 +584,9 @@ function rcmail_compose_subject($attrib) $subject = 'Fwd: '.$FORWARD_MESSAGE['subject']; } + // creeate a draft-subject + else if (isset($DRAFT_MESSAGE['subject'])) + $subject = $DRAFT_MESSAGE['subject']; $out = $form_start ? "$form_start\n" : ''; $out .= $textfield->show($subject); @@ -619,7 +714,7 @@ function get_form_tags($attrib) { $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task'])); $hiddenfields->add(array('name' => '_action', 'value' => 'send')); - + $form_start = empty($attrib['form']) ? '<form name="form" action="./" method="post">' : ''; $form_start .= "\n$SESS_HIDDEN_FIELD\n"; $form_start .= $hiddenfields->show(); @@ -675,4 +770,4 @@ if ($DB->num_rows($sql_result)) parse_template('compose'); -?>
\ No newline at end of file +?> diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 1be690a0b..8eff11c06 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -64,6 +64,9 @@ $OUTPUT->add_script(sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $IM if ($CONFIG['trash_mbox']) $OUTPUT->add_script(sprintf("%s.set_env('trash_mailbox', '%s');", $JS_OBJECT_NAME, $CONFIG['trash_mbox'])); +if ($CONFIG['drafts_mbox']) + $OUTPUT->add_script(sprintf("%s.set_env('drafts_mailbox', '%s');", $JS_OBJECT_NAME, $CONFIG['drafts_mbox'])); + // return the mailboxlist in HTML @@ -1484,4 +1487,4 @@ function rcmail_compose_cleanup() } -?>
\ No newline at end of file +?> diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 65365ea7a..68e9fadd6 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -62,8 +62,16 @@ function rcmail_get_identity($id) return FALSE; } - - +if (strlen($_POST['_draft_saveid']) > 3) { + $olddraftmessageid = $_POST['_draft_saveid']; +} +if (strlen($_POST['_draft_newsaveid']) > 3) { + $newdraftmessageid = $_POST['_draft_newsaveid']; +} +if ($_POST['_draft']) { + $savedraft = 1; +} + /****** check submission and compose message ********/ @@ -94,8 +102,12 @@ $from = $identity_arr['mailto']; $first_to = is_array($to_address_arr[0]) ? $to_address_arr[0]['mailto'] : $mailto; -// create unique message-id -$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail')), $_SESSION['imap_host']); +// try the message-id submitted by the compose form +if ($newdraftmessageid) { + $message_id = sprintf('<%s>',$newdraftmessageid); +} else { + $message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $_SESSION['imap_host']); +} // compose headers array @@ -213,119 +225,142 @@ $msg_subject = $headers['Subject']; if ($MBSTRING && function_exists("mb_encode_mimeheader")) $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset); -// send thru SMTP server using cusotm SMTP library -if ($CONFIG['smtp_server']) - { - // generate list of recipients - $a_recipients = array($mailto); - - if (strlen($headers['Cc'])) - $a_recipients[] = $headers['Cc']; - if (strlen($headers['Bcc'])) - $a_recipients[] = $headers['Bcc']; - - // clean Bcc from header for recipients - $send_headers = $headers; - unset($send_headers['Bcc']); - - // generate message headers - $header_str = $MAIL_MIME->txtHeaders($send_headers); - - // send message - $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body); +// Begin SMTP Delivery Block +if (!$savedraft) { - // log error - if (!$sent) + // send thru SMTP server using custom SMTP library + if ($CONFIG['smtp_server']) { - raise_error(array('code' => 800, - 'type' => 'smtp', - 'line' => __LINE__, - 'file' => __FILE__, - 'message' => "SMTP error: $SMTP_ERROR"), TRUE, FALSE); + // generate list of recipients + $a_recipients = array($mailto); + + if (strlen($headers['Cc'])) + $a_recipients[] = $headers['Cc']; + if (strlen($headers['Bcc'])) + $a_recipients[] = $headers['Bcc']; + + // clean Bcc from header for recipients + $send_headers = $headers; + unset($send_headers['Bcc']); + + // generate message headers + $header_str = $MAIL_MIME->txtHeaders($send_headers); + + // send message + $sent = smtp_mail($from, $a_recipients, $header_str, $msg_body); + + // log error + if (!$sent) + { + raise_error(array('code' => 800, + 'type' => 'smtp', + 'line' => __LINE__, + 'file' => __FILE__, + 'message' => "SMTP error: $SMTP_ERROR"), TRUE, FALSE); + } } - } - -// send mail using PHP's mail() function -else - { - // unset some headers because they will be added by the mail() function - $headers_enc = $MAIL_MIME->headers($headers); - $headers_php = $MAIL_MIME->_headers; - unset($headers_php['To'], $headers_php['Subject']); - // reset stored headers and overwrite - $MAIL_MIME->_headers = array(); - $header_str = $MAIL_MIME->txtHeaders($headers_php); - - if (ini_get('safe_mode')) - $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str); + // send mail using PHP's mail() function else - $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from"); - } - - -// return to compose page if sending failed -if (!$sent) - { - show_message("sendingfailed", 'error'); - rcmail_overwrite_action('compose'); - return; - } - + { + // unset some headers because they will be added by the mail() function + $headers_enc = $MAIL_MIME->headers($headers); + $headers_php = $MAIL_MIME->_headers; + unset($headers_php['To'], $headers_php['Subject']); + + // reset stored headers and overwrite + $MAIL_MIME->_headers = array(); + $header_str = $MAIL_MIME->txtHeaders($headers_php); + + if (ini_get('safe_mode')) + $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str); + else + $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from"); + } + + + // return to compose page if sending failed + if (!$sent) + { + show_message("sendingfailed", 'error'); + rcmail_overwrite_action('compose'); + return; + } + + + // set repliead flag + if ($_SESSION['compose']['reply_uid']) + $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED'); -// set repliead flag -if ($_SESSION['compose']['reply_uid']) - $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED'); + } // End of SMTP Delivery Block +// Determine which folder to save message +if ($savedraft) { + $store_target = 'drafts_mbox'; +} else { + $store_target = 'sent_mbox'; +} -// copy message to sent folder -if ($CONFIG['sent_mbox']) +if ($CONFIG[$store_target]) { // create string of complete message headers $header_str = $MAIL_MIME->txtHeaders($headers); // check if mailbox exists - if (!in_array_nocase($CONFIG['sent_mbox'], $IMAP->list_mailboxes())) - $sent_folder = $IMAP->create_mailbox($CONFIG['sent_mbox'], TRUE); + if (!in_array_nocase($CONFIG[$store_target], $IMAP->list_mailboxes())) + $store_folder = $IMAP->create_mailbox($CONFIG[$store_target], TRUE); else - $sent_folder = TRUE; + $store_folder = TRUE; // append message to sent box - if ($sent_folder) - $saved = $IMAP->save_message($CONFIG['sent_mbox'], $header_str."\r\n".$msg_body); + if ($store_folder) + $saved = $IMAP->save_message($CONFIG[$store_target], $header_str."\r\n".$msg_body); // raise error if saving failed if (!$saved) raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__, - 'message' => "Could not save message in $CONFIG[sent_mbox]"), TRUE, FALSE); + 'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE); + + if ($olddraftmessageid) { + // delete previous saved draft + $a_deleteid = $IMAP->search($CONFIG['drafts_mbox'],'HEADER Message-ID',$olddraftmessageid); + $deleted = $IMAP->delete_message($IMAP->get_uid($a_deleteid[0],$CONFIG['drafts_mbox']),$CONFIG['drafts_mbox']); + + if (!$deleted) + raise_error(array('code' => 800, + 'type' => 'imap', + 'file' => __FILE__, + 'message' => "Could not delete message from ".$CONFIG['drafts_mbox']), TRUE, FALSE); + } } - -// log mail sending -if ($CONFIG['smtp_log']) +if ($savedraft) + { + show_message('messagesaved', 'confirmation'); + rcmail_overwrite_action('compose'); + } +else { - $log_entry = sprintf("[%s] User: %d on %s; Message for %s; Subject: %s\n", - date("d-M-Y H:i:s O", mktime()), - $_SESSION['user_id'], - $_SERVER['REMOTE_ADDR'], - $mailto, - $msg_subject); - - if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a')) + if ($CONFIG['smtp_log']) { - fwrite($fp, $log_entry); - fclose($fp); + $log_entry = sprintf("[%s] User: %d on %s; Message for %s; Subject: %s\n", + date("d-M-Y H:i:s O", mktime()), + $_SESSION['user_id'], + $_SERVER['REMOTE_ADDR'], + $mailto, + $msg_subject); + + if ($fp = @fopen($CONFIG['log_dir'].'/sendmail', 'a')) + { + fwrite($fp, $log_entry); + fclose($fp); + } } + show_message('messagesent', 'confirmation'); + rcmail_compose_cleanup(); } -// show confirmation -show_message('messagesent', 'confirmation'); - - -// kill compose entry from session -rcmail_compose_cleanup(); - -?>
\ No newline at end of file +?> |