X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=89f6d12da201c075eaa2f02ae8c11e641ab82023;hp=762677cb83ddf95f226b7040743198f0319ddbb5;hb=48027e89566ad3b27266166bc8f11cfbb5670d5b;hpb=5a3071fc5a1172bc3e86c646f649f1a04b9c0d2b diff --git a/src/compose.php b/src/compose.php index 762677cb..89f6d12d 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. @@ -14,10 +14,14 @@ * - Send mail * - Save As Draft * - * $Id$ + * @version $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -31,6 +35,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 +51,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 +77,7 @@ sqgetGlobalVar('draft_id',$draft_id); sqgetGlobalVar('ent_num',$ent_num); sqgetGlobalVar('saved_draft',$saved_draft); sqgetGlobalVar('delete_draft',$delete_draft); -sqgetGlobalVar('startmessage',$startMessage); +sqgetGlobalVar('startMessage',$startMessage); /** POST VARS */ sqgetGlobalVar('sigappend', $sigappend, SQ_POST); @@ -90,6 +94,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) */ @@ -128,6 +143,11 @@ function replyAllString($header) { $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; @@ -138,9 +158,9 @@ function replyAllString($header) { 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,6 +182,10 @@ 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 . ($reply_citation_start == '' ? '' : ' '); @@ -188,11 +212,11 @@ function getforwardHeader($orig_header) { 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,7 +224,7 @@ 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 = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true); $cc = str_replace(' ',' ',$cc); $bodyTop .= $display[_("Cc")] .$cc . "\n"; } @@ -300,7 +324,7 @@ if ($draft) { /* 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"); + "&message=$delete_draft&startMessage=1&saved_draft=yes"); exit(); } else { @@ -309,7 +333,7 @@ if ($draft) { exit(); } else { - Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort". + Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . "&startMessage=1¬e=".urlencode($draft_message)); exit(); } @@ -332,39 +356,25 @@ if ($send) { 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. + /** + * If the browser doesn't support "VIRTUAL" as the wrap type. + * then the line length will be longer than $editor_size + * almost all browsers support VIRTUAL, so remove the line by line checking + * If this causes a problem, call sqBodyWrap */ - $body = explode("\n", $body); - $newBody = ''; - foreach ($body as $line) { - if( $line <> '-- ' ) { - $line = rtrim($line); - } - if (strlen($line) <= $editor_size + 1) { - $newBody .= $line . "\n"; - } else { - sqWordWrap($line, $editor_size); - $newBody .= $line . "\n"; - - } - - } - $body = $newBody; + // sqBodyWrap($body, $editor_size); $composeMessage=$compose_messages[$session]; @@ -376,7 +386,7 @@ if ($send) { 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"); + "&message=$delete_draft&startMessage=1&mail_sent=yes"); exit(); } if ($compose_new_win == '1') { @@ -384,7 +394,7 @@ if ($send) { Header("Location: $location/compose.php?mail_sent=yes"); } else { - Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". + Header("Location: $location/right_main.php?mailbox=$urlMailbox". "&startMessage=$startMessage&mail_sent=yes"); } } else { @@ -541,14 +551,30 @@ 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; + $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; @@ -591,20 +617,36 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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); 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); } } + + 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); + } + $body .= $bodypart; } if ($default_use_priority) { @@ -619,6 +661,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,50 +693,54 @@ 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); -// /* 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"; + $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); + $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,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); - sqUnWordWrap($body); + //rewrap the body to clean up quotations and line lengths + sqBodyWrap($body, $editor_size); 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); + // 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; @@ -698,7 +749,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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); + $send_to_cc = decodeHeader($send_to_cc,false,false,true); } case ('reply'): // skip this if send_to was already set right above here @@ -712,8 +763,8 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $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:') { @@ -722,22 +773,24 @@ 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); // 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; + break; } - sqWordWrap($line, ($editor_size)); if (preg_match("/^(>+)/", $line, $matches)) { $gt = $matches[1]; - $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($line)) ."\n"; + $body .= $body_quote . str_replace("\n", "\n$body_quote$gt ", rtrim($line)) ."\n"; } else { - $body .= '> ' . str_replace("\n", "\n> ", rtrim($line)) . "\n"; + $body .= $body_quote . (!empty($body_quote) ? ' ' : '') . str_replace("\n", "\n$body_quote" . (!empty($body_quote) ? ' ' : ''), rtrim($line)) . "\n"; } } - $body = getReplyCitation($from) . $body; + + //rewrap the body to clean up quotations and line lengths + $body = sqBodyWrap ($body, $editor_size); + + $body = getReplyCitation($from , $orig_header->date) . $body; $composeMessage->reply_rfc822_header = $orig_header; break; @@ -769,10 +822,11 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap 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(); } @@ -784,10 +838,10 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap $filename = $message->getFilename(); break; } - $filename = decodeHeader($filename); + $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); + 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"; @@ -797,7 +851,7 @@ 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 */ @@ -817,17 +871,17 @@ 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; + global $attachments, $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); + TRUE); } else { $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') { @@ -842,7 +896,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $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; @@ -851,7 +905,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, 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, + $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, @@ -860,7 +914,6 @@ function showInputForm ($session, $values=false) { $username, $compose_messages, $composesession, $default_charset; $composeMessage = $compose_messages[$session]; - if ($values) { $send_to = $values['send_to']; $send_to_cc = $values['send_to_cc']; @@ -870,20 +923,20 @@ function showInputForm ($session, $values=false) { $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"; + "// -->\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"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); @@ -925,54 +978,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" . + _("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" . + _("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" . + _("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" . + _("Subject") . ':' . "\n" . html_tag( 'td', '', 'left', $color[4] ) . "\n"; - echo ' ' . "\n" . + echo ' '.addInput('subject', $subject, 60). ' ' . "\n" . ' ' . "\n\n"; @@ -982,16 +1029,16 @@ function showInputForm ($session, $values=false) { /* why this distinction? */ if ($compose_new_win == '1') { - echo ' ' . "\n" . - ' ' . "\n" . @@ -1054,7 +1101,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 ''; } echo '
' . "\n" . - '
' . "\n" . '
' . "\n" . ' ' . "\n" . '   ' . "\n" . + ' value="' . _("Add") .'" />' . "\n" . $maxsize . ' ' . "\n" . ' ' . "\n"; @@ -1085,8 +1132,9 @@ function showInputForm ($session, $values=false) { $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"; } @@ -1097,35 +1145,34 @@ function showInputForm ($session, $values=false) { echo '
\n" . + _("Delete selected attachments") . "\" />\n" . '
' . "\n" . ' ' . "\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"; } - 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. */ @@ -1134,7 +1181,7 @@ function showInputForm ($session, $values=false) { } do_hook('compose_bottom'); - echo '' . "\n"; + echo '' . "\n"; } @@ -1144,58 +1191,56 @@ function showComposeButtonRow() { $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"; + "\\\" onclick=\\\"javascript:open_abook();\\\" />\");". + " // -->\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) { @@ -1306,15 +1351,6 @@ function deliverMessage($composeMessage, $draft=false) { $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 +1359,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') { @@ -1399,7 +1436,7 @@ function deliverMessage($composeMessage, $draft=false) { } if ($default_charset) { $content_type->properties['charset']=$default_charset; - } + } } $rfc822_header->content_type = $content_type; @@ -1418,16 +1455,8 @@ function deliverMessage($composeMessage, $draft=false) { $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) { @@ -1451,7 +1480,7 @@ function deliverMessage($composeMessage, $draft=false) { 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; } @@ -1462,7 +1491,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); @@ -1492,6 +1521,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(); @@ -1503,11 +1539,11 @@ 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); } return $succes; } -?> +?> \ No newline at end of file