X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=3c03f9fea77920753c30762f0777744a342eb76c;hp=38e101f508c4c66309ccb8e41a63f052f3eba033;hb=628bce99c404e37bbebc40555b591ed101400671;hpb=50706f77ec7e6e107ec2d41691a9e3b125b7088f diff --git a/src/compose.php b/src/compose.php index 38e101f5..3c03f9fe 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,11 +1,7 @@ setDelayedErrors(true); /** SESSION/POST/GET VARS */ sqgetGlobalVar('session',$session); @@ -76,23 +70,39 @@ sqgetGlobalVar('draft',$draft); sqgetGlobalVar('draft_id',$draft_id); sqgetGlobalVar('ent_num',$ent_num); sqgetGlobalVar('saved_draft',$saved_draft); -sqgetGlobalVar('delete_draft',$delete_draft); -sqgetGlobalVar('startMessage',$startMessage); + +if ( sqgetGlobalVar('delete_draft',$delete_draft) ) { + $delete_draft = (int)$delete_draft; +} + +if ( sqgetGlobalVar('startMessage',$startMessage) ) { + $startMessage = (int)$startMessage; +} else { + $startMessage = 1; +} + /** POST VARS */ -sqgetGlobalVar('sigappend', $sigappend, SQ_POST); -sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST); -sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST); -sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST); -sqgetGlobalVar('do_delete', $do_delete, SQ_POST); -sqgetGlobalVar('delete', $delete, SQ_POST); -sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); +sqgetGlobalVar('sigappend', $sigappend, SQ_POST); +sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST); +sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST); +sqgetGlobalVar('addr_search_cancel', $html_addr_search_cancel, SQ_POST); +sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST); +sqgetGlobalVar('do_delete', $do_delete, SQ_POST); +sqgetGlobalVar('delete', $delete, SQ_POST); +sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { $html_addr_search_done = 'Use Addresses'; } /** GET VARS */ sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET); +if ( sqgetGlobalVar('account', $temp, SQ_GET) ) { + $iAccount = (int) $temp; +} else { + $iAccount = 0; +} + /** get smaction */ if ( !sqgetGlobalVar('smaction',$action) ) @@ -105,6 +115,25 @@ if ( !sqgetGlobalVar('smaction',$action) ) if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new'; } +/** + * Here we decode the data passed in from mailto.php. + */ +if ( sqgetGlobalVar('mailtodata', $mailtodata, SQ_GET) ) { + $trtable = array('to' => 'send_to', + 'cc' => 'send_to_cc', + 'bcc' => 'send_to_bcc', + 'body' => 'body', + 'subject' => 'subject'); + $mtdata = unserialize($mailtodata); + + foreach ($trtable as $f => $t) { + if ( !empty($mtdata[$f]) ) { + $$t = $mtdata[$f]; + } + } + unset($mailtodata,$mtdata, $trtable); +} + /* Location (For HTTP 1.1 Header("Location: ...") redirects) */ $location = get_location(); /* Identities (fetch only once) */ @@ -169,9 +198,11 @@ function replyAllString($header) { function getReplyCitation($orig_from, $orig_date) { global $reply_citation_style, $reply_citation_start, $reply_citation_end; - // FIXME: why object is rewritten with string. - $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); -// $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); + if (!is_object($orig_from)) { + $sOrig_from = ''; + } else { + $sOrig_from = decodeHeader($orig_from->getAddress(false),false,false,true); + } /* First, return an empty string when no citation style selected. */ if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { @@ -179,7 +210,7 @@ function getReplyCitation($orig_from, $orig_date) { } /* Make sure our final value isn't an empty string. */ - if ($orig_from == '') { + if ($sOrig_from == '') { return ''; } @@ -189,31 +220,30 @@ function getReplyCitation($orig_from, $orig_date) { /** * To translators: %s is for author's name */ - $full_reply_citation = sprintf(_("%s said:"),$orig_from); + $full_reply_citation = sprintf(_("%s wrote:"),$sOrig_from); break; case 'quote_who': - // FIXME: do we have to translate xml formating? - $start = '<' . _("quote") . ' ' . _("who") . '="'; + $start = ''; - $full_reply_citation = $start . $orig_from . $end; + $full_reply_citation = $start . $sOrig_from . $end; break; case 'date_time_author': /** * To translators: - * first %s is for date string, second %s is for author's name. Date uses + * first %s is for date string, second %s is for author's name. Date uses * formating from "D, F j, Y g:i a" and "D, F j, Y H:i" translations. * Example string: - * "On Sat, December 24, 2004 23:59, Santa said:" + * "On Sat, December 24, 2004 23:59, Santa wrote:" * If you have to put author's name in front of date string, check comments about * argument swapping at http://www.php.net/sprintf */ - $full_reply_citation = sprintf(_("On %s, %s said:"), getLongDateString($orig_date), $orig_from); + $full_reply_citation = sprintf(_("On %s, %s wrote:"), getLongDateString($orig_date), $sOrig_from); break; case 'user-defined': $start = $reply_citation_start . ($reply_citation_start == '' ? '' : ' '); $end = $reply_citation_end; - $full_reply_citation = $start . $orig_from . $end; + $full_reply_citation = $start . $sOrig_from . $end; break; default: return ''; @@ -226,9 +256,9 @@ function getReplyCitation($orig_from, $orig_date) { /** * Creates header fields in forwarded email body * - * $default_charset global must be set correctly before you call this function. + * $default_charset global must be set correctly before you call this function. * @param object $orig_header - * @return $string + * @return $string */ function getforwardHeader($orig_header) { global $editor_size, $default_charset; @@ -283,13 +313,19 @@ if (sqsession_is_registered('session_expired_post')) { sqsession_unregister('session_expired_post'); session_write_close(); } else { - foreach ($session_expired_post as $postvar => $val) { - if (isset($val)) { - $$postvar = $val; - } else { - $$postvar = ''; + // these are the vars that we can set from the expired composed session + $compo_var_list = array ( 'send_to', 'send_to_cc','body','startMessage', + 'passed_body','use_signature','signature','attachments','subject','newmail', + 'send_to_bcc', 'passed_id', 'mailbox', 'from_htmladdr_search', 'identity', + 'draft_id', 'delete_draft', 'mailprio', 'edit_as_new', 'compose_messsages', + 'composesession', 'request_mdn', 'request_dr'); + + foreach ($compo_var_list as $var) { + if ( isset($session_expired_post[$var]) && !isset($$var) ) { + $$var = $session_expired_post[$var]; } } + $compose_messages = unserialize(urldecode($restoremessages)); sqsession_register($compose_messages,'compose_messages'); sqsession_register($composesession,'composesession'); @@ -307,7 +343,13 @@ if (sqsession_is_registered('session_expired_post')) { if ($compose_new_win == '1') { compose_Header($color, $mailbox); } else { - displayPageHeader($color, $mailbox); + $sHeaderJs = (isset($sHeaderJs)) ? $sHeaderJs : ''; + if (strpos($action, 'reply') !== false && $reply_focus) { + $sBodyTagJs = 'onload="checkForm(\''.$replyfocus.'\');"'; + } else { + $sBodyTagJs = 'onload="checkForm();"'; + } + displayPageHeader($color, $mailbox,$sHeaderJs,$sBodyTagJs); } showInputForm($session, false); exit(); @@ -315,6 +357,8 @@ if (sqsession_is_registered('session_expired_post')) { if (!isset($composesession)) { $composesession = 0; sqsession_register(0,'composesession'); +} else { + $composesession = (int)$composesession; } if (!isset($session) || (isset($newmessage) && $newmessage)) { @@ -326,13 +370,14 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) { if (!isset($compose_messages)) { $compose_messages = array(); } + if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) { - /* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */ $composeMessage = new Message(); $rfc822_header = new Rfc822Header(); $composeMessage->rfc822_header = $rfc822_header; $composeMessage->reply_rfc822_header = ''; $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages,'compose_messages'); } else { $composeMessage=$compose_messages[$session]; @@ -357,20 +402,41 @@ if ($draft) { $draft_message = _("Draft Email Saved"); /* If this is a resumed draft, then delete the original */ if(isset($delete_draft)) { - Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) . - "&message=$delete_draft&startMessage=1&saved_draft=yes"); - exit(); + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false); + sqimap_mailbox_select($imap_stream, $draft_folder); + // force bypass_trash=true because message should be saved when deliverMessage() returns true. + // in current implementation of sqimap_msgs_list_flag() single message id can + // be submitted as string. docs state that it should be array. + sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true); + if ($auto_expunge) { + sqimap_mailbox_expunge($imap_stream, $draft_folder, true); + } + sqimap_logout($imap_stream); } - else { - if ($compose_new_win == '1') { + + $oErrorHandler->saveDelayedErrors(); + session_write_close(); + + if ($compose_new_win == '1') { + if ( !isset($pageheader_sent) || !$pageheader_sent ) { Header("Location: $location/compose.php?saved_draft=yes&session=$composesession"); - exit(); + } else { + echo '

' + . _("Return") . '
'; } - else { + exit(); + } else { + if ( !isset($pageheader_sent) || !$pageheader_sent ) { Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . - "&startMessage=1¬e=".urlencode($draft_message)); - exit(); + "&startMessage=1¬e=".urlencode($draft_message)); + } else { + echo '

' + . _("Return") . '
'; } + exit(); } } } @@ -384,7 +450,7 @@ if ($send) { if (checkInput(false) && !isset($AttachFailure)) { if ($mailbox == "All Folders") { /* We entered compose via the search results page */ - $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */ + $mailbox = 'INBOX'; /* Send 'em to INBOX, that's safe enough */ } $urlMailbox = urlencode (trim($mailbox)); if (! isset($passed_id)) { @@ -411,10 +477,10 @@ if ($send) { if( $line <> '-- ' ) { $line = rtrim($line); } - if (strlen($line) <= $editor_size + 1) { + if (sq_strlen($line,$default_charset) <= $editor_size + 1) { $newBody .= $line . "\n"; } else { - sqWordWrap($line, $editor_size); + sqWordWrap($line, $editor_size,$default_charset); $newBody .= $line . "\n"; } @@ -425,23 +491,56 @@ if ($send) { $composeMessage=$compose_messages[$session]; $Result = deliverMessage($composeMessage); + + // NOTE: this hook changed in 1.5.2 from sending $Result and + // $composeMessage as args #2 and #3 to being in an array + // under arg #2 + do_hook('compose_send_after', $temp=array(&$Result, &$composeMessage)); if (! $Result) { showInputForm($session); exit(); } unset($compose_messages[$session]); + + /* if it is resumed draft, delete draft message */ if ( isset($delete_draft)) { - Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). - "&message=$delete_draft&startMessage=1&mail_sent=yes"); - exit(); + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, false); + sqimap_mailbox_select($imap_stream, $draft_folder); + // bypass_trash=true because message should be saved when deliverMessage() returns true. + // in current implementation of sqimap_msgs_list_flag() single message id can + // be submitted as string. docs state that it should be array. + sqimap_msgs_list_delete($imap_stream, $draft_folder, $delete_draft, true); + if ($auto_expunge) { + sqimap_mailbox_expunge($imap_stream, $draft_folder, true); + } + sqimap_logout($imap_stream); } - if ($compose_new_win == '1') { + /* + * Store the error array in the session because they will be lost on a redirect + */ + $oErrorHandler->saveDelayedErrors(); + session_write_close(); - Header("Location: $location/compose.php?mail_sent=yes"); - } - else { - Header("Location: $location/right_main.php?mailbox=$urlMailbox". + if ($compose_new_win == '1') { + if ( !isset($pageheader_sent) || !$pageheader_sent ) { + Header("Location: $location/compose.php?mail_sent=yes"); + } else { + echo '

' + . _("Return") . '
'; + } + exit(); + } else { + if ( !isset($pageheader_sent) || !$pageheader_sent ) { + Header("Location: $location/right_main.php?mailbox=$urlMailbox". "&startMessage=$startMessage&mail_sent=yes"); + } else { + echo '

" + . _("Return") . '
'; + } + exit(); } } else { if ($compose_new_win == '1') { @@ -489,12 +588,12 @@ if ($send) { } } showInputForm($session); -} elseif (isset($html_addr_search)) { +} elseif (isset($html_addr_search) && !isset($html_addr_search_cancel)) { if (isset($_FILES['attachfile']) && $_FILES['attachfile']['tmp_name'] && $_FILES['attachfile']['tmp_name'] != 'none') { if(saveAttachedFiles($session)) { - plain_error_message(_("Could not move/copy file. File not attached"), $color); + plain_error_message(_("Could not move/copy file. File not attached")); } } /* @@ -503,14 +602,14 @@ if ($send) { */ include_once('./addrbook_search_html.php'); } elseif (isset($attach)) { - if (saveAttachedFiles($session)) { - plain_error_message(_("Could not move/copy file. File not attached"), $color); - } if ($compose_new_win == '1') { compose_Header($color, $mailbox); } else { displayPageHeader($color, $mailbox); } + if (saveAttachedFiles($session)) { + plain_error_message(_("Could not move/copy file. File not attached")); + } showInputForm($session); } elseif (isset($sigappend)) { @@ -533,9 +632,10 @@ elseif (isset($sigappend)) { if (isset($delete) && is_array($delete)) { $composeMessage = $compose_messages[$session]; foreach($delete as $index) { - $attached_file = $composeMessage->entities[$index]->att_local_name; - unlink ($attached_file); - unset ($composeMessage->entities[$index]); + if (!empty($composeMessage->entities) && isset($composeMessage->entities[$index])) { + $composeMessage->entities[$index]->purgeAttachments(); + unset ($composeMessage->entities[$index]); + } } $new_entities = array(); foreach ($composeMessage->entities as $entity) { @@ -609,8 +709,9 @@ function getforwardSubject($subject) function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') { global $editor_size, $default_use_priority, $body, $idents, $use_signature, $data_dir, $username, - $username, $key, $imapServerAddress, $imapPort, $compose_messages, - $composeMessage, $body_quote; + $key, $imapServerAddress, $imapPort, $compose_messages, + $composeMessage, $body_quote, $request_mdn, $request_dr, + $default_use_mdn, $mdn_user_support; global $languages, $squirrelmail_language, $default_charset; /* @@ -624,7 +725,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $mailprio = 3; if ($passed_id) { - $imapConnection = sqimap_login($username, $key, $imapServerAddress, + $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); @@ -665,7 +766,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $type1 = $msg->type1; $unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent); $body_part_entity = $message->getEntity($ent); - $bodypart = decodeBody($unencoded_bodypart, + $bodypart = decodeBody($unencoded_bodypart, $body_part_entity->header->encoding); if ($type1 == 'html') { $bodypart = str_replace("\n", ' ', $bodypart); @@ -680,6 +781,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } } + // charset encoding in compose form stuff if (isset($body_part_entity->header->parameters['charset'])) { $actual = $body_part_entity->header->parameters['charset']; } else { @@ -689,6 +791,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){ $bodypart = charset_convert($actual,$bodypart,$default_charset,false); } + // end of charset encoding in compose $body .= $bodypart; } @@ -700,7 +803,6 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } else { $mailprio = ''; } - //ClearAttachments($session); $identity = ''; $from_o = $orig_header->from; @@ -753,6 +855,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } } $subject = decodeHeader($orig_header->subject,false,false,true); + + // Remember the receipt settings + $request_mdn = $mdn_user_support && !empty($orig_header->dnt) ? '1' : '0'; + $request_dr = $mdn_user_support && !empty($orig_header->drnt) ? '1' : '0'; + /* remember the references and in-reply-to headers in case of an reply */ $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references; $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to; @@ -779,6 +886,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se // forwarded message text should be as undisturbed as possible, so commenting out this call // sqUnWordWrap($body); $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + //add a blank line after the forward headers $body = "\n" . $body; break; @@ -864,11 +972,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se * @param integer $passed_id * @param mixed $entities * @param mixed $imapConnection - * @return object + * @return object */ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) { - global $attachment_dir, $username, $data_dir, $squirrelmail_language, $languages; - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + global $squirrelmail_language, $languages; + if (!count($message->entities) || ($message->type0 == 'message' && $message->type1 == 'rfc822')) { if ( !in_array($message->entity_id, $entities) && $message->entity_id) { @@ -896,22 +1004,15 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode')) { $filename = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode', $filename); } - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - while (file_exists($full_localfilename)) { - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - } - $message->att_local_name = $full_localfilename; + $localfilename = sq_get_attach_tempfile(); + $message->att_local_name = $localfilename; $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename, - $full_localfilename); + $localfilename); /* Write Attachment to file */ - $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb'); - fputs($fp, decodeBody(mime_fetch_body($imapConnection, - $passed_id, $message->entity_id), - $message->header->encoding)); + $fp = fopen ($localfilename, 'wb'); + mime_print_body_lines ($imapConnection, $passed_id, $message->entity_id, $message->header->encoding, $fp); fclose ($fp); } } else { @@ -924,8 +1025,6 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id='', $imapConnection) { - global $attachment_dir, $username, $data_dir; - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (!$passed_ent_id) { $body_a = sqimap_run_command($imapConnection, 'FETCH '.$passed_id.' RFC822', @@ -943,14 +1042,12 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, array_pop($body_a); $body = implode('', $body_a) . "\r\n"; - $localfilename = GenerateRandomString(32, 'FILE', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - - $fp = fopen($full_localfilename, 'w'); + $localfilename = sq_get_attach_tempfile(); + $fp = fopen($localfilename, 'wb'); fwrite ($fp, $body); fclose($fp); $composeMessage->initAttachment('message/rfc822',$subject.'.msg', - $full_localfilename); + $localfilename); } return $composeMessage; } @@ -963,7 +1060,17 @@ function showInputForm ($session, $values=false) { $from_htmladdr_search, $location_of_buttons, $attachment_dir, $username, $data_dir, $identity, $idents, $delete_draft, $mailprio, $compose_new_win, $saved_draft, $mail_sent, $sig_first, - $username, $compose_messages, $composesession, $default_charset; + $compose_messages, $composesession, $default_charset, + $compose_onsubmit, $oTemplate, $oErrorHandler; + + if (checkForJavascript()) { + $onfocus = ' onfocus="alreadyFocused=true;"'; + $onfocus_array = array('onfocus' => 'alreadyFocused=true;'); + } + else { + $onfocus = ''; + $onfocus_array = array(); + } $composeMessage = $compose_messages[$session]; if ($values) { @@ -981,7 +1088,7 @@ function showInputForm ($session, $values=false) { } if ($use_javascript_addr_book) { - echo "\n". '\n"; } else { - echo ' ' . "\n"; } - if ($save_as_draft) { - echo ' \n"; - } - - echo ' ' . "\n"; - do_hook('compose_button_row'); + $oTemplate->assign('allow_priority', $default_use_priority==1); + $oTemplate->assign('priority_list', $priorities); + $oTemplate->assign('current_priority', $priority); + + $oTemplate->assign('notifications_enabled', $mdn_user_support==1); + $oTemplate->assign('read_receipt', $request_mdn=='1'); + $oTemplate->assign('delivery_receipt', $request_dr=='1'); + + $oTemplate->assign('drafts_enabled', $save_as_draft); + $oTemplate->assign('address_book_button', $addr_book); - echo ' ' . "\n" . - ' ' . "\n\n"; + $oTemplate->display('compose_buttons.tpl'); } function checkInput ($show) { @@ -1312,11 +1359,11 @@ function checkInput ($show) { * using $show=false, and then when i'm ready to display the error * message, show=true */ - global $body, $send_to, $send_to_bcc, $subject, $color; + global $send_to, $send_to_bcc; if ($send_to == '' && $send_to_bcc == '') { if ($show) { - plain_error_message(_("You have not filled in the \"To:\" field."), $color); + plain_error_message(_("You have not filled in the \"To:\" field.")); } return false; } @@ -1326,49 +1373,30 @@ function checkInput ($show) { /* True if FAILURE */ function saveAttachedFiles($session) { - global $_FILES, $attachment_dir, $attachments, $username, - $data_dir, $compose_messages; + global $compose_messages; /* get out of here if no file was attached at all */ if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) { return true; } - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - while (file_exists($full_localfilename)) { - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - } + $localfilename = sq_get_attach_tempfile(); - // FIXME: we SHOULD prefer move_uploaded_file over rename because - // m_u_f works better with restricted PHP installs (safe_mode, open_basedir) - if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) { - if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) { + // m_u_f works better with restricted PHP installs (safe_mode, open_basedir), + // if that doesn't work, try a simple rename. + if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$localfilename)) { + if (!@rename($_FILES['attachfile']['tmp_name'], $localfilename)) { return true; } } $message = $compose_messages[$session]; $type = strtolower($_FILES['attachfile']['type']); $name = $_FILES['attachfile']['name']; - $message->initAttachment($type, $name, $full_localfilename); + $message->initAttachment($type, $name, $localfilename); $compose_messages[$session] = $message; sqsession_register($compose_messages , 'compose_messages'); } -function ClearAttachments($composeMessage) { - if ($composeMessage->att_local_name) { - $attached_file = $composeMessage->att_local_name; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } - for ($i=0, $entCount=count($composeMessage->entities);$i< $entCount; ++$i) { - ClearAttachments($composeMessage->entities[$i]); - } -} - /* parse values like 8M and 2k into bytes */ function getByteSize($ini_size) { @@ -1402,7 +1430,7 @@ function getByteSize($ini_size) { /** * temporary function to make use of the deliver class. - * In the future the responsable backend should be automaticly loaded + * In the future the responsible backend should be automaticly loaded * and conf.pl should show a list of available backends. * The message also should be constructed by the message class. */ @@ -1465,11 +1493,17 @@ function deliverMessage($composeMessage, $draft=false) { /* Receipt: On Read */ if (isset($request_mdn) && $request_mdn) { $rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true); + } elseif (isset($rfc822_header->dnt)) { + unset($rfc822_header->dnt); } + /* Receipt: On Delivery */ if (isset($request_dr) && $request_dr) { $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail; + } elseif (isset($rfc822_header->more_headers['Return-Receipt-To'])) { + unset($rfc822_header->more_headers['Return-Receipt-To']); } + /* multipart messages */ if (count($composeMessage->entities)) { $message_body = new Message(); @@ -1503,14 +1537,11 @@ function deliverMessage($composeMessage, $draft=false) { $rfc822_header->content_type = $content_type; $composeMessage->rfc822_header = $rfc822_header; - + /* Here you can modify the message structure just before we hand - it over to deliver */ - $hookReturn = do_hook('compose_send', $composeMessage); - /* Get any changes made by plugins to $composeMessage. */ - if ( is_object($hookReturn[1]) ) { - $composeMessage = $hookReturn[1]; - } + it over to deliver; plugin authors note that $composeMessage + is sent and modified by reference since 1.5.2 */ + do_hook('compose_send', $composeMessage); if (!$useSendmail && !$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); @@ -1523,13 +1554,21 @@ function deliverMessage($composeMessage, $draft=false) { $smtpServerAddress, $smtpPort, $user, $pass, $authPop); } elseif (!$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); - global $sendmail_path; - $deliver = new Deliver_SendMail(); + global $sendmail_path, $sendmail_args; + // Check for outdated configuration + if (!isset($sendmail_args)) { + if ($sendmail_path=='/var/qmail/bin/qmail-inject') { + $sendmail_args = ''; + } else { + $sendmail_args = '-i -t'; + } + } + $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args)); $stream = $deliver->initStream($composeMessage,$sendmail_path); } elseif ($draft) { global $draft_folder; require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); @@ -1540,27 +1579,35 @@ function deliverMessage($composeMessage, $draft=false) { sqimap_append_done ($imap_stream, $draft_folder); sqimap_logout($imap_stream); unset ($imap_deliver); + $composeMessage->purgeAttachments(); return $length; } else { - $msg = '
'.sprintf(_("Error: Draft folder %s does not exist."), $draft_folder); - plain_error_message($msg, $color); + $msg = '
'.sprintf(_("Error: Draft folder %s does not exist."), htmlspecialchars($draft_folder)); + plain_error_message($msg); return false; } } - $succes = false; + $success = false; if ($stream) { $length = $deliver->mail($composeMessage, $stream); - $succes = $deliver->finalizeStream($stream); - } - if (!$succes) { - $msg = $deliver->dlv_msg . '
' . - _("Server replied: ") . $deliver->dlv_ret_nr . ' '. - $deliver->dlv_server_msg; - plain_error_message($msg, $color); + $success = $deliver->finalizeStream($stream); + } + if (!$success) { + // $deliver->dlv_server_msg is not always server's reply + $msg = _("Message not sent.") . "
\n" . + $deliver->dlv_msg; + if (!empty($deliver->dlv_server_msg)) { + // add 'server replied' part only when it is not empty. + // Delivery error can be generated by delivery class itself + $msg.='
' . + _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . + nl2br(htmlspecialchars($deliver->dlv_server_msg)); + } + plain_error_message($msg); } else { unset ($deliver); $move_to_sent = getPref($data_dir,$username,'move_to_sent'); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); /* Move to sent code */ if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) { @@ -1597,16 +1644,57 @@ function deliverMessage($composeMessage, $draft=false) { sqimap_append_done ($imap_stream, $sent_folder); unset ($imap_deliver); } - global $passed_id, $mailbox, $action; - ClearAttachments($composeMessage); - if ($action == 'reply' || $action == 'reply_all') { - sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); + + global $passed_id, $mailbox, $action, $what, $iAccount,$startMessage; + + $composeMessage->purgeAttachments(); + if ($action=='reply' || $action=='reply_all' || $action=='forward' || $action=='forward_as_attachment') { + require(SM_PATH . 'functions/mailbox_display.php'); + $aMailbox = sqm_api_mailbox_select($imap_stream, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); + switch($action) { + case 'reply': + case 'reply_all': + // check if we are allowed to set the \\Answered flag + if (in_array('\\answered',$aMailbox['PERMANENTFLAGS'], true)) { + $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '\\Answered', true, false); + if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) { + /** + * Only update the cached headers if the header is + * cached. + */ + if (isset($aMailbox['MSG_HEADERS'][$passed_id])) { + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS']; + } + } + } + break; + case 'forward': + case 'forward_as_attachment': + // check if we are allowed to set the $Forwarded flag (RFC 4550 paragraph 2.8) + if (in_array('$forwarded',$aMailbox['PERMANENTFLAGS'], true) || + in_array('\\*',$aMailbox['PERMANENTFLAGS'])) { + + $aUpdatedMsgs = sqimap_toggle_flag($imap_stream, array($passed_id), '$Forwarded', true, false); + if (isset($aUpdatedMsgs[$passed_id]['FLAGS'])) { + if (isset($aMailbox['MSG_HEADERS'][$passed_id])) { + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'] = $aMsg['FLAGS']; + } + } + } + break; + } + + /** + * Write mailbox with updated seen flag information back to cache. + */ + if(isset($aUpdatedMsgs[$passed_id])) { + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); + } + + sqimap_logout($imap_stream); } - sqimap_logout($imap_stream); } - return $succes; + return $success; } - -// vim: et ts=4 -?> \ No newline at end of file +?>