X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=049b40a0f708001ae2a18e10254473b92ef5e143;hp=b034df4ce7a7a4c2956b36115f3db9af0f340c97;hb=9ca455dbe25e09e77913e9f399f8b382315e8d7d;hpb=d3c13a51ec968b515dc33ba464643c5e2191a920 diff --git a/src/compose.php b/src/compose.php index b034df4c..049b40a0 100644 --- a/src/compose.php +++ b/src/compose.php @@ -3,7 +3,7 @@ /** * compose.php * - * Copyright (c) 1999-2002 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,13 +15,15 @@ * - Save As Draft * * $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); +require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/mime.php'); @@ -29,82 +31,86 @@ 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/identity.php'); +require_once(SM_PATH . 'functions/forms.php'); /* --------------------- Get globals ------------------------------------- */ -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; -$base_uri = $_SESSION['base_uri']; -$delimiter = $_SESSION['delimiter']; - -if (isset($_POST['return'])) { - $html_addr_search_done = 'Use Addresses'; -} -if ( isset($_SESSION['composesession']) ) { - $composesession = $_SESSION['composesession']; -} -sqextractGlobalVar('action'); -sqextractGlobalVar('session'); -sqextractGlobalVar('mailbox'); -sqextractGlobalVar('identity'); -sqextractGlobalVar('send_to'); -sqextractGlobalVar('send_to_cc'); -sqextractGlobalVar('send_to_bcc'); -sqextractGlobalVar('subject'); -sqextractGlobalVar('body'); -sqextractGlobalVar('mailprio'); -sqextractGlobalVar('request_mdn'); -sqextractGlobalVar('request_dr'); -sqextractGlobalVar('html_addr_search'); -sqextractGlobalVar('mail_sent'); -sqextractGlobalVar('passed_id'); -sqextractGlobalVar('passed_ent_id'); -sqextractGlobalVar('send'); - -if ( isset($_POST['sigappend']) ) { - $sigappend = $_POST['sigappend']; -} -/* From addressbook search */ -if ( isset($_POST['from_htmladdr_search']) ) { - $from_htmladdr_search = $_POST['from_htmladdr_search']; -} -if ( isset($_POST['addr_search_done']) ) { - $html_addr_search_done = $_POST['addr_search_done']; -} -if ( isset($_POST['send_to_search']) ) { - $send_to_search = &$_POST['send_to_search']; -} - -/* Attachments */ -sqextractGlobalVar('attach'); -if ( isset($_POST['do_delete']) ) { - $do_delete = $_POST['do_delete']; -} -if ( isset($_POST['delete']) ) { - $delete = &$_POST['delete']; +/** COOKIE VARS */ +sqgetGlobalVar('key', $key, SQ_COOKIE); + +/** SESSION VARS */ +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); +sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); + +sqgetGlobalVar('composesession', $composesession, SQ_SESSION); +sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION); + +/** SESSION/POST/GET VARS */ +sqgetGlobalVar('session',$session); +sqgetGlobalVar('mailbox',$mailbox); +if(!sqgetGlobalVar('identity',$identity)) { + $identity=0; } -if ( isset($_SESSION['compose_messages']) ) { - $compose_messages = &$_SESSION['compose_messages']; +sqgetGlobalVar('send_to',$send_to); +sqgetGlobalVar('send_to_cc',$send_to_cc); +sqgetGlobalVar('send_to_bcc',$send_to_bcc); +sqgetGlobalVar('subject',$subject); +sqgetGlobalVar('body',$body); +sqgetGlobalVar('mailprio',$mailprio); +sqgetGlobalVar('request_mdn',$request_mdn); +sqgetGlobalVar('request_dr',$request_dr); +sqgetGlobalVar('html_addr_search',$html_addr_search); +sqgetGlobalVar('mail_sent',$mail_sent); +sqgetGlobalVar('passed_id',$passed_id); +sqgetGlobalVar('passed_ent_id',$passed_ent_id); +sqgetGlobalVar('send',$send); + +sqgetGlobalVar('attach',$attach); + +sqgetGlobalVar('draft',$draft); +sqgetGlobalVar('draft_id',$draft_id); +sqgetGlobalVar('ent_num',$ent_num); +sqgetGlobalVar('saved_draft',$saved_draft); +sqgetGlobalVar('delete_draft',$delete_draft); +sqgetGlobalVar('startMessage',$startMessage); + +/** POST VARS */ +sqgetGlobalVar('sigappend', $sigappend, SQ_POST); +sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST); +sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST); +sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST); +sqgetGlobalVar('do_delete', $do_delete, SQ_POST); +sqgetGlobalVar('delete', $delete, SQ_POST); +sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); +if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { + $html_addr_search_done = 'Use Addresses'; } - -/* Forward message as attachment */ -if ( isset($_GET['attachedmessages']) ) { - $attachedmessages = $_GET['attachedmessages']; +/** 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'; } -/* Drafts */ -sqextractGlobalVar('draft'); -sqextractGlobalVar('draft_id'); -sqextractGlobalVar('ent_num'); -sqextractGlobalVar('saved_draft'); -sqextractGlobalVar('delete_draft'); - -$key = $_COOKIE['key']; +/* Location (For HTTP 1.1 Header("Location: ...") redirects) */ +$location = get_location(); +/* Identities (fetch only once) */ +$idents = get_identities(); /* --------------------- Specific Functions ------------------------------ */ function replyAllString($header) { - global $include_self_reply_all, $username, $data_dir; + global $include_self_reply_all, $idents; $excl_ar = array(); /** * 1) Remove the addresses we'll be sending the message 'to' @@ -118,78 +124,120 @@ function replyAllString($header) { * TO list) only if $include_self_reply_all is turned off */ if (!$include_self_reply_all) { - $email_address = strtolower(trim(getPref($data_dir, $username, 'email_address'))); - $excl_ar[$email_address] = ''; - $idents = getPref($data_dir, $username, 'identities'); - if ($idents != '' && $idents > 1) { - $first_id = false; - for ($i = 1; $i < $idents; $i ++) { - $cur_email_address = getPref($data_dir, $username, - 'email_address' . $i); - $cur_email_address = strtolower(trim($cur_email_address)); - $excl_ar[$cur_email_address] = ''; - } - } + 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>"; + // 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, $orig_date) { + global $reply_citation_style, $reply_citation_start, $reply_citation_end; + $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')) { + return ''; + } + + /* Make sure our final value isn't an empty string. */ + if ($orig_from == '') { + return ''; + } + + /* Otherwise, try to select the desired citation style. */ + switch ($reply_citation_style) { + case 'author_said': + $start = ''; + $end = ' ' . _("said") . ':'; + break; + case 'quote_who': + $start = '<' . _("quote") . ' ' . _("who") . '="'; + $end = '">'; + break; + case 'date_time_author': + $start = 'On ' . getLongDateString($orig_date) . ', '; + $end = ' ' . _("said") . ':'; + break; + case 'user-defined': + $start = $reply_citation_start . + ($reply_citation_start == '' ? '' : ' '); + $end = $reply_citation_end; + break; + default: + return ''; + } + + /* Build and return the citation string. */ + return ($start . $orig_from . $end . "\n"); +} + 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,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); $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) . - "\n". $display[_("Subject")] . - decodeHeader($orig_header->subject) . "\n" . - $display[_("From")] . - decodeHeader($orig_header->getAddr_s('from',"\n$indent")) . "\n" . - $display[_("Date")] . - getLongDateString( $orig_header->date ). "\n" . - $display[_("To")] . - decodeHeader($orig_header->getAddr_s('to',"\n$indent")) ."\n"; - if ($orig_header->cc != array() && $orig_header->cc !='') { - $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n"; + "\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\n"; return $bodyTop; } /* ----------------------------------------------------------------------- */ /* - * 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')) { - $session_expired_post = $_SESSION['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. */ @@ -219,7 +267,6 @@ if (sqsession_is_registered('session_expired_post')) { if (!isset($mailbox)) { $mailbox = ''; } - if ($compose_new_win == '1') { compose_Header($color, $mailbox); } else { @@ -235,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(); } @@ -249,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]; } @@ -273,17 +320,17 @@ if ($draft) { $draft_message = _("Draft Email Saved"); /* If this is a resumed draft, then delete the original */ if(isset($delete_draft)) { - Header("Location: delete_message.php?mailbox=" . urlencode($draft_folder) . + Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) . "&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes"); exit(); } else { if ($compose_new_win == '1') { - Header("Location: compose.php?saved_draft=yes&session=$composesession"); + Header("Location: $location/compose.php?saved_draft=yes&session=$composesession"); exit(); } else { - Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". + Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort". "&startMessage=1¬e=".urlencode($draft_message)); exit(); } @@ -298,6 +345,10 @@ if ($send) { $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 */ + } $urlMailbox = urlencode (trim($mailbox)); if (! isset($passed_id)) { $passed_id = 0; @@ -330,30 +381,32 @@ if ($send) { } else { sqWordWrap($line, $editor_size); $newBody .= $line . "\n"; + } + } $body = $newBody; - do_hook('compose_send'); + $composeMessage=$compose_messages[$session]; - $Result = deliverMessage($composeMessage); + $Result = deliverMessage($composeMessage); if (! $Result) { showInputForm($session); exit(); } - unset($compose_messages[$session]); + unset($compose_messages[$session]); if ( isset($delete_draft)) { - Header("Location: delete_message.php?mailbox=" . urlencode( $draft_folder ). + Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); exit(); } if ($compose_new_win == '1') { - Header("Location: compose.php?mail_sent=yes"); + Header("Location: $location/compose.php?mail_sent=yes"); } else { - Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=1"); + Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". + "&startMessage=$startMessage&mail_sent=yes"); } } else { if ($compose_new_win == '1') { @@ -427,15 +480,8 @@ if ($send) { showInputForm($session); } elseif (isset($sigappend)) { - $idents = getPref($data_dir, $username, 'identities', 0); - if ($idents > 1) { - if ($identity == 'default') { - $no = 'g'; - } else { - $no = $identity; - } - $signature = getSig($data_dir, $username, $no); - } + $signature = $idents[$identity]['signature']; + $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature; if ($compose_new_win == '1') { compose_Header($color, $mailbox); @@ -454,23 +500,23 @@ elseif (isset($sigappend)) { if (isset($delete) && is_array($delete)) { $composeMessage = $compose_messages[$session]; foreach($delete as $index) { - $attached_file = $composeMessage->entities[$index]->att_local_name; + $attached_file = $composeMessage->entities[$index]->att_local_name; unlink ($attached_file); - unset ($composeMessage->entities[$index]); + unset ($composeMessage->entities[$index]); } - $new_entities = array(); - foreach ($composeMessage->entities as $entity) { - $new_entities[] = $entity; - } - $composeMessage->entities = $new_entities; - $compose_messages[$session] = $composeMessage; - sqsession_register($compose_messages, 'compose_messages'); + $new_entities = array(); + foreach ($composeMessage->entities as $entity) { + $new_entities[] = $entity; + } + $composeMessage->entities = $new_entities; + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages, 'compose_messages'); } showInputForm($session); } 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') { @@ -485,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 */ @@ -506,6 +552,9 @@ elseif (isset($sigappend)) { if (isset($send_to_bcc)) { $values['send_to_bcc'] = $send_to_bcc; } + if (isset($subject)) { + $values['subject'] = $subject; + } showInputForm($session, $values); } @@ -513,13 +562,23 @@ 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, + global $editor_size, $default_use_priority, $body, $idents, $use_signature, $composesession, $data_dir, $username, $username, $key, $imapServerAddress, $imapPort, $compose_messages, - $composeMessage; + $composeMessage; + global $languages, $squirrelmail_language, $default_charset; $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; @@ -530,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 */ @@ -557,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; @@ -567,8 +626,29 @@ 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("\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'])) { + if (mb_detect_encoding($bodypart) != 'ASCII') { + $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) { @@ -582,42 +662,56 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se //ClearAttachments($session); $identity = ''; - $idents = getPref($data_dir, $username, 'identities'); $from_o = $orig_header->from; if (is_object($from_o)) { $orig_from = $from_o->getAddress(); } else { $orig_from = ''; } - $identities = array(); - if (!empty($idents) && $idents > 1) { - $identities[] = '"'. getPref($data_dir, $username, 'full_name') - . '" <' . getPref($data_dir, $username, 'email_address') . '>'; - for ($i = 1; $i < $idents; $i++) { - $enc_from_name = '"'. - getPref($data_dir, $username, 'full_name' . $i) . - '" <' . - getPref($data_dir, $username, 'email_address' . $i) . '>'; - if ($enc_from_name == $orig_from && $i) { - $identity = $i; + + $identities = array(); + if (count($idents) > 1) { + foreach($idents as $nr=>$data) { + $enc_from_name = '"'.$data['full_name'].'" <'. $data['email_address'].'>'; + if($enc_from_name == $orig_from) { + $identity = $nr; break; } - $identities[] = $enc_from_name; + $identities[] = $enc_from_name; + } + + $identity_match = $orig_header->findAddress($identities); + if ($identity_match) { + $identity = $identity_match; } - $identity_match = $orig_header->findAddress($identities); - if ($identity_match) { - $identity = $identity_match; - } + // we need identiy here fore draft case #845290 + // echo $identity."leer"; } switch ($action) { case ('draft'): $use_signature = FALSE; - $send_to = decodeHeader($orig_header->getAddr_s('to')); - $send_to_cc = decodeHeader($orig_header->getAddr_s('cc')); - $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc')); - $subject = decodeHeader($orig_header->subject); - + $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; + } + } + } + $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; $body_ary = explode("\n", $body); $cnt = count($body_ary) ; $body = ''; @@ -632,10 +726,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')); - $send_to_cc = decodeHeader($orig_header->getAddr_s('cc')); - $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc')); - $subject = decodeHeader($orig_header->subject); + $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); @@ -643,33 +737,38 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se break; case ('forward'): $send_to = ''; - $subject = decodeHeader($orig_header->subject); - 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; + $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); + 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,false,true); + } case ('reply'): - $send_to = $orig_header->reply_to; - if (is_array($send_to) && count($send_to)) { - $send_to = decodeHeader($orig_header->getAddr_s('reply_to')); - } else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */ - $send_to = decodeHeader($orig_header->getAddr_s('reply_to')); - } else { - $send_to = decodeHeader($orig_header->getAddr_s('from')); + // 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'); + } } - $subject = decodeHeader($orig_header->subject); + $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:') { @@ -677,28 +776,31 @@ 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; - $body = getReplyCitation($from->getAddress(false)); - sqUnWordWrap($body); - $cnt = count($rewrap_body); - for ($i=0;$i<$cnt;$i++) { - sqWordWrap($rewrap_body[$i], ($editor_size)); - if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) { + $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; + } + 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 , $orig_header->date) . $body; $composeMessage->reply_rfc822_header = $orig_header; + break; - default: + default: break; } - $compose_messages[$session] = $composeMessage; - sqsession_register($compose_messages, 'compose_messages'); + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages, 'compose_messages'); session_write_close(); sqimap_logout($imapConnection); } @@ -716,42 +818,44 @@ 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 = decodeHeader($message->rfc822_header->subject.'.eml'); - if ($filename == "") { - $filename = "untitled-".$message->entity_id.'.eml'; - } - } else { - $filename = decodeHeader($message->getFilename()); + 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(); + } + break; + default: + if (!$message->mime_header) { /* temporary hack */ + $message->mime_header = $message->header; } - break; - default: - $filename = decodeHeader($message->getFilename()); - break; - } - if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + $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; - if (!$message->mime_header) { /* temporary hack */ - $message->mime_header = $message->header; - } - - $composeMessage->addEntity($message); - + $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, @@ -764,276 +868,284 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap $composeMessage=getAttachments($message->entities[$i], $composeMessage, $passed_id, $entities, $imapConnection); } } -// setPref($data_dir, $username, 'attachments', serialize($attachments)); 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') { + 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', - $full_localfilename); + $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, $draft_id, $delete_draft, + $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]; - - $subject = decodeHeader($subject, false); 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, 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"; + "// -->\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" . - ' '."\n"; + ' '. html_tag( 'td', '', 'right' ) . ''."\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); } - $idents = getPref($data_dir, $username, 'identities', 0); - if ($idents > 1) { - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + /* 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%"' ) . + ' '. + addSelect('identity', $ident_list, $identity, TRUE); + + echo ' ' . "\n" . + ' ' . "\n"; } - echo ' ' . "\n" . - ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . _("To:") . '' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n\n"; + html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . + addInput('send_to', $send_to, 60). '
' . "\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). '
' . "\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).'
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("Subject:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . "\n"; + echo ' '.addInput('subject', $subject, 60). + ' ' . "\n" . + ' ' . "\n\n"; if ($location_of_buttons == 'between') { showComposeButtonRow(); } + /* why this distinction? */ if ($compose_new_win == '1') { echo ' ' . "\n" . ' ' . "\n" . - ' ' . "\n"; + echo '
' . "\n" . + ' ' . "\n" . + ' ' . "\n"; + if ($location_of_buttons == 'bottom') { showComposeButtonRow(); } else { - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + echo ' ' . "\n" . + html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" . + ' ' . "\n" . + '     

' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } /* This code is for attachments */ - if ((bool) ini_get('file_uploads')) { - echo ' ' . "\n" . - ' ' . "\n" . + ' ' . "\n" . ' ' . "\n"; - } // End of file_uploads if-block + } // End of file_uploads if-block /* End of attachment code */ if ($compose_new_win == '1') { echo '
' . - _("From:") . '' . "\n" . - ' ' . "\n" . - '
' . + + echo '
' . "\n" . - '
' . "\n" . - '
' . - _("CC:") . '' . "\n" . - '
' . "\n" . - '
' . - _("BCC:") . '' . "\n" . - '
' . "\n" . - '
' . - _("Subject:") . '' . "\n"; - echo ' ' . "\n" . - '
' . "\n" . - '
' . "\n" . - '
' . "\n" . - ' ' . "\n" . - '     

' . "\n" . - '
' . "\n" . + 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(count($sizes) > 0) { + $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')'; + } else { + $maxsize = ''; + } + echo addHidden('MAX_FILE_SIZE', min( $sizes )); + echo '
' . "\n" . ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . + ' '; - } + echo '' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .''; + } echo ''; @@ -1044,25 +1156,25 @@ function showInputForm ($session, $values=false) { '
' . "\n" . + '
' . "\n" . ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . + html_tag( 'td', '', 'right', '', 'valign="middle"' ) . + _("Attach:") . '' . "\n" . + html_tag( 'td', '', 'left', '', 'valign="middle"' ) . + ' ' . "\n" . '   ' . "\n" . - ' ' . "\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"; + 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[] = '
' . - _("Attach:") . '' . "\n" . - ' ' . "\n" . + '
'. + 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 '
'.$s.'
\n" . '
' . "\n" . '
'."\n"; } echo '' . "\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. */ - echo '\n"; - echo '\n"; - echo '\n"; - echo '
'; + sqgetGlobalVar('QUERY_STRING', $queryString, SQ_SERVER); + 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. */ @@ -1070,7 +1182,6 @@ function showInputForm ($session, $values=false) { echo "to this message. Please see your system administrator for details.\r\n"; } - do_hook('compose_bottom'); echo '' . "\n"; } @@ -1087,22 +1198,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"); } } @@ -1173,22 +1282,19 @@ 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 (function_exists("move_uploaded_file")) { if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) { - return true; - } - } else { - if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) { return true; - } - } + } } $message = $compose_messages[$session]; $type = strtolower($_FILES['attachfile']['type']); $name = $_FILES['attachfile']['name']; $message->initAttachment($type, $name, $full_localfilename); $compose_messages[$session] = $message; + sqsession_register($compose_messages , 'compose_messages'); } function ClearAttachments($composeMessage) { @@ -1203,44 +1309,37 @@ function ClearAttachments($composeMessage) { } } +/* parse values like 8M and 2k into bytes */ +function getByteSize($ini_size) { + if(!$ini_size) { + return FALSE; + } -function getReplyCitation($orig_from) { - global $reply_citation_style, $reply_citation_start, $reply_citation_end; + $ini_size = trim($ini_size); - /* First, return an empty string when no citation style selected. */ - if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { - return ''; - } + // if there's some kind of letter at the end of the string we need to multiply. + if(!is_numeric(substr($ini_size, -1))) { - /* Make sure our final value isn't an empty string. */ - if ($orig_from == '') { - return ''; - } + switch(strtoupper(substr($ini_size, -1))) { + case 'G': + $bytesize = 1073741824; + break; + case 'M': + $bytesize = 1048576; + break; + case 'K': + $bytesize = 1024; + break; + } - /* Otherwise, try to select the desired citation style. */ - switch ($reply_citation_style) { - case 'author_said': - $start = ''; - $end = ' ' . _("said") . ':'; - break; - case 'quote_who': - $start = '<' . _("quote") . ' ' . _("who") . '="'; - $end = '">'; - break; - case 'user-defined': - $start = $reply_citation_start . - ($reply_citation_start == '' ? '' : ' '); - $end = $reply_citation_end; - break; - default: - return ''; + return ($bytesize * (int)substr($ini_size, 0, -1)); } - /* Build and return the citation string. */ - return ($start . $orig_from . $end . "\n"); + return $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. @@ -1249,15 +1348,26 @@ function getReplyCitation($orig_from) { function deliverMessage($composeMessage, $draft=false) { global $send_to, $send_to_cc, $send_to_bcc, $mailprio, $subject, $body, - $username, $popuser, $usernamedata, $identity, $data_dir, - $request_mdn, $request_dr, $default_charset, $color, $useSendmail, - $domain, $action; + $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 ??? */ + /* 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; $abook = addressbook_init(false, true); - $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain, array(&$abook,'lookup')); $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain, array(&$abook,'lookup')); $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain, array(&$abook,'lookup')); @@ -1266,7 +1376,7 @@ function deliverMessage($composeMessage, $draft=false) { $special_encoding=''; if (strtolower($default_charset) == 'iso-2022-jp') { if (mb_detect_encoding($body) == 'ASCII') { - $special_encoding = '8bit'; + $special_encoding = '8bit'; } else { $body = mb_convert_encoding($body, 'JIS'); $special_encoding = '7bit'; @@ -1282,24 +1392,22 @@ function deliverMessage($composeMessage, $draft=false) { $popuser = $username; } $reply_to = ''; - if (isset($identity) && $identity != 'default') { - $from_mail = getPref($data_dir, $username,'email_address' . $identity); - $full_name = getPref($data_dir, $username,'full_name' . $identity); - $reply_to = getPref($data_dir, $username,'reply_to' . $identity); - } else { - $from_mail = getPref($data_dir, $username, 'email_address'); - $full_name = getPref($data_dir, $username, 'full_name'); - $reply_to = getPref($data_dir, $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"; - $full_name = ''; } $rfc822_header->from = $rfc822_header->parseAddress($from_mail,true); if ($full_name) { $from = $rfc822_header->from[0]; - if (!$from->host) $from->host = $domain; - $from_addr = '"'.$full_name .'" <'.$from->mailbox.'@'.$from->host.'>'; + if (!$from->host) $from->host = $domain; + $full_name_encoded = encodeHeader($full_name); + if ($full_name_encoded != $full_name) { + $from_addr = $full_name_encoded .' <'.$from->mailbox.'@'.$from->host.'>'; + } else { + $from_addr = '"'.$full_name .'" <'.$from->mailbox.'@'.$from->host.'>'; + } $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true); } if ($reply_to) { @@ -1311,54 +1419,59 @@ 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)) { $message_body = new Message(); - $message_body->body_part = $composeMessage->body_part; - $composeMessage->body_part = ''; - $mime_header = new MessageHeader; - $mime_header->type0 = 'text'; - $mime_header->type1 = 'plain'; - if ($special_encoding) { - $mime_header->encoding = $special_encoding; - } else { - $mime_header->encoding = 'us-ascii'; - } - if ($default_charset) { - $mime_header->parameters['charset'] = $default_charset; - } - $message_body->mime_header = $mime_header; + $message_body->body_part = $composeMessage->body_part; + $composeMessage->body_part = ''; + $mime_header = new MessageHeader; + $mime_header->type0 = 'text'; + $mime_header->type1 = 'plain'; + if ($special_encoding) { + $mime_header->encoding = $special_encoding; + } else { + $mime_header->encoding = '8bit'; + } + if ($default_charset) { + $mime_header->parameters['charset'] = $default_charset; + } + $message_body->mime_header = $mime_header; array_unshift($composeMessage->entities, $message_body); - $content_type = new ContentType('multipart/mixed'); + $content_type = new ContentType('multipart/mixed'); } else { - $content_type = new ContentType('text/plain'); + $content_type = new ContentType('text/plain'); + if ($special_encoding) { + $rfc822_header->encoding = $special_encoding; + } else { + $rfc822_header->encoding = '8bit'; + } + if ($default_charset) { + $content_type->properties['charset']=$default_charset; } - if ($default_charset) { - $content_type->properties['charset']=$default_charset; } - + $rfc822_header->content_type = $content_type; $composeMessage->rfc822_header = $rfc822_header; - 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); - } + /* Here you can modify the message structure just before we hand + it over to deliver */ + $hookReturn = do_hook('compose_send', $composeMessage); + /* Get any changes made by plugins to $composeMessage. */ + if ( is_object($hookReturn[1]) ) { + $composeMessage = $hookReturn[1]; + } - $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; - $stream = $deliver->initStream($composeMessage,$domain,0, - $smtpServerAddress, $smtpPort, $user, $pass, $authPop); + 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; + + $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) { require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); global $sendmail_path; @@ -1371,47 +1484,77 @@ function deliverMessage($composeMessage, $draft=false) { $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 = 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; + 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.'; - 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; if ($stream) { - $length = $deliver->mail($composeMessage, $stream); - $succes = $deliver->finalizeStream($stream); + $length = $deliver->mail($composeMessage, $stream); + $succes = $deliver->finalizeStream($stream); } if (!$succes) { - $msg = $deliver->dlv_msg . '
Server replied: '.$deliver->dlv_ret_nr; + $msg = $deliver->dlv_msg . '
' . + _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + $deliver->dlv_server_msg; plain_error_message($msg, $color); } else { unset ($deliver); - $imap_stream = sqimap_login($username, $key, $imapServerAddress, - $imapPort, 0); - if (sqimap_mailbox_exists ($imap_stream, $sent_folder)) { - sqimap_append ($imap_stream, $sent_folder, $length); - require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); - $imap_deliver = new Deliver_IMAP(); - $imap_deliver->mail($composeMessage, $imap_stream); - sqimap_append_done ($imap_stream, $sent_folder); - unset ($imap_deliver); - } - global $passed_id, $mailbox, $action; - ClearAttachments($composeMessage); - if ($action == 'reply' || $action == 'reply_all') { - sqimap_mailbox_select ($imap_stream, $mailbox); - sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', true); - } - sqimap_logout($imap_stream); + $move_to_sent = getPref($data_dir,$username,'move_to_sent'); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + + /* Move to sent code */ + if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) { + $svr_allow_sent = true; + } else { + $svr_allow_sent = false; + } + + if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none')) + && sqimap_mailbox_exists( $imap_stream, $sent_folder)) { + $fld_sent = true; + } else { + $fld_sent = false; + } + + if ((isset($move_to_sent) && ($move_to_sent != 0)) || (!isset($move_to_sent))) { + $lcl_allow_sent = true; + } else { + $lcl_allow_sent = 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(); + $imap_deliver->mail($composeMessage, $imap_stream); + sqimap_append_done ($imap_stream, $sent_folder); + unset ($imap_deliver); + } + global $passed_id, $mailbox, $action; + ClearAttachments($composeMessage); + if ($action == 'reply' || $action == 'reply_all') { + sqimap_mailbox_select ($imap_stream, $mailbox); + sqimap_messages_flag ($imap_stream, $passed_id, $passed_id, 'Answered', false); + } + sqimap_logout($imap_stream); } return $succes; }