X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=7f1d6809b9b2654037e7f77feb5356a3edf2bfb8;hp=e1c67a644f10388bdff4b76f50db8d87ac5d2ea2;hb=fe868193d60150226a596984dac9eaa337b1e6ff;hpb=1e2a6ff60c8e2fb4bb994a9ee508395e3ead3959 diff --git a/src/compose.php b/src/compose.php index e1c67a64..7f1d6809 100644 --- a/src/compose.php +++ b/src/compose.php @@ -3,7 +3,7 @@ /** * compose.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2004 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code sends a mail. @@ -15,9 +15,10 @@ * - Save As Draft * * $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -31,6 +32,7 @@ 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/identity.php'); +require_once(SM_PATH . 'functions/forms.php'); /* --------------------- Get globals ------------------------------------- */ /** COOKIE VARS */ @@ -46,7 +48,6 @@ sqgetGlobalVar('composesession', $composesession, SQ_SESSION); sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION); /** SESSION/POST/GET VARS */ -sqgetGlobalVar('action',$action); sqgetGlobalVar('session',$session); sqgetGlobalVar('mailbox',$mailbox); if(!sqgetGlobalVar('identity',$identity)) { @@ -73,7 +74,7 @@ sqgetGlobalVar('draft_id',$draft_id); sqgetGlobalVar('ent_num',$ent_num); sqgetGlobalVar('saved_draft',$saved_draft); sqgetGlobalVar('delete_draft',$delete_draft); - +sqgetGlobalVar('startMessage',$startMessage); /** POST VARS */ sqgetGlobalVar('sigappend', $sigappend, SQ_POST); @@ -90,6 +91,17 @@ if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { /** GET VARS */ sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET); +/** 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(); /* Identities (fetch only once) */ @@ -117,30 +129,35 @@ function replyAllString($header) { } } - /** + /** * 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 .= ', '. $email; } } $url_replytoallcc = substr($url_replytoallcc,2); - + return $url_replytoallcc; } -function getReplyCitation($orig_from) { +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); + $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); // $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); /* First, return an empty string when no citation style selected. */ if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { @@ -162,8 +179,12 @@ function getReplyCitation($orig_from) { $start = '<' . _("quote") . ' ' . _("who") . '="'; $end = '">'; break; + case 'date_time_author': + $start = 'On ' . getLongDateString($orig_date) . ', '; + $end = ' ' . _("said") . ':'; + break; case 'user-defined': - $start = $reply_citation_start . + $start = $reply_citation_start . ($reply_citation_start == '' ? '' : ' '); $end = $reply_citation_end; break; @@ -179,20 +200,20 @@ function getforwardHeader($orig_header) { global $editor_size; $display = array( _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), + _("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 = 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); + $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false,true); $to = str_replace(' ',' ',$to); - $subject = decodeHeader($orig_header->subject,false,false); + $subject = decodeHeader($orig_header->subject,false,false,true); $subject = str_replace(' ',' ',$subject); $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) . "\n". $display[_("Subject")] . $subject . "\n" . @@ -200,8 +221,8 @@ function getforwardHeader($orig_header) { $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); + $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 , '-') . @@ -211,12 +232,12 @@ function getforwardHeader($orig_header) { /* ----------------------------------------------------------------------- */ /* - * If the session is expired during a post this restores the compose session + * If the session is expired during a post this restores the compose session * vars. */ if (sqsession_is_registered('session_expired_post')) { sqgetGlobalVar('session_expired_post', $session_expired_post, SQ_SESSION); - /* + /* * extra check for username so we don't display previous post data from * another user during this session. */ @@ -261,10 +282,10 @@ if (!isset($composesession)) { if (!isset($session) || (isset($newmessage) && $newmessage)) { sqsession_unregister('composesession'); - $session = "$composesession" +1; + $session = "$composesession" +1; $composesession = $session; sqsession_register($composesession,'composesession'); -} +} if (!isset($compose_messages)) { $compose_messages = array(); } @@ -275,7 +296,7 @@ if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL) $composeMessage->rfc822_header = $rfc822_header; $composeMessage->reply_rfc822_header = ''; $compose_messages[$session] = $composeMessage; - sqsession_register($compose_messages,'compose_messages'); + sqsession_register($compose_messages,'compose_messages'); } else { $composeMessage=$compose_messages[$session]; } @@ -360,12 +381,12 @@ if ($send) { } else { sqWordWrap($line, $editor_size); $newBody .= $line . "\n"; - + } - + } $body = $newBody; - + $composeMessage=$compose_messages[$session]; $Result = deliverMessage($composeMessage); @@ -373,7 +394,7 @@ if ($send) { showInputForm($session); exit(); } - unset($compose_messages[$session]); + unset($compose_messages[$session]); if ( isset($delete_draft)) { Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); @@ -385,7 +406,7 @@ if ($send) { } else { Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=1"); + "&startMessage=$startMessage&mail_sent=yes"); } } else { if ($compose_new_win == '1') { @@ -495,7 +516,7 @@ elseif (isset($sigappend)) { } else { /* * This handles the default case as well as the error case - * (they had the same code) --> if (isset($smtpErrors)) + * (they had the same code) --> if (isset($smtpErrors)) */ if ($compose_new_win == '1') { @@ -510,15 +531,15 @@ elseif (isset($sigappend)) { $passed_ent_id = ''; } if (!isset($passed_id)) { - $passed_id = ''; + $passed_id = ''; } if (!isset($mailbox)) { $mailbox = ''; - } + } if (!isset($action)) { $action = ''; } - + $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session); /* in case the origin is not read_body.php */ @@ -541,6 +562,15 @@ 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='') { @@ -548,7 +578,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $use_signature, $composesession, $data_dir, $username, $username, $key, $imapServerAddress, $imapPort, $compose_messages, $composeMessage; - global $languages, $squirrelmail_language; + global $languages, $squirrelmail_language, $default_charset; $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; @@ -559,7 +589,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se sqimap_mailbox_select($imapConnection, $mailbox); $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); - + $body = ''; if ($passed_ent_id) { /* redefine the messsage in case of message/rfc822 */ @@ -586,7 +616,7 @@ 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; @@ -596,8 +626,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $bodypart = decodeBody($unencoded_bodypart, $body_part_entity->header->encoding); if ($type1 == 'html') { - $bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart); + $bodypart = str_replace("\n", ' ', $bodypart); + $bodypart = preg_replace(array('/

/i','//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'])) { @@ -605,6 +638,17 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $bodypart = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $bodypart); } } + + 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_decode($actual,$bodypart); + } + $body .= $bodypart; } if ($default_use_priority) { @@ -619,6 +663,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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 { @@ -646,10 +695,23 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se 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); + $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; + } + } + } + $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; @@ -667,10 +729,10 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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); + $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); @@ -678,35 +740,38 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se 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 . ']'; - } + $subject = getforwardSubject(decodeHeader($orig_header->subject,false,false,true)); $body = getforwardHeader($orig_header) . $body; sqUnWordWrap($body); $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); $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'): - $send_to_cc = replyAllString($orig_header); - $send_to_cc = decodeHeader($send_to_cc,false,true); - case ('reply'): - $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)) { /* unnessecarry, just for falesafe purpose */ - $send_to = $orig_header->getAddr_s('reply_to'); + 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); + } + 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'); + } } - $send_to = decodeHeader($send_to,false,true); - $subject = decodeHeader($orig_header->subject,false,true); + $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:') { @@ -715,20 +780,22 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se /* 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); + sqUnWordWrap($body); // unwrap and then reset it?! $body = ''; - $cnt = count($rewrap_body); - for ($i=0;$i<$cnt;$i++) { - sqWordWrap($rewrap_body[$i], ($editor_size)); - if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) { + $strip_sigs = getPref($data_dir, $username, 'strip_sigs'); + foreach ($rewrap_body as $line) { + if ($strip_sigs && substr($line,0,3) == '-- ') { + break; + } + sqWordWrap($line, ($editor_size)); + if (preg_match("/^(>+)/", $line, $matches)) { $gt = $matches[1]; - $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n"; + $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n"; } else { - $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n"; + $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n"; } - unset($rewrap_body[$i]); } - $body = getReplyCitation($from) . $body; + $body = getReplyCitation($from , $orig_header->date) . $body; $composeMessage->reply_rfc822_header = $orig_header; break; @@ -754,16 +821,17 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) { global $attachment_dir, $username, $data_dir, $squirrelmail_language; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - if (!count($message->entities) || + if (!count($message->entities) || ($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.'.eml'; + $filename = $message->rfc822_header->subject; if ($filename == "") { - $filename = "untitled-".$message->entity_id.'.eml'; + $filename = "untitled-".$message->entity_id; } + $filename .= '.msg'; } else { $filename = $message->getFilename(); } @@ -775,8 +843,8 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap $filename = $message->getFilename(); break; } - $filename = decodeHeader($filename); - if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + $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); } @@ -788,9 +856,9 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap } $message->att_local_name = $full_localfilename; - $composeMessage->initAttachment($message->type0.'/'.$message->type1,$filename, + $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, @@ -806,65 +874,65 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap return $composeMessage; } -function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, +function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id='', $imapConnection) { - global $attachments, $attachment_dir, $username, $data_dir, $uid_support; + global $attachments, $attachment_dir, $username, $data_dir; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (!$passed_ent_id) { - $body_a = sqimap_run_command($imapConnection, + $body_a = sqimap_run_command($imapConnection, 'FETCH '.$passed_id.' RFC822', - TRUE, $response, $readmessage, - $uid_support); + TRUE, $response, $readmessage, + TRUE); } else { - $body_a = sqimap_run_command($imapConnection, + $body_a = sqimap_run_command($imapConnection, 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']', - TRUE, $response, $readmessage, $uid_support); + TRUE, $response, $readmessage, TRUE); $message = $message->parent; } if ($response == 'OK') { $subject = encodeHeader($message->rfc822_header->subject); array_shift($body_a); + 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'); + + $fp = fopen($full_localfilename, 'w'); fwrite ($fp, $body); fclose($fp); - $composeMessage->initAttachment('message/rfc822',$subject.'.eml', + $composeMessage->initAttachment('message/rfc822',$subject.'.msg', $full_localfilename); } return $composeMessage; } function showInputForm ($session, $values=false) { - global $send_to, $send_to_cc, $body, + global $send_to, $send_to_cc, $body, $startMessage, $passed_body, $color, $use_signature, $signature, $prefix_sig, - $editor_size, $attachments, $subject, $newmail, + $editor_size, $editor_height, $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, + $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, $username, $compose_messages, $composesession, $default_charset; $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']; + $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"; + 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").'
'; } if ($mail_sent == 'yes') { - echo '
'. _("Your Message has been sent").'
'; + echo '
'. _("Your Message has been sent.").'
'; } - echo '' . "\n"; + echo '
' . "\n"; if ($compose_new_win == '1') { echo '
'."\n" . ' '. html_tag( 'td', '', 'right' ) . ''."\n"; @@ -913,54 +983,48 @@ function showInputForm ($session, $values=false) { /* display select list for identities */ if (count($idents) > 1) { + $ident_list = array(); + foreach($idents as $id => $data) { + $ident_list[$id] = + $data['full_name'].' <'.$data['email_address'].'>'; + } echo ' ' . "\n" . html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . _("From:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . - ' ' . "\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" . + addInput('send_to', $send_to, 60). '
' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . html_tag( 'td', '', 'right', $color[4] ) . _("CC:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - '
' . "\n" . + addInput('send_to_cc', $send_to_cc, 60). '
' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . html_tag( 'td', '', 'right', $color[4] ) . _("BCC:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4] ) . - '
' . "\n" . + addInput('send_to_bcc', $send_to_bcc, 60).'
' . "\n" . ' ' . "\n" . ' ' . "\n" . ' ' . "\n" . html_tag( 'td', '', 'right', $color[4] ) . _("Subject:") . '' . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "\n"; - echo ' ' . "\n" . + echo ' '.addInput('subject', $subject, 60). ' ' . "\n" . ' ' . "\n\n"; @@ -972,14 +1036,14 @@ function showInputForm ($session, $values=false) { if ($compose_new_win == '1') { echo ' ' . "\n" . ' ' . "\n" . @@ -1042,7 +1106,7 @@ function showInputForm ($session, $values=false) { } else { $maxsize = ''; } - echo ''; + echo addHidden('MAX_FILE_SIZE', min( $sizes )); echo ' ' . "\n" . ' ' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .''; - } + } echo ''; @@ -1101,19 +1166,18 @@ function showInputForm ($session, $values=false) { } echo '
' . "\n" . - '
' . "\n" . '
' . "\n" . ' ' . "\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) { + 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 . + '" border="0">
'. + addCheckBox('delete[]', FALSE, $key). + "\n" . $attached_filename . '- ' . $type . '('. show_readable_size( filesize( $attached_file ) ) . ')
'."\n"; } @@ -1083,7 +1148,7 @@ function showInputForm ($session, $values=false) { if (count($s_a)) { foreach ($s_a as $s) { echo '
\n" . '
' . "\n" . - '\n" . - '\n" . - '\n"; - /* - store the complete ComposeMessages array in a hidden input value + 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. */ @@ -1137,22 +1201,20 @@ function showComposeButtonRow() { ' ' . "\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"); } } @@ -1276,7 +1338,7 @@ function getByteSize($ini_size) { return ($bytesize * (int)substr($ini_size, 0, -1)); } - + return $ini_size; } @@ -1298,10 +1360,13 @@ function deliverMessage($composeMessage, $draft=false) { 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); + /* THEFIX: browsers don't replace space with nbsp. SM replaces + space with nbsp when decodes headers. If problem still happens, + use cleanup_nbsp() */ + +// $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; @@ -1357,7 +1422,7 @@ function deliverMessage($composeMessage, $draft=false) { } /* 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)) { @@ -1369,49 +1434,45 @@ function deliverMessage($composeMessage, $draft=false) { $mime_header->type1 = 'plain'; if ($special_encoding) { $mime_header->encoding = $special_encoding; - } else { + } else { $mime_header->encoding = '8bit'; } if ($default_charset) { $mime_header->parameters['charset'] = $default_charset; } - $message_body->mime_header = $mime_header; + $message_body->mime_header = $mime_header; array_unshift($composeMessage->entities, $message_body); $content_type = new ContentType('multipart/mixed'); } else { $content_type = new ContentType('text/plain'); if ($special_encoding) { $rfc822_header->encoding = $special_encoding; - } else { + } else { $rfc822_header->encoding = '8bit'; - } + } if ($default_charset) { $content_type->properties['charset']=$default_charset; - } } - + } + $rfc822_header->content_type = $content_type; $composeMessage->rfc822_header = $rfc822_header; - /* Here you can modify the message structure just before we hand + /* Here you can modify the message structure just before we hand it over to deliver */ - do_hook('compose_send'); + $hookReturn = do_hook('compose_send', $composeMessage); + /* Get any changes made by plugins to $composeMessage. */ + if ( is_object($hookReturn[1]) ) { + $composeMessage = $hookReturn[1]; + } 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); - } - $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); } elseif (!$draft) { @@ -1428,14 +1489,14 @@ function deliverMessage($composeMessage, $draft=false) { 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); + 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; } else { - $msg = '
Error: '._("Draft folder")." $draft_folder" . ' does not exist.'; + $msg = '
'.sprintf(_("Error: Draft folder %s does not exist."), $draft_folder); plain_error_message($msg, $color); return false; } @@ -1446,7 +1507,7 @@ function deliverMessage($composeMessage, $draft=false) { $succes = $deliver->finalizeStream($stream); } if (!$succes) { - $msg = $deliver->dlv_msg . '
' . + $msg = $deliver->dlv_msg . '
' . _("Server replied: ") . $deliver->dlv_ret_nr . ' '. $deliver->dlv_server_msg; plain_error_message($msg, $color); @@ -1462,7 +1523,7 @@ function deliverMessage($composeMessage, $draft=false) { $svr_allow_sent = false; } - if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none')) + if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none')) && sqimap_mailbox_exists( $imap_stream, $sent_folder)) { $fld_sent = true; } else { @@ -1476,6 +1537,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(); @@ -1487,9 +1555,9 @@ function deliverMessage($composeMessage, $draft=false) { ClearAttachments($composeMessage); if ($action == 'reply' || $action == 'reply_all') { sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', true); + sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); } - sqimap_logout($imap_stream); + sqimap_logout($imap_stream); } return $succes; }