X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=595001939758b5bb03399c981d9e3066082543f8;hp=fbb238801c777ccf70752128a1b5ed373bcf9d8d;hb=98d42122fd9b0346374c5b1468e1c0cbb3767b24;hpb=83be314a29726be91884b222e4c136f9abade9de diff --git a/src/compose.php b/src/compose.php index fbb23880..59500193 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-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code sends a mail. @@ -17,19 +17,84 @@ * $Id$ */ -require_once('../src/validate.php'); -require_once('../functions/imap.php'); -require_once('../functions/date.php'); -require_once('../functions/mime.php'); -require_once('../functions/smtp.php'); -require_once('../functions/plugin.php'); -require_once('../functions/display_messages.php'); +/* 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'); +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'); + +/* --------------------- Get globals ------------------------------------- */ +/** 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('action',$action); +sqgetGlobalVar('session',$session); +sqgetGlobalVar('mailbox',$mailbox); +sqgetGlobalVar('identity',$identity); +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); + + +/** 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'; +} + +/** GET VARS */ +sqgetGlobalVar('attachedmessages', $attachedmessages, SQ_GET); + +/* Location (For HTTP 1.1 Header("Location: ...") redirects) */ +$location = get_location(); /* --------------------- Specific Functions ------------------------------ */ function replyAllString($header) { global $include_self_reply_all, $username, $data_dir; - $excl_arr = array(); + $excl_ar = array(); /** * 1) Remove the addresses we'll be sending the message 'to' */ @@ -42,16 +107,16 @@ function replyAllString($header) { * TO list) only if $include_self_reply_all is turned off */ if (!$include_self_reply_all) { - $email_address = trim(getPref($data_dir, $username, 'email_address')); + $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($cur_email_address); - $excl_ar[$cur_email_address] = ''; + $cur_email_address = strtolower(trim($cur_email_address)); + $excl_ar[$cur_email_address] = ''; } } } @@ -67,40 +132,84 @@ function replyAllString($header) { $url_replytoallcc = ''; foreach( $url_replytoall_ar as $email => $personal) { if ($personal) { - $url_replytoallcc .= ", \"$personal\" <$email>"; + $url_replytoallcc .= ", $personal <$email>"; } else { - $url_replytoallcc .= ', '. $email; + $url_replytoallcc .= ', '. $email; } } $url_replytoallcc = substr($url_replytoallcc,2); + return $url_replytoallcc; } +function getReplyCitation($orig_from) { + global $reply_citation_style, $reply_citation_start, $reply_citation_end; + $orig_from = decodeHeader($orig_from->getAddress(false),false,false); +// $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); + /* 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 '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")), - _("Cc") => strlen(_("Cc")) - ); + $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); - } - $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH); - $bodyTop .= "\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"; + } + $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 , '-'); - $bodyTop .= "\n"; + $bodyTop .= str_pad('', $editor_size -2 , '-') . + "\n\n"; return $bodyTop; } /* ----------------------------------------------------------------------- */ @@ -109,106 +218,120 @@ function getforwardHeader($orig_header) { * If the session is expired during a post this restores the compose session * vars. */ -//$session_expired = false; -if (session_is_registered('session_expired_post')) { - global $session_expired_post, $session_expired; - /* - * extra check for username so we don't display previous post data from - * another user during this session. - */ - if ($session_expired_post['username'] != $username) { - session_unregister('session_expired_post'); - session_unregister('session_expired'); - } else { - foreach ($session_expired_post as $postvar => $val) { - if (isset($val)) { - $$postvar = $val; - } else { - $$postvar = ''; - } - } - if (isset($send)) { - unset($send); - } - $session_expired = true; - } - session_unregister('session_expired_post'); - session_unregister('session_expired'); - if (!isset($mailbox)) { - $mailbox = ''; - } - if ($compose_new_win == '1') { - compose_Header($color, $mailbox); - } else { - displayPageHeader($color, $mailbox); - } - showInputForm($session, false); - exit(); -} - -if (!isset($attachments)) { - $attachments = array(); - session_register('attachments'); +if (sqsession_is_registered('session_expired_post')) { + sqgetGlobalVar('session_expired_post', $session_expired_post, SQ_SESSION); + /* + * extra check for username so we don't display previous post data from + * another user during this session. + */ + if ($session_expired_post['username'] != $username) { + unset($session_expired_post); + sqsession_unregister('session_expired_post'); + session_write_close(); + } else { + foreach ($session_expired_post as $postvar => $val) { + if (isset($val)) { + $$postvar = $val; + } else { + $$postvar = ''; + } + } + $compose_messages = unserialize(urldecode($restoremessages)); + sqsession_register($compose_messages,'compose_messages'); + sqsession_register($composesession,'composesession'); + if (isset($send)) { + unset($send); + } + $session_expired = true; + } + unset($session_expired_post); + sqsession_unregister('session_expired_post'); + session_write_close(); + if (!isset($mailbox)) { + $mailbox = ''; + } + if ($compose_new_win == '1') { + compose_Header($color, $mailbox); + } else { + displayPageHeader($color, $mailbox); + } + showInputForm($session, false); + exit(); } - if (!isset($composesession)) { $composesession = 0; - session_register('composesession'); + sqsession_register(0,'composesession'); } if (!isset($session) || (isset($newmessage) && $newmessage)) { + sqsession_unregister('composesession'); $session = "$composesession" +1; $composesession = $session; - session_register('composesession'); + sqsession_register($composesession,'composesession'); } +if (!isset($compose_messages)) { + $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'); +} else { + $composeMessage=$compose_messages[$session]; +} if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) { $mailbox = 'INBOX'; } -if (isset($draft)) { - include_once ('../src/draft_actions.php'); - if (! isset($passed_id)) { - $passed_id = 0; - } - if (! isset($MDN)) { - $MDN = 'False'; - } - if (! isset($mailprio)) { - $mailprio = ''; - } - if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $passed_id, $mailprio, $session)) { +if ($draft) { + /* + * Set $default_charset to correspond with the user's selection + * of language interface. + */ + set_my_charset(); + $composeMessage=$compose_messages[$session]; + if (! deliverMessage($composeMessage, true)) { showInputForm($session); exit(); } else { + unset($compose_messages[$session]); $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"); - exit(); + Header("Location: $location/compose.php?saved_draft=yes&session=$composesession"); + exit(); } else { - Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". - "&startMessage=1¬e=".urlencode($draft_message)); - exit(); + Header("Location: $location/right_main.php?mailbox=$draft_folder&sort=$sort". + "&startMessage=1¬e=".urlencode($draft_message)); + exit(); } } } } -if (isset($send)) { - if (isset($HTTP_POST_FILES['attachfile']) && - $HTTP_POST_FILES['attachfile']['tmp_name'] && - $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') { +if ($send) { + if (isset($_FILES['attachfile']) && + $_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 */ + } $urlMailbox = urlencode (trim($mailbox)); if (! isset($passed_id)) { $passed_id = 0; @@ -218,7 +341,6 @@ if (isset($send)) { * 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) @@ -242,41 +364,34 @@ if (isset($send)) { } else { sqWordWrap($line, $editor_size); $newBody .= $line . "\n"; + } + } $body = $newBody; + + $composeMessage=$compose_messages[$session]; - do_hook('compose_send'); - - $MDN = False; // we are not sending a mdn response - if (! isset($mailprio)) { - $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, - $subject, $body, $passed_id, $MDN, '', $session); - } else { - $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, - $subject, $body, $passed_id, $MDN, $mailprio, $session); - } + $Result = deliverMessage($composeMessage); if (! $Result) { showInputForm($session); exit(); } + 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". + Header("Location: $location/right_main.php?mailbox=$urlMailbox&sort=$sort". "&startMessage=1"); } } else { - /* - *$imapConnection = sqimap_login($username, $key, $imapServerAddress, - * $imapPort, 0); - */ if ($compose_new_win == '1') { compose_Header($color, $mailbox); } @@ -323,10 +438,10 @@ if (isset($send)) { } showInputForm($session); } elseif (isset($html_addr_search)) { - if (isset($HTTP_POST_FILES['attachfile']) && - $HTTP_POST_FILES['attachfile']['tmp_name'] && - $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') { - if (saveAttachedFiles($session)) { + if (isset($_FILES['attachfile']) && + $_FILES['attachfile']['tmp_name'] && + $_FILES['attachfile']['tmp_name'] != 'none') { + if(saveAttachedFiles($session)) { plain_error_message(_("Could not move/copy file. File not attached"), $color); } } @@ -372,17 +487,21 @@ elseif (isset($sigappend)) { displayPageHeader($color, $mailbox); } - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (isset($delete) && is_array($delete)) { + $composeMessage = $compose_messages[$session]; foreach($delete as $index) { - $attached_file = $hashed_attachment_dir . '/' - . $attachments[$index]['localfilename']; - unlink ($attached_file); - unset ($attachments[$index]); + $attached_file = $composeMessage->entities[$index]->att_local_name; + unlink ($attached_file); + unset ($composeMessage->entities[$index]); + } + $new_entities = array(); + foreach ($composeMessage->entities as $entity) { + $new_entities[] = $entity; } - setPref($data_dir, $username, 'attachments', serialize($attachments)); + $composeMessage->entities = $new_entities; + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages, 'compose_messages'); } - showInputForm($session); } else { /* @@ -398,10 +517,18 @@ elseif (isset($sigappend)) { $newmail = true; - if (!isset($passed_ent_id)) $passed_ent_id = ''; - if (!isset($passed_id)) $passed_id = ''; - if (!isset($mailbox)) $mailbox = ''; - if (!isset($action)) $action = ''; + if (!isset($passed_ent_id)) { + $passed_ent_id = ''; + } + if (!isset($passed_id)) { + $passed_id = ''; + } + if (!isset($mailbox)) { + $mailbox = ''; + } + if (!isset($action)) { + $action = ''; + } $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session); @@ -415,6 +542,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); } @@ -427,65 +557,76 @@ exit(); function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') { global $editor_size, $default_use_priority, $body, $use_signature, $composesession, $data_dir, $username, - $username, $key, $imapServerAddress, $imapPort; + $username, $key, $imapServerAddress, $imapPort, $compose_messages, + $composeMessage; + global $languages, $squirrelmail_language; $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); - $body = ''; - if ($passed_ent_id) { - /* 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 - */ - - $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain')); - if (!count($entities)) { - $entities = $message->entities[0]->findDisplayEntity - (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 */ - $message = $message->entities[0]; - - } else { - $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain')); - if (!count($entities)) { - $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain')); - } - $orig_header = $message->rfc822_header; - } + + $body = ''; + if ($passed_ent_id) { + /* 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 + */ + + $entities = $message->entities[0]->findDisplayEntity + (array(), $alt_order = array('text/plain')); + if (!count($entities)) { + $entities = $message->entities[0]->findDisplayEntity + (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 */ + $message = $message->entities[0]; + + } else { + $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain')); + if (!count($entities)) { + $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain')); + } + $orig_header = $message->rfc822_header; + } + $encoding = $message->header->encoding; - $type0 = $message->type0; - $type1 = $message->type1; + $type0 = $message->type0; + $type1 = $message->type1; foreach ($entities as $ent) { - $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 = strip_tags($bodypart); - } - $body .= $bodypart; - } - if ($default_use_priority) { - $mailprio = substr($orig_header->priority,0,1); - if (!$mailprio) { - $mailprio = 3; - } - } else { - $mailprio = ''; - } - ClearAttachments($session); + $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 = 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); + } + } + $body .= $bodypart; + } + if ($default_use_priority) { + $mailprio = substr($orig_header->priority,0,1); + if (!$mailprio) { + $mailprio = 3; + } + } else { + $mailprio = ''; + } + //ClearAttachments($session); $identity = ''; $idents = getPref($data_dir, $username, 'identities'); @@ -494,200 +635,221 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $orig_from = $from_o->getAddress(); } else { $orig_from = ''; - } + } + $identities = array(); if (!empty($idents) && $idents > 1) { - 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) { - $identity = $i; - break; - } - } + $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; + break; + } + $identities[] = $enc_from_name; + } + $identity_match = $orig_header->findAddress($identities); + if ($identity_match) { + $identity = $identity_match; + } } - - switch ($action) { - case ('draft'): - $use_signature = FALSE; - $send_to = $orig_header->getAddr_s('to'); - $send_to_cc = $orig_header->getAddr_s('cc'); - $send_to_bcc = $orig_header->getAddr_s('bcc'); - $subject = $orig_header->subject; - - $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"; - } - unset($body_ary[$i]); - } - sqUnWordWrap($body); - getAttachments($message, $session, $passed_id, $entities, $imapConnection); - break; + + switch ($action) { + case ('draft'): + $use_signature = FALSE; + $composeMessage->rfc822_header = $orig_header; + $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true); + $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true); + $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true); + $subject = decodeHeader($orig_header->subject,false,true); +// /* remember the references and in-reply-to headers in case of an reply */ +// $composeMessage->rfc822_header->more_headers['References'] = $orig_header->references; +// $composeMessage->rfc822_header->more_headers['In-Reply-To'] = $orig_header->in_reply_to; + $body_ary = explode("\n", $body); + $cnt = count($body_ary) ; + $body = ''; + for ($i=0; $i < $cnt; $i++) { + if (!ereg("^[>\\s]*$", $body_ary[$i]) || !$body_ary[$i]) { + sqWordWrap($body_ary[$i], $editor_size ); + $body .= $body_ary[$i] . "\n"; + } + unset($body_ary[$i]); + } + sqUnWordWrap($body); + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + break; case ('edit_as_new'): - $send_to = $orig_header->getAddr_s('to'); - $send_to_cc = $orig_header->getAddr_s('cc'); - $send_to_bcc = $orig_header->getAddr_s('bcc'); - $subject = $orig_header->subject; - $mailprio = $orig_header->priority; - $orig_from = ''; - getAttachments($message, $session, $passed_id, $entities, $imapConnection); - sqUnWordWrap($body); - break; - case ('forward'): - $send_to = ''; - $subject = $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 . ']'; - } - $body = getforwardHeader($orig_header) . charset_decode_japanese($body); - sqUnWordWrap($body); - getAttachments($message, $session, $passed_id, $entities, $imapConnection); - break; - case ('forward_as_attachment'): - getMessage_RFC822_Attachment($message, $session, $passed_id, $passed_ent_id, $imapConnection); - $body = ''; - break; + $send_to = decodeHeader($orig_header->getAddr_s('to'),false,true); + $send_to_cc = decodeHeader($orig_header->getAddr_s('cc'),false,true); + $send_to_bcc = decodeHeader($orig_header->getAddr_s('bcc'),false,true); + $subject = decodeHeader($orig_header->subject,false,true); + $mailprio = $orig_header->priority; + $orig_from = ''; + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + sqUnWordWrap($body); + break; + case ('forward'): + $send_to = ''; + $subject = decodeHeader($orig_header->subject,false,true); + if ((substr(strtolower($subject), 0, 4) != 'fwd:') && + (substr(strtolower($subject), 0, 5) != '[fwd:') && + (substr(strtolower($subject), 0, 6) != '[ fwd:')) { + $subject = '[Fwd: ' . $subject . ']'; + } + $body = getforwardHeader($orig_header) . $body; + sqUnWordWrap($body); + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + $body = "\n" . $body; + break; + case ('forward_as_attachment'): + $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection); + $body = ''; + break; case ('reply_all'): - $send_to_cc = replyAllString($orig_header); - case ('reply'): - $send_to = $orig_header->reply_to; - if (is_object($send_to)) { - $send_to = $send_to->getAddr_s('reply_to'); - } else { - $send_to = $orig_header->getAddr_s('from'); - } - $subject = $orig_header->subject; - $subject = str_replace('"', "'", $subject); - $subject = trim($subject); - if (substr(strtolower($subject), 0, 3) != 're:') { - $subject = 'Re: ' . $subject; - } - /* this corrects some wrapping/quoting problems on replies */ - $rewrap_body = explode("\n", charset_decode_japanese($body)); - $body = getReplyCitation($orig_header->from->personal); - $cnt = count($rewrap_body); - for ($i=0;$i<$cnt;$i++) { - sqWordWrap($rewrap_body[$i], ($editor_size - 2)); - if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) { - $gt = $matches[1]; - $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n"; - } else { - $body .= '> ' . $rewrap_body[$i] . "\n"; - } - unset($rewrap_body[$i]); - } - break; - default: - break; + $send_to_cc = replyAllString($orig_header); + $send_to_cc = decodeHeader($send_to_cc,false,true); + case ('reply'): + $send_to = $orig_header->reply_to; + if (is_array($send_to) && count($send_to)) { + $send_to = $orig_header->getAddr_s('reply_to'); + } else if (is_object($send_to)) { /* unnessecarry, just for falesafe purpose */ + $send_to = $orig_header->getAddr_s('reply_to'); + } else { + $send_to = $orig_header->getAddr_s('from'); + } + $send_to = decodeHeader($send_to,false,true); + $subject = decodeHeader($orig_header->subject,false,true); + $subject = str_replace('"', "'", $subject); + $subject = trim($subject); + if (substr(strtolower($subject), 0, 3) != 're:') { + $subject = 'Re: ' . $subject; + } + /* this corrects some wrapping/quoting problems on replies */ + $rewrap_body = explode("\n", $body); + $from = (is_array($orig_header->from)) ? $orig_header->from[0] : $orig_header->from; + sqUnWordWrap($body); + $body = ''; + $cnt = count($rewrap_body); + for ($i=0;$i<$cnt;$i++) { + sqWordWrap($rewrap_body[$i], ($editor_size)); + if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) { + $gt = $matches[1]; + $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n"; + } else { + $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n"; + } + unset($rewrap_body[$i]); + } + $body = getReplyCitation($from) . $body; + $composeMessage->reply_rfc822_header = $orig_header; + + break; + default: + break; } - sqimap_logout($imapConnection); - } - $ret = array( - 'send_to' => $send_to, - 'send_to_cc' => $send_to_cc, - 'send_to_bcc' => $send_to_bcc, - 'subject' => $subject, - 'mailprio' => $mailprio, - 'body' => $body, - 'identity' => $identity - ); - + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages, 'compose_messages'); + session_write_close(); + sqimap_logout($imapConnection); + } + $ret = array( 'send_to' => $send_to, + 'send_to_cc' => $send_to_cc, + 'send_to_bcc' => $send_to_bcc, + 'subject' => $subject, + 'mailprio' => $mailprio, + 'body' => $body, + 'identity' => $identity ); + return ($ret); } /* function newMail() */ - -function getAttachments($message, $session, $passed_id, $entities, $imapConnection) { - global $attachments, $attachment_dir, $username, $data_dir; - +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) || ($message->type0 == 'message' && $message->type1 == 'rfc822')) { if ( !in_array($message->entity_id, $entities) && $message->entity_id) { - if ($message->type0 == 'message' && $message->type1 == 'rfc822') { - $filename = decodeHeader($message->rfc822_header->subject.'.eml'); - if ($filename == "") { - $filename = "untitled-".$message->entity_id.'.eml'; - } - } else { - $filename = decodeHeader($message->getFilename()); - } - $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"; - } - - $newAttachment = array(); - $newAttachment['localfilename'] = $localfilename; - $newAttachment['remotefilename'] = $filename; - $newAttachment['type'] = strtolower($message->type0 . - '/' . $message->type1); - $newAttachment['id'] = strtolower($message->header->id); - $newAttachment['session'] = $session; - - /* Write Attachment to file */ - $fp = fopen ("$hashed_attachment_dir/$localfilename", 'w'); - fputs($fp, decodeBody(mime_fetch_body($imapConnection, - $passed_id, $message->entity_id), - $message->header->encoding)); - fclose ($fp); - $attachments[] = $newAttachment; + switch ($message->type0) { + case 'message': + if ($message->type1 == 'rfc822') { + $filename = $message->rfc822_header->subject.'.eml'; + if ($filename == "") { + $filename = "untitled-".$message->entity_id.'.eml'; + } + } else { + $filename = $message->getFilename(); + } + break; + default: + $filename = $message->getFilename(); + break; + } + $filename = 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); + + /* Write Attachment to file */ + $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb'); + fputs($fp, decodeBody(mime_fetch_body($imapConnection, + $passed_id, $message->entity_id), + $message->header->encoding)); + fclose ($fp); } } else { - for ($i = 0; $i < count($message->entities); $i++) { - getAttachments($message->entities[$i], $session, $passed_id, $entities, $imapConnection); + for ($i=0, $entCount=count($message->entities); $i<$entCount;$i++) { + $composeMessage=getAttachments($message->entities[$i], $composeMessage, $passed_id, $entities, $imapConnection); } } - setPref($data_dir, $username, 'attachments', serialize($attachments)); - return; + return $composeMessage; } -function getMessage_RFC822_Attachment($message, $session, $passed_id, +function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id='', $imapConnection) { global $attachments, $attachment_dir, $username, $data_dir, $uid_support; $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); + $body_a = sqimap_run_command($imapConnection, + 'FETCH '.$passed_id.' RFC822', + TRUE, $response, $readmessage, + $uid_support); } else { $body_a = sqimap_run_command($imapConnection, - 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']', - true, $response, $readmessage, $uid_support); - $message = $message->parent; - } - if ($response = 'OK') { - $subject = encodeHeader($message->rfc822_header->subject); - array_shift($body_a); - $body = implode('', $body_a); - $body .= "\r\n"; - - $localfilename = GenerateRandomString(32, 'FILE', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - - $fp = fopen( $full_localfilename, 'w'); - fwrite ($fp, $body); - fclose($fp); - $newAttachment = array(); - $newAttachment['localfilename'] = $localfilename; - $newAttachment['type'] = "message/rfc822"; - $newAttachment['remotefilename'] = $subject.'.eml'; - $newAttachment['session'] = $session; - $attachments[] = $newAttachment; - } - setPref($data_dir, $username, 'attachments', serialize($attachments)); - return; + 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']', + TRUE, $response, $readmessage, $uid_support); + $message = $message->parent; + } + if ($response == 'OK') { + $subject = encodeHeader($message->rfc822_header->subject); + array_shift($body_a); + $body = implode('', $body_a) . "\r\n"; + + $localfilename = GenerateRandomString(32, 'FILE', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + + $fp = fopen( $full_localfilename, 'w'); + fwrite ($fp, $body); + fclose($fp); + $composeMessage->initAttachment('message/rfc822',$subject.'.eml', + $full_localfilename); + } + return $composeMessage; } function showInputForm ($session, $values=false) { @@ -699,9 +861,10 @@ function showInputForm ($session, $values=false) { $username, $data_dir, $identity, $draft_id, $delete_draft, $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win, $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, - $username; + $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']; @@ -709,7 +872,11 @@ function showInputForm ($session, $values=false) { $subject = $values['subject']; $mailprio = $values['mailprio']; $body = $values['body']; - $identity = $values['identity']; + $identity = (int) $values['identity']; + } else { + $send_to = decodeHeader($send_to); + $send_to_cc = decodeHeader($send_to_cc); + $send_to_bcc = decodeHeader($send_to_bcc); } if ($use_javascript_addr_book) { @@ -726,7 +893,6 @@ function showInputForm ($session, $values=false) { echo "\n" . '
\n"; @@ -752,177 +918,252 @@ function showInputForm ($session, $values=false) { } echo '' . "\n"; if ($compose_new_win == '1') { - echo '
'."\n"; - echo ' '."\n"; + echo '
'."\n" . + ' '. html_tag( 'td', '', 'right' ) . ''."\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); } + /* display select list for identities */ $idents = getPref($data_dir, $username, 'identities', 0); if ($idents > 1) { - echo ' ' . "\n" . - ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . + _("From:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . + ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + ' ' . "\n" . + ' ' . "\n"; } - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n\n"; + echo ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4], 'width="10%"' ) . + _("To:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4], 'width="90%"' ) . + '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("CC:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . + '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("BCC:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . + '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', $color[4] ) . + _("Subject:") . '' . "\n" . + html_tag( 'td', '', 'left', $color[4] ) . "\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n\n"; 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"; + echo ' ' . "\n" . + html_tag( 'td', '', 'right', '', 'colspan="2"' ) . "\n" . + ' ' . "\n" . + '     

' . "\n" . + ' ' . "\n" . + ' ' . "\n"; } /* This code is for attachments */ - echo '
' . - "\n" . - _("From:") . - ' ' . "\n" . - '
' . "\n" . - _("To:") . - ' ' . "\n" . - '
' . "\n" . - '
' . "\n" . - _("CC:") . - ' ' . "\n" . - '
' . "\n" . - '
' . "\n" . - _("BCC:") . - ' ' . "\n" . - '
' . "\n" . - '
' . "\n" . - _("Subject:") . - ' ' . "\n"; - echo ' '; - echo '
' . "\n" . '
' . "\n" . - '
'; - echo ' '; - echo '     

'; - echo '
'; - echo ' ' . "\n" . + ' ' . "\n" . + '
'; - echo ' '; - echo ' '; - + echo '
'; - echo ' '; + 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; + } + } - - echo ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; + if(count($sizes) > 0) { + $maxsize = '(max. ' . show_readable_size( min( $sizes ) ) . ')'; + } else { + $maxsize = ''; + } + + echo ' ' . "\n" . + ' '; - echo '
' . "\n" . - _("Attach:") . - ' ' . "\n" . - ' ' . "\n" . - '   ' . "\n" . - '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' '; - } + echo '' . html_tag( 'td', '', 'left', $color[0], 'colspan="2"' ) . $s .''; + } echo ''; } - echo '
' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + html_tag( 'td', '', 'right', '', 'valign="middle"' ) . + _("Attach:") . '' . "\n" . + html_tag( 'td', '', 'left', '', 'valign="middle"' ) . + ' ' . "\n" . + '   ' . "\n" . + $maxsize . + ' ' . "\n" . + ' ' . "\n"; $s_a = array(); - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - foreach ($attachments as $key => $info) { - if ($info['session'] == $session) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - $s_a[] = '\n" . - $info['remotefilename'] . ' - ' . $info['type'] . ' (' . - show_readable_size( filesize( $attached_file ) ) . ")
\n"; - } + 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 (count($s_a)) { foreach ($s_a as $s) { - echo '
'.$s.'
\n" . '
'; - echo '
' . "\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"; - echo '\n" . - '
'; + echo '' . "\n" . + '\n" . + '\n" . + '\n"; + /* + 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 ''; + if (!(bool) ini_get('file_uploads')) { + /* File uploads are off, so we didn't show that part of the form. + To avoid bogus bug reports, tell the user why. */ + echo 'Because PHP file uploads are turned off, you can not attach files '; + echo "to this message. Please see your system administrator for details.\r\n"; + } + do_hook('compose_bottom'); echo '' . "\n"; } @@ -930,55 +1171,62 @@ function showInputForm ($session, $values=false) { function showComposeButtonRow() { global $use_javascript_addr_book, $save_as_draft, - $default_use_priority, $mailprio, $default_use_mdn, - $request_mdn, $request_dr, - $data_dir, $username; + $default_use_priority, $mailprio, $default_use_mdn, + $request_mdn, $request_dr, + $data_dir, $username; - echo " \n\n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; if ($default_use_priority) { if(!isset($mailprio)) { $mailprio = "3"; } - echo _("Priority") .': '. ''. ''. ''. - ""; + '' . "\n"; } $mdn_user_support=getPref($data_dir, $username, 'mdn_user_support',$default_use_mdn); if ($default_use_mdn) { if ($mdn_user_support) { - echo "\n\t". _("Receipt") .': '. + echo ' ' . _("Receipt") .': '. ''. _("On Read"). + ($request_mdn=='1'?' checked':'') .'>'. _("On Read"). ' '. _("On Delivery"); + ($request_dr=='1'?' checked':'') .'>'. _("On Delivery"); } } - echo " \n \n \n"; - echo "\n \n"; + echo ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n" . + ' ' . "\n"; if ($use_javascript_addr_book) { - echo " \n"; } else { - echo " "; + echo ' ' . "\n"; } if ($save_as_draft) { - echo '\n"; + echo ' \n"; } - echo "\n \n"; + echo ' ' . "\n"; do_hook('compose_button_row'); - echo " \n\n"; + echo ' ' . "\n" . + ' ' . "\n\n"; } function checkInput ($show) { @@ -988,9 +1236,9 @@ function checkInput ($show) { * using $show=false, and then when i'm ready to display the error * message, show=true */ - global $body, $send_to, $subject, $color; + global $body, $send_to, $send_to_bcc, $subject, $color; - if ($send_to == "") { + if ($send_to == '' && $send_to_bcc == '') { if ($show) { plain_error_message(_("You have not filled in the \"To:\" field."), $color); } @@ -1002,8 +1250,13 @@ function checkInput ($show) { /* True if FAILURE */ function saveAttachedFiles($session) { - global $HTTP_POST_FILES, $attachment_dir, $attachments, $username, - $data_dir; + global $_FILES, $attachment_dir, $attachments, $username, + $data_dir, $compose_messages; + + /* get out of here if no file was attached at all */ + if (! is_uploaded_file($_FILES['attachfile']['tmp_name']) ) { + return true; + } $hashed_attachment_dir = getHashedDir($username, $attachment_dir); $localfilename = GenerateRandomString(32, '', 7); @@ -1013,90 +1266,260 @@ function saveAttachedFiles($session) { $full_localfilename = "$hashed_attachment_dir/$localfilename"; } - if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) { - if (function_exists("move_uploaded_file")) { - if (!@move_uploaded_file($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) { - return true; - } - } else { - if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) { - return true; - } - } - + // FIXME: we SHOULD prefer move_uploaded_file over rename because + // m_u_f works better with restricted PHP installes (safe_mode, open_basedir) + if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) { + if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) { + return true; + } } - $newAttachment['localfilename'] = $localfilename; - $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name']; - $newAttachment['type'] = strtolower($HTTP_POST_FILES['attachfile']['type']); - $newAttachment['session'] = $session; + $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'); +} - if ($newAttachment['type'] == "") { - $newAttachment['type'] = 'application/octet-stream'; +function ClearAttachments($composeMessage) { + if ($composeMessage->att_local_name) { + $attached_file = $composeMessage->att_local_name; + if (file_exists($attached_file)) { + unlink($attached_file); + } + } + for ($i=0, $entCount=count($composeMessage->entities);$i< $entCount; ++$i) { + ClearAttachments($composeMessage->entities[$i]); } - $attachments[] = $newAttachment; - setPref($data_dir, $username, 'attachments', serialize($attachments)); } +/* parse values like 8M and 2k into bytes */ +function getByteSize($ini_size) { -function ClearAttachments($session) -{ - global $username, $attachments, $attachment_dir, $data_dir; - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + if(!$ini_size) { + return FALSE; + } - $rem_attachments = array(); - if (is_array($attachments)) { - foreach ($attachments as $info) { - if ($info['session'] == $session) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } - else { - $rem_attachments[] = $info; - } + $ini_size = trim($ini_size); + + // if there's some kind of letter at the end of the string we need to multiply. + if(!is_numeric(substr($ini_size, -1))) { + + switch(strtoupper(substr($ini_size, -1))) { + case 'G': + $bytesize = 1073741824; + break; + case 'M': + $bytesize = 1048576; + break; + case 'K': + $bytesize = 1024; + break; } + + return ($bytesize * (int)substr($ini_size, 0, -1)); } - $attachments = $rem_attachments; - setPref($data_dir, $username, 'attachments', serialize($attachments)); + + return $ini_size; } -function getReplyCitation($orig_from) -{ - global $reply_citation_style, $reply_citation_start, $reply_citation_end; - - /* First, return an empty string when no citation style selected. */ - if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { - return ''; +/* temporary function to make use of the deliver class. + In the future the responsable backend should be automaticly loaded + and conf.pl should show a list of available backends. + The message also should be constructed by the message class. +*/ + +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, $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); + $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')); + $rfc822_header->priority = $mailprio; + $rfc822_header->subject = $subject; + $special_encoding=''; + if (strtolower($default_charset) == 'iso-2022-jp') { + if (mb_detect_encoding($body) == 'ASCII') { + $special_encoding = '8bit'; + } else { + $body = mb_convert_encoding($body, 'JIS'); + $special_encoding = '7bit'; + } } + $composeMessage->setBody($body); - /* Make sure our final value isn't an empty string. */ - if ($orig_from == '') { - return ''; + if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) { + $popuser = $usernamedata[1]; + $domain = $usernamedata[2]; + unset($usernamedata); + } else { + $popuser = $username; } - - /* 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 ''; + $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'); + } + if (!$from_mail) { + $from_mail = "$popuser@$domain"; } + $rfc822_header->from = $rfc822_header->parseAddress($from_mail,true); + if ($full_name) { + $from = $rfc822_header->from[0]; + 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) { + $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true); + } + /* Receipt: On Read */ + if (isset($request_mdn) && $request_mdn) { + $rfc822_header->dnt = $rfc822_header->parseAddress($from_mail,true); + } + /* Receipt: On Delivery */ + if (isset($request_dr) && $request_dr) { + $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 = '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'); + } else { + $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; + } + } + $rfc822_header->content_type = $content_type; + $composeMessage->rfc822_header = $rfc822_header; + + /* Here you can modify the message structure just before we hand + it over to deliver */ + do_hook('compose_send'); + + 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); + } - /* Build and return the citation string. */ - return ($start . $orig_from . $end . "\n"); + $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; + $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; + $deliver = new Deliver_SendMail(); + $stream = $deliver->initStream($composeMessage,$sendmail_path); + } elseif ($draft) { + global $draft_folder; + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 0); + if (sqimap_mailbox_exists ($imap_stream, $draft_folder)) { + require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); + $imap_deliver = new Deliver_IMAP(); + $length = $imap_deliver->mail($composeMessage); + sqimap_append ($imap_stream, $draft_folder, $length); + $imap_deliver->mail($composeMessage, $imap_stream); + sqimap_append_done ($imap_stream, $draft_folder); + sqimap_logout($imap_stream); + unset ($imap_deliver); + return $length; + } else { + $msg = '
Error: '._("Draft folder")." $draft_folder" . ' does not exist.'; + plain_error_message($msg, $color); + return false; + } + } + $succes = false; + if ($stream) { + $length = $deliver->mail($composeMessage, $stream); + $succes = $deliver->finalizeStream($stream); + } + if (!$succes) { + $msg = $deliver->dlv_msg . '
' . + _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + $deliver->dlv_server_msg; + plain_error_message($msg, $color); + } else { + unset ($deliver); + $move_to_sent = getPref($data_dir,$username,'move_to_sent'); + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + if (sqimap_mailbox_exists ($imap_stream, $sent_folder) && ((isset($move_to_sent) && $move_to_sent) || + (isset($default_move_to_sent) && $default_move_to_sent))) { + 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); + } + return $succes; } ?>