X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=b344b9314081e27d50305c38dc713608bfb47925;hb=7eb64c3e40281a191591e7ecd9c338039b8144cc;hp=88ab70776a040a69bb62f2adb68e3eb1a8297641;hpb=1c0448203d530bb106f879620cdea54d0ec97a01;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index 88ab7077..b344b931 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('action',$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); /** POST VARS */ sqgetGlobalVar('sigappend', $sigappend, SQ_POST); @@ -84,12 +88,23 @@ sqgetGlobalVar('do_delete', $do_delete, SQ_POST); sqgetGlobalVar('delete', $delete, SQ_POST); sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { - $html_addr_search_done = 'Use Addresses'; + $html_addr_search_done = 'Use Addresses'; } /** GET VARS */ sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET); +/** 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) */ @@ -98,49 +113,53 @@ $idents = get_identities(); /* --------------------- Specific Functions ------------------------------ */ function replyAllString($header) { - global $include_self_reply_all, $idents; - $excl_ar = array(); - /** - * 1) Remove the addresses we'll be sending the message 'to' - */ - $url_replytoall_avoid_addrs = ''; - if (isset($header->replyto)) { - $excl_ar = $header->getAddr_a('replyto'); - } - /** - * 2) Remove our identities from the CC list (they still can be in the - * TO list) only if $include_self_reply_all is turned off - */ - if (!$include_self_reply_all) { - foreach($idents as $id) { - $excl_ar[strtolower(trim($id['email_address']))] = ''; + global $include_self_reply_all, $idents; + $excl_ar = array(); + /** + * 1) Remove the addresses we'll be sending the message 'to' + */ + if (isset($header->replyto)) { + $excl_ar = $header->getAddr_a('replyto'); + } + /** + * 2) Remove our identities from the CC list (they still can be in the + * TO list) only if $include_self_reply_all is turned off + */ + if (!$include_self_reply_all) { + foreach($idents as $id) { + $excl_ar[strtolower(trim($id['email_address']))] = ''; + } + } + + /** + * 3) get the addresses. + */ + $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar); + + /** + * 4) generate the string. + */ + $url_replytoallcc = ''; + foreach( $url_replytoall_ar as $email => $personal) { + if ($personal) { + // 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; } - } - - /** - * 3) get the addresses. - */ - $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar); - - /** - * 4) generate the string. - */ - $url_replytoallcc = ''; - foreach( $url_replytoall_ar as $email => $personal) { - if ($personal) { - $url_replytoallcc .= ", $personal <$email>"; - } else { - $url_replytoallcc .= ', '. $email; - } - } - $url_replytoallcc = substr($url_replytoallcc,2); - - return $url_replytoallcc; + } + $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')) { @@ -154,21 +173,25 @@ function getReplyCitation($orig_from) { /* 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 ''; + 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. */ @@ -178,35 +201,35 @@ function getReplyCitation($orig_from) { function getforwardHeader($orig_header) { global $editor_size; - $display = array( _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), - _("Cc") => strlen(_("Cc")) ); - $maxsize = max($display); - $indent = str_pad('',$maxsize+2); - foreach($display as $key => $val) { - $display[$key] = $key .': '. str_pad('', $maxsize - $val); - } - $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); - $from = str_replace(' ',' ',$from); - $to = decodeHeader($orig_header->getAddr_s('to',"\n$indent"),false,false); - $to = str_replace(' ',' ',$to); - $subject = decodeHeader($orig_header->subject,false,false); - $subject = str_replace(' ',' ',$subject); - $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) . - "\n". $display[_("Subject")] . $subject . "\n" . - $display[_("From")] . $from . "\n" . - $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . - $display[_("To")] . $to . "\n"; - if ($orig_header->cc != array() && $orig_header->cc !='') { - $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false); - $cc = str_replace(' ',' ',$cc); - $bodyTop .= $display[_("Cc")] .$cc . "\n"; - } - $bodyTop .= str_pad('', $editor_size -2 , '-') . - "\n\n"; - return $bodyTop; + $display = array( _("Subject") => strlen(_("Subject")), + _("From") => strlen(_("From")), + _("Date") => strlen(_("Date")), + _("To") => strlen(_("To")), + _("Cc") => strlen(_("Cc")) ); + $maxsize = max($display); + $indent = str_pad('',$maxsize+2); + foreach($display as $key => $val) { + $display[$key] = $key .': '. str_pad('', $maxsize - $val); + } + $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false,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")] . $subject . "\n" . + $display[_("From")] . $from . "\n" . + $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . + $display[_("To")] . $to . "\n"; + if ($orig_header->cc != array() && $orig_header->cc !='') { + $cc = decodeHeader($orig_header->getAddr_s('cc',"\n$indent"),false,false,true); + $cc = str_replace(' ',' ',$cc); + $bodyTop .= $display[_("Cc")] .$cc . "\n"; + } + $bodyTop .= str_pad('', $editor_size -2 , '-') . + "\n\n"; + return $bodyTop; } /* ----------------------------------------------------------------------- */ @@ -266,18 +289,18 @@ if (!isset($session) || (isset($newmessage) && $newmessage)) { sqsession_register($composesession,'composesession'); } if (!isset($compose_messages)) { - $compose_messages = array(); + $compose_messages = array(); } if (!isset($compose_messages[$session]) || ($compose_messages[$session] == NULL)) { -/* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */ - $composeMessage = new Message(); - $rfc822_header = new Rfc822Header(); - $composeMessage->rfc822_header = $rfc822_header; - $composeMessage->reply_rfc822_header = ''; - $compose_messages[$session] = $composeMessage; - sqsession_register($compose_messages,'compose_messages'); + /* if (!array_key_exists($session, $compose_messages)) { /* We can only do this in PHP >= 4.1 */ + $composeMessage = new Message(); + $rfc822_header = new Rfc822Header(); + $composeMessage->rfc822_header = $rfc822_header; + $composeMessage->reply_rfc822_header = ''; + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages,'compose_messages'); } else { - $composeMessage=$compose_messages[$session]; + $composeMessage=$compose_messages[$session]; } if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) { @@ -300,7 +323,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,8 +332,8 @@ if ($draft) { exit(); } else { - Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort". - "&startMessage=1¬e=".urlencode($draft_message)); + Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) . + "&startMessage=1¬e=".urlencode($draft_message)); exit(); } } @@ -319,41 +342,39 @@ if ($draft) { if ($send) { if (isset($_FILES['attachfile']) && - $_FILES['attachfile']['tmp_name'] && - $_FILES['attachfile']['tmp_name'] != 'none') { + $_FILES['attachfile']['tmp_name'] && + $_FILES['attachfile']['tmp_name'] != 'none') { $AttachFailure = saveAttachedFiles($session); } if (checkInput(false) && !isset($AttachFailure)) { - if ($mailbox == "All Folders") { - /* We entered compose via the search results page */ - $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */ - } + if ($mailbox == "All Folders") { + /* We entered compose via the search results page */ + $mailbox="INBOX"; /* Send 'em to INBOX, that's safe enough */ + } $urlMailbox = urlencode (trim($mailbox)); if (! isset($passed_id)) { $passed_id = 0; } - /* + /** * Set $default_charset to correspond with the user's selection * of language interface. */ set_my_charset(); - /* + /** * This is to change all newlines to \n * We'll change them to \r\n later (in the sendMessage function) */ $body = str_replace("\r\n", "\n", $body); $body = str_replace("\r", "\n", $body); - /* + /** * Rewrap $body so that no line is bigger than $editor_size - * This should only really kick in the sqWordWrap function - * if the browser doesn't support "VIRTUAL" as the wrap type. */ $body = explode("\n", $body); $newBody = ''; foreach ($body as $line) { if( $line <> '-- ' ) { - $line = rtrim($line); + $line = rtrim($line); } if (strlen($line) <= $editor_size + 1) { $newBody .= $line . "\n"; @@ -373,10 +394,10 @@ 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"); + "&message=$delete_draft&startMessage=1&mail_sent=yes"); exit(); } if ($compose_new_win == '1') { @@ -384,8 +405,8 @@ if ($send) { Header("Location: $location/compose.php?mail_sent=yes"); } else { - Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=1"); + Header("Location: $location/right_main.php?mailbox=$urlMailbox". + "&startMessage=$startMessage&mail_sent=yes"); } } else { if ($compose_new_win == '1') { @@ -395,20 +416,20 @@ if ($send) { displayPageHeader($color, $mailbox); } if (isset($AttachFailure)) { - plain_error_message(_("Could not move/copy file. File not attached"), - $color); + plain_error_message(_("Could not move/copy file. File not attached"), + $color); } checkInput(true); showInputForm($session); /* sqimap_logout($imapConnection); */ } } elseif (isset($html_addr_search_done)) { - if ($compose_new_win == '1') { - compose_Header($color, $mailbox); - } - else { - displayPageHeader($color, $mailbox); - } + if ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } + else { + displayPageHeader($color, $mailbox); + } if (isset($send_to_search) && is_array($send_to_search)) { foreach ($send_to_search as $k => $v) { @@ -435,8 +456,8 @@ if ($send) { showInputForm($session); } elseif (isset($html_addr_search)) { if (isset($_FILES['attachfile']) && - $_FILES['attachfile']['tmp_name'] && - $_FILES['attachfile']['tmp_name'] != 'none') { + $_FILES['attachfile']['tmp_name'] && + $_FILES['attachfile']['tmp_name'] != 'none') { if(saveAttachedFiles($session)) { plain_error_message(_("Could not move/copy file. File not attached"), $color); } @@ -450,12 +471,11 @@ if ($send) { if (saveAttachedFiles($session)) { plain_error_message(_("Could not move/copy file. File not attached"), $color); } - if ($compose_new_win == '1') { - compose_Header($color, $mailbox); - } - else { - displayPageHeader($color, $mailbox); - } + if ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } else { + displayPageHeader($color, $mailbox); + } showInputForm($session); } elseif (isset($sigappend)) { @@ -463,18 +483,17 @@ elseif (isset($sigappend)) { $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature; if ($compose_new_win == '1') { - compose_Header($color, $mailbox); + compose_Header($color, $mailbox); } else { displayPageHeader($color, $mailbox); } showInputForm($session); } elseif (isset($do_delete)) { - if ($compose_new_win == '1') { - compose_Header($color, $mailbox); - } - else { - displayPageHeader($color, $mailbox); - } + if ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } else { + displayPageHeader($color, $mailbox); + } if (isset($delete) && is_array($delete)) { $composeMessage = $compose_messages[$session]; @@ -499,9 +518,9 @@ elseif (isset($sigappend)) { */ if ($compose_new_win == '1') { - compose_Header($color, $mailbox); + compose_Header($color, $mailbox); } else { - displayPageHeader($color, $mailbox); + displayPageHeader($color, $mailbox); } $newmail = true; @@ -523,16 +542,16 @@ elseif (isset($sigappend)) { /* in case the origin is not read_body.php */ if (isset($send_to)) { - $values['send_to'] = $send_to; + $values['send_to'] = $send_to; } if (isset($send_to_cc)) { - $values['send_to_cc'] = $send_to_cc; + $values['send_to_cc'] = $send_to_cc; } if (isset($send_to_bcc)) { - $values['send_to_bcc'] = $send_to_bcc; + $values['send_to_bcc'] = $send_to_bcc; } if (isset($subject)) { - $values['subject'] = $subject; + $values['subject'] = $subject; } showInputForm($session, $values); } @@ -541,21 +560,37 @@ exit(); /**************** Only function definitions go below *************/ +function getforwardSubject($subject) +{ + if ((substr(strtolower($subject), 0, 4) != 'fwd:') && + (substr(strtolower($subject), 0, 5) != '[fwd:') && + (substr(strtolower($subject), 0, 6) != '[ fwd:')) { + $subject = '[Fwd: ' . $subject . ']'; + } + return $subject; +} /* This function is used when not sending or adding attachments */ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') { global $editor_size, $default_use_priority, $body, $idents, - $use_signature, $composesession, $data_dir, $username, - $username, $key, $imapServerAddress, $imapPort, $compose_messages, - $composeMessage; - global $languages, $squirrelmail_language; + $use_signature, $data_dir, $username, + $username, $key, $imapServerAddress, $imapPort, $compose_messages, + $composeMessage, $body_quote; + global $languages, $squirrelmail_language, $default_charset; + + /* + * Set $default_charset to correspond with the user's selection + * of language interface. $default_charset global is not correct, + * if message is composed in new window. + */ + set_my_charset(); $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; if ($passed_id) { $imapConnection = sqimap_login($username, $key, $imapServerAddress, - $imapPort, 0); + $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); @@ -565,15 +600,15 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se /* redefine the messsage in case of message/rfc822 */ $message = $message->getEntity($passed_ent_id); /* message is an entity which contains the envelope and type0=message - * and type1=rfc822. The actual entities are childs from - * $message->entities[0]. That's where the encoding and is located - */ + * and type1=rfc822. The actual entities are childs from + * $message->entities[0]. That's where the encoding and is located + */ $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain')); + (array(), $alt_order = array('text/plain')); if (!count($entities)) { $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain','html/plain')); + (array(), $alt_order = array('text/plain','html/plain')); } $orig_header = $message->rfc822_header; /* here is the envelope located */ /* redefine the message for picking up the attachments */ @@ -587,24 +622,39 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $orig_header = $message->rfc822_header; } - $encoding = $message->header->encoding; $type0 = $message->type0; $type1 = $message->type1; foreach ($entities as $ent) { + $msg = $message->getEntity($ent); + $type0 = $msg->type0; + $type1 = $msg->type1; $unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent); $body_part_entity = $message->getEntity($ent); $bodypart = decodeBody($unencoded_bodypart, - $body_part_entity->header->encoding); + $body_part_entity->header->encoding); if ($type1 == 'html') { - $bodypart = str_replace(array(' ','>','<'),array(' ','<','>'),$bodypart); + $bodypart = str_replace("\n", ' ', $bodypart); + $bodypart = preg_replace(array('/<\/?p>/i','/