X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=468b262dc95f3dfba5bdb202bde61a0805c4ed36;hp=4c8411748407f3c1d69039068cdfc080621a8d7e;hb=a42c236f3aecff1b7513cae605de2ecd2f2455dc;hpb=5a1f1da3938a8a712eeec08d72ee39c19e540566 diff --git a/src/compose.php b/src/compose.php index 4c841174..468b262d 100644 --- a/src/compose.php +++ b/src/compose.php @@ -3,9 +3,6 @@ /** * compose.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * This code sends a mail. * * There are 4 modes of operation: @@ -14,10 +11,16 @@ * - Send mail * - Save As Draft * - * $Id$ + * @copyright © 1999-2005 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -30,6 +33,7 @@ require_once(SM_PATH . 'functions/plugin.php'); require_once(SM_PATH . 'functions/display_messages.php'); require_once(SM_PATH . 'class/deliver/Deliver.class.php'); require_once(SM_PATH . 'functions/addressbook.php'); +require_once(SM_PATH . 'functions/forms.php'); require_once(SM_PATH . 'functions/identity.php'); /* --------------------- Get globals ------------------------------------- */ @@ -46,7 +50,6 @@ sqgetGlobalVar('composesession', $composesession, SQ_SESSION); sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION); /** SESSION/POST/GET VARS */ -sqgetGlobalVar('smaction',$action); sqgetGlobalVar('session',$session); sqgetGlobalVar('mailbox',$mailbox); if(!sqgetGlobalVar('identity',$identity)) { @@ -73,7 +76,12 @@ 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('startMessage',$startMessage) ) { + $startMessage = (int)$startMessage; +} else { + $startMessage = 1; +} + /** POST VARS */ sqgetGlobalVar('sigappend', $sigappend, SQ_POST); @@ -84,11 +92,28 @@ 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'; + $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) ) +{ + if ( sqgetGlobalVar('smaction_reply',$tmp) ) $action = 'reply'; + if ( sqgetGlobalVar('smaction_reply_all',$tmp) ) $action = 'reply_all'; + if ( sqgetGlobalVar('smaction_forward',$tmp) ) $action = 'forward'; + if ( sqgetGlobalVar('smaction_attache',$tmp) ) $action = 'forward_as_attachment'; + if ( sqgetGlobalVar('smaction_draft',$tmp) ) $action = 'draft'; + if ( sqgetGlobalVar('smaction_edit_new',$tmp) ) $action = 'edit_as_new'; +} /* Location (For HTTP 1.1 Header("Location: ...") redirects) */ $location = get_location(); @@ -98,115 +123,159 @@ $idents = get_identities(); /* --------------------- Specific Functions ------------------------------ */ function replyAllString($header) { - global $include_self_reply_all, $idents; - $excl_ar = array(); - /** - * 1) Remove the addresses we'll be sending the message 'to' - */ - $url_replytoall_avoid_addrs = ''; - if (isset($header->replyto)) { - $excl_ar = $header->getAddr_a('replyto'); - } - /** - * 2) Remove our identities from the CC list (they still can be in the - * TO list) only if $include_self_reply_all is turned off - */ - if (!$include_self_reply_all) { - foreach($idents as $id) { - $excl_ar[strtolower(trim($id['email_address']))] = ''; + global $include_self_reply_all, $idents; + $excl_ar = array(); + /** + * 1) Remove the addresses we'll be sending the message 'to' + */ + if (isset($header->replyto)) { + $excl_ar = $header->getAddr_a('replyto'); + } + /** + * 2) Remove our identities from the CC list (they still can be in the + * TO list) only if $include_self_reply_all is turned off + */ + if (!$include_self_reply_all) { + foreach($idents as $id) { + $excl_ar[strtolower(trim($id['email_address']))] = ''; } - } - - /** - * 3) get the addresses. - */ - $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar); - - /** - * 4) generate the string. - */ - $url_replytoallcc = ''; - foreach( $url_replytoall_ar as $email => $personal) { - if ($personal) { - $url_replytoallcc .= ", $personal <$email>"; - } else { - $url_replytoallcc .= ', '. $email; - } - } - $url_replytoallcc = substr($url_replytoallcc,2); - - return $url_replytoallcc; + } + + /** + * 3) get the addresses. + */ + $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar); + + /** + * 4) generate the string. + */ + $url_replytoallcc = ''; + foreach( $url_replytoall_ar as $email => $personal) { + if ($personal) { + // if personal name contains address separator then surround + // the personal name with double quotes. + if (strpos($personal,',') !== false) { + $personal = '"'.$personal.'"'; + } + $url_replytoallcc .= ", $personal <$email>"; + } else { + $url_replytoallcc .= ', '. $email; + } + } + $url_replytoallcc = substr($url_replytoallcc,2); + + return $url_replytoallcc; } -function getReplyCitation($orig_from) { +/** + * creates top line in reply citations + * + * Line style depends on user preferences. + * $orig_date argument is available only from 1.4.3 and 1.5.1 version. + * @param object $orig_from From: header object. + * @param integer $orig_date email's timestamp + * @return string reply citation + */ +function getReplyCitation($orig_from, $orig_date) { global $reply_citation_style, $reply_citation_start, $reply_citation_end; - $orig_from = decodeHeader($orig_from->getAddress(false),false,false); -// $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')) { return ''; } /* Make sure our final value isn't an empty string. */ - if ($orig_from == '') { + if ($sOrig_from == '') { return ''; } /* Otherwise, try to select the desired citation style. */ switch ($reply_citation_style) { case 'author_said': - $start = ''; - $end = ' ' . _("said") . ':'; + /** + * To translators: %s is for author's name + */ + $full_reply_citation = sprintf(_("%s wrote:"),$sOrig_from); break; case 'quote_who': - $start = '<' . _("quote") . ' ' . _("who") . '="'; + $start = ''; + $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 + * 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 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 wrote:"), getLongDateString($orig_date), $sOrig_from); break; case 'user-defined': $start = $reply_citation_start . - ($reply_citation_start == '' ? '' : ' '); + ($reply_citation_start == '' ? '' : ' '); $end = $reply_citation_end; + $full_reply_citation = $start . $sOrig_from . $end; break; default: return ''; } - /* Build and return the citation string. */ - return ($start . $orig_from . $end . "\n"); + /* Add line feed and return the citation string. */ + return ($full_reply_citation . "\n"); } +/** + * Creates header fields in forwarded email body + * + * $default_charset global must be set correctly before you call this function. + * @param object $orig_header + * @return $string + */ function getforwardHeader($orig_header) { - global $editor_size; - - $display = array( _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), - _("Cc") => strlen(_("Cc")) ); - $maxsize = max($display); - $indent = str_pad('',$maxsize+2); - foreach($display as $key => $val) { - $display[$key] = $key .': '. str_pad('', $maxsize - $val); - } - $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); - $from = str_replace(' ',' ',$from); - $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false); - $to = str_replace(' ',' ',$to); - $subject = decodeHeader($orig_header->subject,false,false); - $subject = str_replace(' ',' ',$subject); - $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) . - "\n". $display[_("Subject")] . $subject . "\n" . - $display[_("From")] . $from . "\n" . - $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . - $display[_("To")] . $to . "\n"; - if ($orig_header->cc != array() && $orig_header->cc !='') { - $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false); - $cc = str_replace(' ',' ',$cc); - $bodyTop .= $display[_("Cc")] .$cc . "\n"; - } - $bodyTop .= str_pad('', $editor_size -2 , '-') . - "\n\n"; - return $bodyTop; + global $editor_size, $default_charset; + + // using own strlen function in order to detect correct string length + $display = array( _("Subject") => sq_strlen(_("Subject"),$default_charset), + _("From") => sq_strlen(_("From"),$default_charset), + _("Date") => sq_strlen(_("Date"),$default_charset), + _("To") => sq_strlen(_("To"),$default_charset), + _("Cc") => sq_strlen(_("Cc"),$default_charset) ); + $maxsize = max($display); + $indent = str_pad('',$maxsize+2); + foreach($display as $key => $val) { + $display[$key] = $key .': '. str_pad('', $maxsize - $val); + } + $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,true); + $from = str_replace(' ',' ',$from); + $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true); + $to = str_replace(' ',' ',$to); + $subject = decodeHeader($orig_header->subject,false,false,true); + $subject = str_replace(' ',' ',$subject); + + // using own str_pad function in order to create correct string pad + $bodyTop = sq_str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH,$default_charset) . + "\n". $display[_("Subject")] . $subject . "\n" . + $display[_("From")] . $from . "\n" . + $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . + $display[_("To")] . $to . "\n"; + if ($orig_header->cc != array() && $orig_header->cc !='') { + $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true); + $cc = str_replace(' ',' ',$cc); + $bodyTop .= $display[_("Cc")] .$cc . "\n"; + } + $bodyTop .= str_pad('', $editor_size -2 , '-') . + "\n\n"; + return $bodyTop; } /* ----------------------------------------------------------------------- */ @@ -249,7 +318,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(); @@ -266,18 +341,19 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) { sqsession_register($composesession,'composesession'); } if (!isset($compose_messages)) { - $compose_messages = array(); + $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'); + $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]; + $composeMessage=$compose_messages[$session]; } if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) { @@ -299,66 +375,82 @@ 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&sort=$sort&startMessage=1&saved_draft=yes"); - exit(); + $imap_stream = sqimap_login($username, $key, $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') { + 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 { - Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort". - "&startMessage=1¬e=".urlencode($draft_message)); - exit(); + exit(); + } else { + if ( !isset($pageheader_sent) || !$pageheader_sent ) { + Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . + "&startMessage=1¬e=".urlencode($draft_message)); + } else { + echo '

' + . _("Return") . '
'; } + exit(); } } } if ($send) { if (isset($_FILES['attachfile']) && - $_FILES['attachfile']['tmp_name'] && - $_FILES['attachfile']['tmp_name'] != 'none') { + $_FILES['attachfile']['tmp_name'] && + $_FILES['attachfile']['tmp_name'] != 'none') { $AttachFailure = saveAttachedFiles($session); } 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 */ - } + if ($mailbox == "All Folders") { + /* We entered compose via the search results page */ + $mailbox = 'INBOX'; /* Send 'em to INBOX, that's safe enough */ + } $urlMailbox = urlencode (trim($mailbox)); if (! isset($passed_id)) { $passed_id = 0; } - /* + /** * Set $default_charset to correspond with the user's selection * of language interface. */ set_my_charset(); - /* + /** * This is to change all newlines to \n * We'll change them to \r\n later (in the sendMessage function) */ $body = str_replace("\r\n", "\n", $body); $body = str_replace("\r", "\n", $body); - /* + /** * Rewrap $body so that no line is bigger than $editor_size - * This should only really kick in the sqWordWrap function - * if the browser doesn't support "VIRTUAL" as the wrap type. */ $body = explode("\n", $body); $newBody = ''; foreach ($body as $line) { if( $line <> '-- ' ) { - $line = rtrim($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"; } @@ -369,23 +461,47 @@ if ($send) { $composeMessage=$compose_messages[$session]; $Result = deliverMessage($composeMessage); + do_hook('compose_send_after', $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&sort=$sort&startMessage=1&mail_sent=yes"); - exit(); + $imap_stream = sqimap_login($username, $key, $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); } + session_write_close(); if ($compose_new_win == '1') { - - Header("Location: $location/compose.php?mail_sent=yes"); - } - else { - Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=$startMessage&mail_sent=yes"); + 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') { @@ -395,20 +511,20 @@ if ($send) { displayPageHeader($color, $mailbox); } if (isset($AttachFailure)) { - plain_error_message(_("Could not move/copy file. File not attached"), - $color); + plain_error_message(_("Could not move/copy file. File not attached"), + $color); } checkInput(true); showInputForm($session); /* sqimap_logout($imapConnection); */ } } elseif (isset($html_addr_search_done)) { - if ($compose_new_win == '1') { - compose_Header($color, $mailbox); - } - else { - displayPageHeader($color, $mailbox); - } + if ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } + else { + displayPageHeader($color, $mailbox); + } if (isset($send_to_search) && is_array($send_to_search)) { foreach ($send_to_search as $k => $v) { @@ -435,8 +551,8 @@ if ($send) { showInputForm($session); } elseif (isset($html_addr_search)) { if (isset($_FILES['attachfile']) && - $_FILES['attachfile']['tmp_name'] && - $_FILES['attachfile']['tmp_name'] != 'none') { + $_FILES['attachfile']['tmp_name'] && + $_FILES['attachfile']['tmp_name'] != 'none') { if(saveAttachedFiles($session)) { plain_error_message(_("Could not move/copy file. File not attached"), $color); } @@ -450,12 +566,11 @@ if ($send) { 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 ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } else { + displayPageHeader($color, $mailbox); + } showInputForm($session); } elseif (isset($sigappend)) { @@ -463,25 +578,25 @@ elseif (isset($sigappend)) { $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature; if ($compose_new_win == '1') { - compose_Header($color, $mailbox); + compose_Header($color, $mailbox); } else { displayPageHeader($color, $mailbox); } showInputForm($session); } elseif (isset($do_delete)) { - if ($compose_new_win == '1') { - compose_Header($color, $mailbox); - } - else { - displayPageHeader($color, $mailbox); - } + if ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } else { + displayPageHeader($color, $mailbox); + } 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) { @@ -499,9 +614,9 @@ elseif (isset($sigappend)) { */ if ($compose_new_win == '1') { - compose_Header($color, $mailbox); + compose_Header($color, $mailbox); } else { - displayPageHeader($color, $mailbox); + displayPageHeader($color, $mailbox); } $newmail = true; @@ -523,16 +638,16 @@ elseif (isset($sigappend)) { /* in case the origin is not read_body.php */ if (isset($send_to)) { - $values['send_to'] = $send_to; + $values['send_to'] = $send_to; } if (isset($send_to_cc)) { - $values['send_to_cc'] = $send_to_cc; + $values['send_to_cc'] = $send_to_cc; } if (isset($send_to_bcc)) { - $values['send_to_bcc'] = $send_to_bcc; + $values['send_to_bcc'] = $send_to_bcc; } if (isset($subject)) { - $values['subject'] = $subject; + $values['subject'] = $subject; } showInputForm($session, $values); } @@ -541,21 +656,37 @@ exit(); /**************** Only function definitions go below *************/ +function getforwardSubject($subject) +{ + if ((substr(strtolower($subject), 0, 4) != 'fwd:') && + (substr(strtolower($subject), 0, 5) != '[fwd:') && + (substr(strtolower($subject), 0, 6) != '[ fwd:')) { + $subject = '[Fwd: ' . $subject . ']'; + } + return $subject; +} /* This function is used when not sending or adding attachments */ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') { global $editor_size, $default_use_priority, $body, $idents, - $use_signature, $composesession, $data_dir, $username, - $username, $key, $imapServerAddress, $imapPort, $compose_messages, - $composeMessage; - global $languages, $squirrelmail_language; + $use_signature, $data_dir, $username, + $username, $key, $imapServerAddress, $imapPort, $compose_messages, + $composeMessage, $body_quote; + global $languages, $squirrelmail_language, $default_charset; + + /* + * Set $default_charset to correspond with the user's selection + * of language interface. $default_charset global is not correct, + * if message is composed in new window. + */ + set_my_charset(); $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; if ($passed_id) { $imapConnection = sqimap_login($username, $key, $imapServerAddress, - $imapPort, 0); + $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); @@ -565,15 +696,15 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se /* redefine the messsage in case of message/rfc822 */ $message = $message->getEntity($passed_ent_id); /* message is an entity which contains the envelope and type0=message - * and type1=rfc822. The actual entities are childs from - * $message->entities[0]. That's where the encoding and is located - */ + * and type1=rfc822. The actual entities are childs from + * $message->entities[0]. That's where the encoding and is located + */ $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain')); + (array(), $alt_order = array('text/plain')); if (!count($entities)) { $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain','html/plain')); + (array(), $alt_order = array('text/plain','html/plain')); } $orig_header = $message->rfc822_header; /* here is the envelope located */ /* redefine the message for picking up the attachments */ @@ -587,24 +718,41 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $orig_header = $message->rfc822_header; } - $encoding = $message->header->encoding; $type0 = $message->type0; $type1 = $message->type1; foreach ($entities as $ent) { + $msg = $message->getEntity($ent); + $type0 = $msg->type0; + $type1 = $msg->type1; $unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent); $body_part_entity = $message->getEntity($ent); $bodypart = decodeBody($unencoded_bodypart, - $body_part_entity->header->encoding); + $body_part_entity->header->encoding); if ($type1 == 'html') { - $bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart); + $bodypart = str_replace("\n", ' ', $bodypart); + $bodypart = preg_replace(array('/<\/?p>/i','/
<\/div>/i','//i','/<\/?div>/i'), "\n", $bodypart); + $bodypart = str_replace(array(' ','>','<'),array(' ','>','<'),$bodypart); $bodypart = strip_tags($bodypart); } if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode')) { if (mb_detect_encoding($bodypart) != 'ASCII') { - $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart); + $bodypart = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $bodypart); } } + + // charset encoding in compose form stuff + if (isset($body_part_entity->header->parameters['charset'])) { + $actual = $body_part_entity->header->parameters['charset']; + } else { + $actual = 'us-ascii'; + } + + 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; } if ($default_use_priority) { @@ -615,10 +763,14 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } else { $mailprio = ''; } - //ClearAttachments($session); $identity = ''; $from_o = $orig_header->from; + if (is_array($from_o)) { + if (isset($from_o[0])) { + $from_o = $from_o[0]; + } + } if (is_object($from_o)) { $orig_from = $from_o->getAddress(); } else { @@ -643,106 +795,113 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se } switch ($action) { - case ('draft'): - $use_signature = FALSE; - $composeMessage->rfc822_header = $orig_header; - $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true); - $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true); - $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true); - $subject = decodeHeader($orig_header->subject,false,true); -// /* 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; - $body_ary = explode("\n", $body); - $cnt = count($body_ary) ; - $body = ''; - for ($i=0; $i < $cnt; $i++) { - if (!ereg("^[>\\s]*$", $body_ary[$i]) || !$body_ary[$i]) { - sqWordWrap($body_ary[$i], $editor_size ); - $body .= $body_ary[$i] . "\n"; + case ('draft'): + $use_signature = FALSE; + $composeMessage->rfc822_header = $orig_header; + $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true); + $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true); + $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true); + $send_from = $orig_header->getAddr_s('from'); + $send_from_parts = new AddressStructure(); + $send_from_parts = $orig_header->parseAddress($send_from); + $send_from_add = $send_from_parts->mailbox . '@' . $send_from_parts->host; + $identities = get_identities(); + if (count($identities) > 0) { + foreach($identities as $iddata) { + if ($send_from_add == $iddata['email_address']) { + $identity = $iddata['index']; + break; + } + } } - unset($body_ary[$i]); - } - sqUnWordWrap($body); - $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); - break; - case ('edit_as_new'): - $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true); - $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true); - $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true); - $subject = decodeHeader($orig_header->subject,false,true); - $mailprio = $orig_header->priority; - $orig_from = ''; - $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); - sqUnWordWrap($body); - break; - case ('forward'): - $send_to = ''; - $subject = decodeHeader($orig_header->subject,false,true); - if ((substr(strtolower($subject), 0, 4) != 'fwd:') && - (substr(strtolower($subject), 0, 5) != '[fwd:') && - (substr(strtolower($subject), 0, 6) != '[ fwd:')) { - $subject = '[Fwd: ' . $subject . ']'; - } - $body = getforwardHeader($orig_header) . $body; - sqUnWordWrap($body); - $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); - $body = "\n" . $body; - break; - case ('forward_as_attachment'): - $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection); - $body = ''; - break; - case ('reply_all'): - if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) { - $send_to = $orig_header->getAddr_s('mail_followup_to'); - } else { - $send_to_cc = replyAllString($orig_header); - $send_to_cc = decodeHeader($send_to_cc,false,true); - } - case ('reply'): - // skip this if send_to was already set right above here - if(!$send_to) { - $send_to = $orig_header->reply_to; - if (is_array($send_to) && count($send_to)) { - $send_to = $orig_header->getAddr_s('reply_to'); - } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */ - $send_to = $orig_header->getAddr_s('reply_to'); + $subject = decodeHeader($orig_header->subject,false,false,true); + /* 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; + // rewrap the body to clean up quotations and line lengths + sqBodyWrap($body, $editor_size); + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + break; + case ('edit_as_new'): + $send_to = decodeHeader($orig_header->getAddr_s('to'),false,false,true); + $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,false,true); + $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,false,true); + $subject = decodeHeader($orig_header->subject,false,false,true); + $mailprio = $orig_header->priority; + $orig_from = ''; + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + // rewrap the body to clean up quotations and line lengths + sqBodyWrap($body, $editor_size); + break; + case ('forward'): + $send_to = ''; + $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true)); + $body = getforwardHeader($orig_header) . $body; + // the logic for calling sqUnWordWrap here would be to allow the browser to wrap the lines + // 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; + case ('forward_as_attachment'): + $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true)); + $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection); + $body = ''; + break; + case ('reply_all'): + if(isset($orig_header->mail_followup_to) && $orig_header->mail_followup_to) { + $send_to = $orig_header->getAddr_s('mail_followup_to'); } else { - $send_to = $orig_header->getAddr_s('from'); + $send_to_cc = replyAllString($orig_header); + $send_to_cc = decodeHeader($send_to_cc,false,false,true); } - } - $send_to = decodeHeader($send_to,false,true); - $subject = decodeHeader($orig_header->subject,false,true); - $subject = str_replace('"', "'", $subject); - $subject = trim($subject); - if (substr(strtolower($subject), 0, 3) != 're:') { - $subject = 'Re: ' . $subject; - } - /* this corrects some wrapping/quoting problems on replies */ - $rewrap_body = explode("\n", $body); - $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from; - sqUnWordWrap($body); // unwrap and then reset it?! - $body = ''; - $strip_sigs = getPref($data_dir, $username, 'strip_sigs'); - foreach ($rewrap_body as $line) { - if ($strip_sigs && substr($line,0,3) == '-- ') { - break; + case ('reply'): + // skip this if send_to was already set right above here + if(!$send_to) { + $send_to = $orig_header->reply_to; + if (is_array($send_to) && count($send_to)) { + $send_to = $orig_header->getAddr_s('reply_to'); + } else if (is_object($send_to)) { /* unneccesarry, just for failsafe purpose */ + $send_to = $orig_header->getAddr_s('reply_to'); + } else { + $send_to = $orig_header->getAddr_s('from'); + } } - sqWordWrap($line, ($editor_size)); - if (preg_match("/^(>+)/", $line, $matches)) { - $gt = $matches[1]; - $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n"; - } else { - $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n"; + $send_to = decodeHeader($send_to,false,false,true); + $subject = decodeHeader($orig_header->subject,false,false,true); + $subject = str_replace('"', "'", $subject); + $subject = trim($subject); + if (substr(strtolower($subject), 0, 3) != 're:') { + $subject = 'Re: ' . $subject; } - } - $body = getReplyCitation($from) . $body; - $composeMessage->reply_rfc822_header = $orig_header; + /* this corrects some wrapping/quoting problems on replies */ + $rewrap_body = explode("\n", $body); + $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from; + $body = ''; + $strip_sigs = getPref($data_dir, $username, 'strip_sigs'); + foreach ($rewrap_body as $line) { + if ($strip_sigs && substr($line,0,3) == '-- ') { + break; + } + if (preg_match("/^(>+)/", $line, $matches)) { + $gt = $matches[1]; + $body .= $body_quote . str_replace("\n", "\n$body_quote$gt ", rtrim($line)) ."\n"; + } else { + $body .= $body_quote . (!empty($body_quote) ? ' ' : '') . str_replace("\n", "\n$body_quote" . (!empty($body_quote) ? ' ' : ''), rtrim($line)) . "\n"; + } + } + + //rewrap the body to clean up quotations and line lengths + $body = sqBodyWrap ($body, $editor_size); - break; - default: - break; + $body = getReplyCitation($from , $orig_header->date) . $body; + $composeMessage->reply_rfc822_header = $orig_header; + + break; + default: + break; } $compose_messages[$session] = $composeMessage; sqsession_register($compose_messages, 'compose_messages'); @@ -750,62 +909,71 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se sqimap_logout($imapConnection); } $ret = array( 'send_to' => $send_to, - 'send_to_cc' => $send_to_cc, - 'send_to_bcc' => $send_to_bcc, - 'subject' => $subject, - 'mailprio' => $mailprio, - 'body' => $body, - 'identity' => $identity ); + 'send_to_cc' => $send_to_cc, + 'send_to_bcc' => $send_to_bcc, + 'subject' => $subject, + 'mailprio' => $mailprio, + 'body' => $body, + 'identity' => $identity ); return ($ret); } /* function newMail() */ +/** + * downloads attachments from original message, stores them in attachment directory and adds + * them to composed message. + * @param object $message + * @param object $composeMessage + * @param integer $passed_id + * @param mixed $entities + * @param mixed $imapConnection + * @return object + */ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) { - global $attachment_dir, $username, $data_dir, $squirrelmail_language; + global $attachment_dir, $username, $data_dir, $squirrelmail_language, $languages; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (!count($message->entities) || - ($message->type0 == 'message' && $message->type1 == 'rfc822')) { + ($message->type0 == 'message' && $message->type1 == 'rfc822')) { if ( !in_array($message->entity_id, $entities) && $message->entity_id) { - switch ($message->type0) { - case 'message': - if ($message->type1 == 'rfc822') { - $filename = $message->rfc822_header->subject.'.msg'; - if ($filename == "") { - $filename = "untitled-".$message->entity_id.'.msg'; + switch ($message->type0) { + case 'message': + if ($message->type1 == 'rfc822') { + $filename = $message->rfc822_header->subject; + if ($filename == "") { + $filename = "untitled-".$message->entity_id; + } + $filename .= '.msg'; + } else { + $filename = $message->getFilename(); } - } else { - $filename = $message->getFilename(); - } - break; - default: - if (!$message->mime_header) { /* temporary hack */ - $message->mime_header = $message->header; - } - $filename = $message->getFilename(); - break; - } - $filename = str_replace(' ', ' ', decodeHeader($filename)); - if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { - $filename = $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; - - $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename, - $full_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)); - fclose ($fp); + break; + default: + if (!$message->mime_header) { /* temporary hack */ + $message->mime_header = $message->header; + } + $filename = $message->getFilename(); + break; + } + $filename = str_replace(' ', ' ', decodeHeader($filename)); + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + 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; + + $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename, + $full_localfilename); + + /* Write Attachment to file */ + $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb'); + mime_print_body_lines ($imapConnection, $passed_id, $message->entity_id, $message->header->encoding, $fp); + fclose ($fp); } } else { for ($i=0, $entCount=count($message->entities); $i<$entCount;$i++) { @@ -816,18 +984,18 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap } function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, - $passed_ent_id='', $imapConnection) { - global $attachments, $attachment_dir, $username, $data_dir, $uid_support; + $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', - TRUE, $response, $readmessage, - $uid_support); + 'FETCH '.$passed_id.' RFC822', + TRUE, $response, $readmessage, + TRUE); } else { $body_a = sqimap_run_command($imapConnection, - 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']', - TRUE, $response, $readmessage, $uid_support); + 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']', + TRUE, $response, $readmessage, TRUE); $message = $message->parent; } if ($response == 'OK') { @@ -843,81 +1011,121 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, fwrite ($fp, $body); fclose($fp); $composeMessage->initAttachment('message/rfc822',$subject.'.msg', - $full_localfilename); + $full_localfilename); } return $composeMessage; } function showInputForm ($session, $values=false) { - global $send_to, $send_to_cc, $body, $startMessage, - $passed_body, $color, $use_signature, $signature, $prefix_sig, - $editor_size, $attachments, $subject, $newmail, - $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox, - $from_htmladdr_search, $location_of_buttons, $attachment_dir, - $username, $data_dir, $identity, $idents, $draft_id, $delete_draft, - $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win, - $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, - $username, $compose_messages, $composesession, $default_charset; + global $send_to, $send_to_cc, $body, $startMessage, $action, + $color, $use_signature, $signature, $prefix_sig, + $editor_size, $editor_height, $subject, $newmail, + $use_javascript_addr_book, $send_to_bcc, $passed_id, $mailbox, + $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_onsubmit; + + if (checkForJavascript()) { + $onfocus = ' onfocus="alreadyFocused=true;"'; + $onfocus_array = array('onfocus' => 'alreadyFocused=true;'); + } + else { + $onfocus = ''; + $onfocus_array = array(); + } $composeMessage = $compose_messages[$session]; - if ($values) { - $send_to = $values['send_to']; - $send_to_cc = $values['send_to_cc']; - $send_to_bcc = $values['send_to_bcc']; - $subject = $values['subject']; - $mailprio = $values['mailprio']; - $body = $values['body']; - $identity = (int) $values['identity']; + $send_to = $values['send_to']; + $send_to_cc = $values['send_to_cc']; + $send_to_bcc = $values['send_to_bcc']; + $subject = $values['subject']; + $mailprio = $values['mailprio']; + $body = $values['body']; + $identity = (int) $values['identity']; } else { - $send_to = decodeHeader($send_to); - $send_to_cc = decodeHeader($send_to_cc); - $send_to_bcc = decodeHeader($send_to_bcc); + $send_to = decodeHeader($send_to, true, false); + $send_to_cc = decodeHeader($send_to_cc, true, false); + $send_to_bcc = decodeHeader($send_to_bcc, true, false); } if ($use_javascript_addr_book) { - echo "\n". '\n\n"; + echo "\n". '\n\n"; } echo "\n" . '
\n"; - echo '\n"; + echo addHidden('startMessage', $startMessage); if ($action == 'draft') { - echo '\n"; + echo addHidden('delete_draft', $passed_id); } if (isset($delete_draft)) { - echo '\n"; + echo addHidden('delete_draft', $delete_draft); } if (isset($session)) { - echo '\n"; + echo addHidden('session', $session); } if (isset($passed_id)) { - echo '\n"; + echo addHidden('passed_id', $passed_id); } if ($saved_draft == 'yes') { - echo '
'. _("Draft Saved").'
'; + echo '
'. _("Draft Saved").'
'; } if ($mail_sent == 'yes') { - echo '
'. _("Your Message has been sent.").'
'; + echo '
'. _("Your Message has been sent.").'
'; } - echo '' . "\n"; if ($compose_new_win == '1') { - echo '
'."\n" . - ' '. html_tag( 'td', '', 'right' ) . ''."\n"; + echo '
'."\n" . + ' '.html_tag( 'td', '', 'right' ). + ''."\n"; + } else { + echo '
' . "\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); @@ -925,56 +1133,50 @@ function showInputForm ($session, $values=false) { /* display select list for identities */ if (count($idents) > 1) { - echo ' ' . "\n" . - html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . - _("From:") . '' . "\n" . - html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . - ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . + _("From:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . + ' '. + addSelect('identity', $ident_list, $identity, TRUE); - echo '' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + ' ' . "\n"; } + echo ' ' . "\n" . - html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . - _("To:") . '' . "\n" . - html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . - '
' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - html_tag( 'td', '', 'right', $color[4] ) . - _("CC:") . '' . "\n" . - html_tag( 'td', '', 'left', $color[4] ) . - '
' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - html_tag( 'td', '', 'right', $color[4] ) . - _("BCC:") . '' . "\n" . - html_tag( 'td', '', 'left', $color[4] ) . - '
' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - html_tag( 'td', '', 'right', $color[4] ) . - _("Subject:") . '' . "\n" . - html_tag( 'td', '', 'left', $color[4] ) . "\n"; - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n\n"; + html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . + _("To") . ':' . "\n" . + html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . + addInput('send_to', $send_to, 60, 0, $onfocus_array). '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("Cc") . ':' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . + addInput('send_to_cc', $send_to_cc, 60, 0, $onfocus_array). '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("Bcc") . ':' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . + addInput('send_to_bcc', $send_to_bcc, 60, 0, $onfocus_array).'
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("Subject") . ':' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . "\n"; + echo ' '.addInput('subject', $subject, 60, 0, $onfocus_array). + ' ' . "\n" . + ' ' . "\n\n"; if ($location_of_buttons == 'between') { showComposeButtonRow(); @@ -982,220 +1184,222 @@ function showInputForm ($session, $values=false) { /* why this distinction? */ if ($compose_new_win == '1') { - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + ' ' . "\n" . + ' ' . "\n"; if ($location_of_buttons == 'bottom') { showComposeButtonRow(); } else { echo ' ' . "\n" . - html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" . - ' ' . "\n" . - '     

' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" . + ' ' . addSubmit(_("Send"), 'send'). + '     

' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } /* This code is for attachments */ - if ((bool) ini_get('file_uploads')) { - - /* Calculate the max size for an uploaded file. - * This is advisory for the user because we can't actually prevent - * people to upload too large files. */ - $sizes = array(); - /* php.ini vars which influence the max for uploads */ - $configvars = array('post_max_size', 'memory_limit', 'upload_max_filesize'); - foreach($configvars as $var) { - /* skip 0 or empty values */ - if( $size = getByteSize(ini_get($var)) ) { - $sizes[] = $size; + if ((bool) ini_get('file_uploads')) { + + /* Calculate the max size for an uploaded file. + * This is advisory for the user because we can't actually prevent + * people to upload too large files. */ + $sizes = array(); + /* php.ini vars which influence the max for uploads */ + $configvars = array('post_max_size', 'memory_limit', 'upload_max_filesize'); + foreach($configvars as $var) { + /* skip 0 or empty values, and -1 which means 'unlimited' */ + if( $size = getByteSize(ini_get($var)) ) { + if ( $size != '-1' ) { + $sizes[] = $size; + } + } } - } - if(count($sizes) > 0) { - $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')'; - } else { - $maxsize = ''; - } - echo ''; - echo ' ' . "\n" . - ' ' . "\n" . + ' ' . "\n" . + '
' . "\n" . - '
' . "\n" . - '
' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; - } // End of file_uploads if-block + if (count($s_a)) { + foreach ($s_a as $s) { + echo '' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .''; + } + echo ''; + } + echo '
' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - html_tag( 'td', '', 'right', '', 'valign="middle"' ) . - _("Attach:") . '' . "\n" . - html_tag( 'td', '', 'left', '', 'valign="middle"' ) . - ' ' . "\n" . - '   ' . "\n" . - $maxsize . - ' ' . "\n" . - ' ' . "\n"; - - - $s_a = array(); - if ($composeMessage->entities) { - foreach ($composeMessage->entities as $key => $attachment) { - $attached_file = $attachment->att_local_name; - if ($attachment->att_local_name || $attachment->body_part) { - $attached_filename = decodeHeader($attachment->mime_header->getParameter('name')); - $type = $attachment->mime_header->type0.'/'. + if(count($sizes) > 0) { + $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')'; + echo addHidden('MAX_FILE_SIZE', min( $sizes )); + } else { + $maxsize = ''; + } + echo ' ' . "\n" . + ' ' . "\n" . - ' ' . "\n" . - '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .''; - } - echo ''; - } - echo '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', '', 'valign="middle"' ) . + _("Attach:") . '' . "\n" . + html_tag( 'td', '', 'left', '', 'valign="middle"' ) . + ' ' . "\n" . + '   ' . "\n" . + $maxsize . + ' ' . "\n" . + ' ' . "\n"; + + $s_a = array(); + if ($composeMessage->entities) { + foreach ($composeMessage->entities as $key => $attachment) { + $attached_file = $attachment->att_local_name; + if ($attachment->att_local_name || $attachment->body_part) { + $attached_filename = decodeHeader($attachment->mime_header->getParameter('name')); + $type = $attachment->mime_header->type0.'/'. $attachment->mime_header->type1; - $s_a[] = '
\n" . $attached_filename . - '- ' . $type . '('. - show_readable_size( filesize( $attached_file ) ) . ')
'."\n"; - } + $s_a[] = '
'. + addCheckBox('delete[]', FALSE, $key). + "\n" . $attached_filename . + '- ' . $type . '('. + show_readable_size( filesize( $attached_file ) ) . ')
'."\n"; + } + } } - } - if (count($s_a)) { - foreach ($s_a as $s) { - echo '
\n" . - '
' . "\n" . - '
' . "\n" . - '
\n" . + '
' . "\n" . + '
' . "\n" . + ' ' . "\n" . + ' ' . "\n"; + } // End of file_uploads if-block /* End of attachment code */ - if ($compose_new_win == '1') { - echo ''."\n"; - } - - echo '' . "\n" . - '\n" . - '\n" . - '\n"; + echo '' . "\n" . + addHidden('username', $username). + addHidden('smaction', $action). + addHidden('mailbox', $mailbox); /* store the complete ComposeMessages array in a hidden input value so we can restore them in case of a session timeout. - */ + */ sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER); - echo '\n"; - echo '\n"; - echo '\n"; - echo '
'; + echo addHidden('restoremessages', serialize($compose_messages)). + addHidden('composesession', $composesession). + addHidden('querystring', $queryString). + "\n"; if (!(bool) ini_get('file_uploads')) { - /* File uploads are off, so we didn't show that part of the form. - To avoid bogus bug reports, tell the user why. */ - echo 'Because PHP file uploads are turned off, you can not attach files '; - echo "to this message. Please see your system administrator for details.\r\n"; + /* File uploads are off, so we didn't show that part of the form. + To avoid bogus bug reports, tell the user why. */ + echo '

' + . _("Because PHP file uploads are turned off, you can not attach files to this message. Please see your system administrator for details.") + . "

\r\n"; } do_hook('compose_bottom'); - echo '' . "\n"; + echo '' . "\n"; } function showComposeButtonRow() { global $use_javascript_addr_book, $save_as_draft, - $default_use_priority, $mailprio, $default_use_mdn, - $request_mdn, $request_dr, - $data_dir, $username; + $default_use_priority, $mailprio, $default_use_mdn, + $request_mdn, $request_dr, + $data_dir, $username; - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; if ($default_use_priority) { if(!isset($mailprio)) { - $mailprio = "3"; - } - echo ' ' . _("Priority") .': ' . "\n"; + $mailprio = '3'; + } + echo ' ' . _("Priority") . + addSelect('mailprio', array( + '1' => _("High"), + '3' => _("Normal"), + '5' => _("Low") ), $mailprio, TRUE); } $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn); if ($default_use_mdn) { if ($mdn_user_support) { echo ' ' . _("Receipt") .': '. - ''. _("On Read"). - ' '. _("On Delivery"); + addCheckBox('request_mdn', $request_mdn == '1', '1'). _("On Read"). + addCheckBox('request_dr', $request_dr == '1', '1'). _("On Delivery"); } } - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; if ($use_javascript_addr_book) { - echo " \n"; + echo " \n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } if ($save_as_draft) { - echo ' \n"; + echo ' \n"; } - echo ' ' . "\n"; + echo ' ' . "\n"; do_hook('compose_button_row'); - echo ' ' . "\n" . - ' ' . "\n\n"; + echo ' ' . "\n" . + ' ' . "\n\n"; } function checkInput ($show) { @@ -1219,8 +1423,8 @@ function checkInput ($show) { /* True if FAILURE */ function saveAttachedFiles($session) { - global $_FILES, $attachment_dir, $attachments, $username, - $data_dir, $compose_messages; + global $_FILES, $attachment_dir, $username, + $data_dir, $compose_messages; /* get out of here if no file was attached at all */ if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) { @@ -1235,12 +1439,12 @@ function saveAttachedFiles($session) { $full_localfilename = "$hashed_attachment_dir/$localfilename"; } - // FIXME: we SHOULD prefer move_uploaded_file over rename because - // m_u_f works better with restricted PHP installes (safe_mode, open_basedir) - if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) { - if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) { - return true; - } + // 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'],$full_localfilename)) { + if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) { + return true; + } } $message = $compose_messages[$session]; $type = strtolower($_FILES['attachfile']['type']); @@ -1250,18 +1454,6 @@ function saveAttachedFiles($session) { 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) { @@ -1276,14 +1468,14 @@ function getByteSize($ini_size) { switch(strtoupper(substr($ini_size, -1))) { case 'G': - $bytesize = 1073741824; - break; + $bytesize = 1073741824; + break; case 'M': - $bytesize = 1048576; - break; + $bytesize = 1048576; + break; case 'K': - $bytesize = 1024; - break; + $bytesize = 1024; + break; } return ($bytesize * (int)substr($ini_size, 0, -1)); @@ -1293,28 +1485,19 @@ function getByteSize($ini_size) { } -/* temporary function to make use of the deliver class. - In the future the responsable 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. -*/ - +/** + * temporary function to make use of the deliver class. + * 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. + */ function deliverMessage($composeMessage, $draft=false) { global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body, - $username, $popuser, $usernamedata, $identity, $idents, $data_dir, - $request_mdn, $request_dr, $default_charset, $color, $useSendmail, - $domain, $action, $default_move_to_sent, $move_to_sent; + $username, $popuser, $usernamedata, $identity, $idents, $data_dir, + $request_mdn, $request_dr, $default_charset, $color, $useSendmail, + $domain, $action, $default_move_to_sent, $move_to_sent; global $imapServerAddress, $imapPort, $sent_folder, $key; - /* some browsers replace by nonbreaking spaces   - by replacing them back to spaces addressparsing works */ - /* FIXME: How to handle in case of other charsets where "\240" - is not a non breaking space ??? */ - - $send_to = str_replace("\240",' ',$send_to); - $send_to_cc = str_replace("\240",' ',$send_to_cc); - $send_to_bcc = str_replace("\240",' ',$send_to_bcc); - $rfc822_header = $composeMessage->rfc822_header; $abook = addressbook_init(false, true); @@ -1323,6 +1506,7 @@ function deliverMessage($composeMessage, $draft=false) { $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain, array(&$abook,'lookup')); $rfc822_header->priority = $mailprio; $rfc822_header->subject = $subject; + $special_encoding=''; if (strtolower($default_charset) == 'iso-2022-jp') { if (mb_detect_encoding($body) == 'ASCII') { @@ -1335,18 +1519,18 @@ function deliverMessage($composeMessage, $draft=false) { $composeMessage->setBody($body); if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) { - $popuser = $usernamedata[1]; - $domain = $usernamedata[2]; - unset($usernamedata); + $popuser = $usernamedata[1]; + $domain = $usernamedata[2]; + unset($usernamedata); } else { - $popuser = $username; + $popuser = $username; } $reply_to = ''; $from_mail = $idents[$identity]['email_address']; $full_name = $idents[$identity]['full_name']; $reply_to = $idents[$identity]['reply_to']; if (!$from_mail) { - $from_mail = "$popuser@$domain"; + $from_mail = "$popuser@$domain"; } $rfc822_header->from = $rfc822_header->parseAddress($from_mail,true); if ($full_name) { @@ -1361,15 +1545,15 @@ function deliverMessage($composeMessage, $draft=false) { $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true); } if ($reply_to) { - $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true); + $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true); } /* Receipt: On Read */ if (isset($request_mdn) && $request_mdn) { - $rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true); + $rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true); } /* Receipt: On Delivery */ if (isset($request_dr) && $request_dr) { - $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail; + $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail; } /* multipart messages */ if (count($composeMessage->entities)) { @@ -1399,7 +1583,7 @@ function deliverMessage($composeMessage, $draft=false) { } if ($default_charset) { $content_type->properties['charset']=$default_charset; - } + } } $rfc822_header->content_type = $content_type; @@ -1416,55 +1600,48 @@ function deliverMessage($composeMessage, $draft=false) { if (!$useSendmail && !$draft) { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech; - - if ($smtp_auth_mech == 'none') { - $user = ''; - $pass = ''; - } else { - global $key, $onetimepad; - $user = $username; - $pass = OneTimePadDecrypt($key, $onetimepad); - } + global $smtpServerAddress, $smtpPort, $pop_before_smtp; $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; + get_smtp_user($user, $pass); $stream = $deliver->initStream($composeMessage,$domain,0, - $smtpServerAddress, $smtpPort, $user, $pass, $authPop); + $smtpServerAddress, $smtpPort, $user, $pass, $authPop); } elseif (!$draft) { - require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); - global $sendmail_path; - $deliver = new Deliver_SendMail(); - $stream = $deliver->initStream($composeMessage,$sendmail_path); + require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); + global $sendmail_path; + $deliver = new Deliver_SendMail(); + $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, - $imapPort, 0); - if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { - require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); - $imap_deliver = new Deliver_IMAP(); - $length = $imap_deliver->mail($composeMessage); - sqimap_append ($imap_stream, $draft_folder, $length); - $imap_deliver->mail($composeMessage, $imap_stream); - sqimap_append_done ($imap_stream, $draft_folder); - sqimap_logout($imap_stream); - unset ($imap_deliver); - return $length; + global $draft_folder; + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 0); + if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); + $imap_deliver = new Deliver_IMAP(); + $length = $imap_deliver->mail($composeMessage); + sqimap_append ($imap_stream, $draft_folder, $length); + $imap_deliver->mail($composeMessage, $imap_stream); + sqimap_append_done ($imap_stream, $draft_folder); + sqimap_logout($imap_stream); + unset ($imap_deliver); + $composeMessage->purgeAttachments(); + return $length; } else { - $msg = '
Error: '._("Draft folder")." $draft_folder" . ' does not exist.'; - plain_error_message($msg, $color); - return false; + $msg = '
'.sprintf(_("Error: Draft folder %s does not exist."), $draft_folder); + plain_error_message($msg, $color); + return false; } } - $succes = false; + $success = false; if ($stream) { $length = $deliver->mail($composeMessage, $stream); - $succes = $deliver->finalizeStream($stream); + $success = $deliver->finalizeStream($stream); } - if (!$succes) { - $msg = $deliver->dlv_msg . '
' . - _("Server replied: ") . $deliver->dlv_ret_nr . ' '. - $deliver->dlv_server_msg; + if (!$success) { + $msg = $deliver->dlv_msg . '
' . + _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . + $deliver->dlv_server_msg; plain_error_message($msg, $color); } else { unset ($deliver); @@ -1479,7 +1656,7 @@ function deliverMessage($composeMessage, $draft=false) { } if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none')) - && sqimap_mailbox_exists( $imap_stream, $sent_folder)) { + && sqimap_mailbox_exists( $imap_stream, $sent_folder)) { $fld_sent = true; } else { $fld_sent = false; @@ -1492,6 +1669,13 @@ function deliverMessage($composeMessage, $draft=false) { } if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) { + global $passed_id, $mailbox, $action; + if ($action == 'reply' || $action == 'reply_all') { + $save_reply_with_orig=getPref($data_dir,$username,'save_reply_with_orig'); + if ($save_reply_with_orig) { + $sent_folder = $mailbox; + } + } sqimap_append ($imap_stream, $sent_folder, $length); require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); @@ -1499,15 +1683,32 @@ function deliverMessage($composeMessage, $draft=false) { sqimap_append_done ($imap_stream, $sent_folder); unset ($imap_deliver); } - global $passed_id, $mailbox, $action; - ClearAttachments($composeMessage); + + global $passed_id, $mailbox, $action, $what, $iAccount,$startMessage; + + $composeMessage->purgeAttachments(); if ($action == 'reply' || $action == 'reply_all') { - sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', true); + $aMailbox = sqm_api_mailbox_select($imap_stream, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); + //sqimap_mailbox_select ($imap_stream, $mailbox); + $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']; + } + } + /** + * Write mailbox with updated seen flag information back to cache. + */ + $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; + sqsession_register($mailbox_cache,'mailbox_cache'); } - sqimap_logout($imap_stream); + sqimap_logout($imap_stream); } - return $succes; + return $success; } -?> \ No newline at end of file +?>