X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=03f9124e9000b2c5d8111da74280807c153112b7;hp=6fd617a7daa18002818c94b9113193dcd6634ed0;hb=304c159b39b5cc4d5eeb3846c0ccdf70c278456c;hpb=19c6f7a71e4ca86f6c9084cf6d7b02c6a593851b diff --git a/src/compose.php b/src/compose.php index 6fd617a7..b24dde7c 100644 --- a/src/compose.php +++ b/src/compose.php @@ -3,7 +3,7 @@ /** * compose.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2004 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code sends a mail. @@ -14,21 +14,107 @@ * - Send mail * - Save As Draft * - * $Id$ + * @version $Id$ + * @package squirrelmail */ -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. + * @ignore + */ +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'); +require_once(SM_PATH . 'functions/identity.php'); +require_once(SM_PATH . 'functions/forms.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('session',$session); +sqgetGlobalVar('mailbox',$mailbox); +if(!sqgetGlobalVar('identity',$identity)) { + $identity=0; +} +sqgetGlobalVar('send_to',$send_to); +sqgetGlobalVar('send_to_cc',$send_to_cc); +sqgetGlobalVar('send_to_bcc',$send_to_bcc); +sqgetGlobalVar('subject',$subject); +sqgetGlobalVar('body',$body); +sqgetGlobalVar('mailprio',$mailprio); +sqgetGlobalVar('request_mdn',$request_mdn); +sqgetGlobalVar('request_dr',$request_dr); +sqgetGlobalVar('html_addr_search',$html_addr_search); +sqgetGlobalVar('mail_sent',$mail_sent); +sqgetGlobalVar('passed_id',$passed_id); +sqgetGlobalVar('passed_ent_id',$passed_ent_id); +sqgetGlobalVar('send',$send); + +sqgetGlobalVar('attach',$attach); + +sqgetGlobalVar('draft',$draft); +sqgetGlobalVar('draft_id',$draft_id); +sqgetGlobalVar('ent_num',$ent_num); +sqgetGlobalVar('saved_draft',$saved_draft); +sqgetGlobalVar('delete_draft',$delete_draft); +sqgetGlobalVar('startMessage',$startMessage); + +/** POST VARS */ +sqgetGlobalVar('sigappend', $sigappend, SQ_POST); +sqgetGlobalVar('from_htmladdr_search', $from_htmladdr_search, SQ_POST); +sqgetGlobalVar('addr_search_done', $html_addr_search_done, SQ_POST); +sqgetGlobalVar('send_to_search', $send_to_search, SQ_POST); +sqgetGlobalVar('do_delete', $do_delete, SQ_POST); +sqgetGlobalVar('delete', $delete, SQ_POST); +sqgetGlobalVar('restoremessages', $restoremessages, SQ_POST); +if ( sqgetGlobalVar('return', $temp, SQ_POST) ) { + $html_addr_search_done = 'Use Addresses'; +} + +/** 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) */ +$idents = get_identities(); + /* --------------------- Specific Functions ------------------------------ */ function replyAllString($header) { - global $include_self_reply_all, $username, $data_dir; - $excl_arr = array(); + global $include_self_reply_all, $idents; + $excl_ar = array(); /** * 1) Remove the addresses we'll be sending the message 'to' */ @@ -41,240 +127,277 @@ 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')); - $excl_ar[$email_address] = ''; - - $idents = getPref($data_dir, $username, 'identities'); - if ($idents != '' && $idents > 1) { - 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] = ''; - } - } + foreach($idents as $id) { + $excl_ar[strtolower(trim($id['email_address']))] = ''; + } } - /** + /** * 3) get the addresses. */ $url_replytoall_ar = $header->getAddr_a(array('to','cc'), $excl_ar); - /** + /** * 4) generate the string. */ $url_replytoallcc = ''; foreach( $url_replytoall_ar as $email => $personal) { if ($personal) { - $url_replytoallcc .= ", \"$personal\" <$email>"; + // if personal name contains address separator then surround + // the personal name with double quotes. + if (strpos($personal,',') !== false) { + $personal = '"'.$personal.'"'; + } + $url_replytoallcc .= ", $personal <$email>"; } else { - $url_replytoallcc .= ', '. $email; + $url_replytoallcc .= ', '. $email; } } $url_replytoallcc = substr($url_replytoallcc,2); + return $url_replytoallcc; } +function getReplyCitation($orig_from, $orig_date) { + global $reply_citation_style, $reply_citation_start, $reply_citation_end; + $orig_from = decodeHeader($orig_from->getAddress(false),false,false,true); +// $from = decodeHeader($orig_header->getAddr_s('from',"\n$indent"),false,false); + /* First, return an empty string when no citation style selected. */ + if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { + return ''; + } + + /* Make sure our final value isn't an empty string. */ + if ($orig_from == '') { + return ''; + } + + /* Otherwise, try to select the desired citation style. */ + switch ($reply_citation_style) { + case 'author_said': + $start = ''; + $end = ' ' . _("said") . ':'; + break; + case 'quote_who': + $start = '<' . _("quote") . ' ' . _("who") . '="'; + $end = '">'; + break; + case 'date_time_author': + $start = 'On ' . getLongDateString($orig_date) . ', '; + $end = ' ' . _("said") . ':'; + break; + case 'user-defined': + $start = $reply_citation_start . + ($reply_citation_start == '' ? '' : ' '); + $end = $reply_citation_end; + break; + default: + return ''; + } + + /* Build and return the citation string. */ + return ($start . $orig_from . $end . "\n"); +} + function getforwardHeader($orig_header) { global $editor_size; - $display = array( - _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), - _("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")] . $orig_header->subject . "\n" . - $display[_("From")] . $orig_header->getAddr_s('from',"\n$indent") . "\n" . - $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . - $display[_("To")] . $orig_header->getAddr_s('to',"\n$indent") ."\n"; - if ($orig_header->cc != array() && $orig_header->cc !='') { - $bodyTop .= $display[_("Cc")] . $orig_header->getAddr_s('cc',"\n$indent") . "\n"; + } + $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 , '-'); - $bodyTop .= "\n"; + $bodyTop .= str_pad('', $editor_size -2 , '-') . + "\n\n"; return $bodyTop; } /* ----------------------------------------------------------------------- */ /* - * If the session is expired during a post this restores the compose session + * If the session is expired during a post this restores the compose session * vars. */ -//$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)) { - $session = "$composesession" +1; - $composesession = $session; -} + sqsession_unregister('composesession'); + $session = "$composesession" +1; + $composesession = $session; + 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) . - "&message=$delete_draft&sort=$sort&startMessage=1&saved_draft=yes"); + Header("Location: $location/delete_message.php?mailbox=" . urlencode($draft_folder) . + "&message=$delete_draft&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=" . urlencode($draft_folder) . + "&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; } - /* + /** * 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); - do_hook('compose_send'); + $composeMessage=$compose_messages[$session]; - $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 ). - "&message=$delete_draft&sort=$sort&startMessage=1&mail_sent=yes"); + Header("Location: $location/delete_message.php?mailbox=" . urlencode( $draft_folder ). + "&message=$delete_draft&startMessage=1&mail_sent=yes"); exit(); } if ($compose_new_win == '1') { - Header("Location: compose.php?mail_sent=yes"); + + Header("Location: $location/compose.php?mail_sent=yes"); } else { - Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort". - "&startMessage=1"); + Header("Location: $location/right_main.php?mailbox=$urlMailbox". + "&startMessage=$startMessage&mail_sent=yes"); } } else { - /* - *$imapConnection = sqimap_login($username, $key, $imapServerAddress, - * $imapPort, 0); - */ if ($compose_new_win == '1') { compose_Header($color, $mailbox); } @@ -321,10 +444,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); } } @@ -346,15 +469,8 @@ if (isset($send)) { showInputForm($session); } elseif (isset($sigappend)) { - $idents = getPref($data_dir, $username, 'identities', 0); - if ($idents > 1) { - if ($identity == 'default') { - $no = 'g'; - } else { - $no = $identity; - } - $signature = getSig($data_dir, $username, $no); - } + $signature = $idents[$identity]['signature']; + $body .= "\n\n".($prefix_sig==true? "-- \n":'').$signature; if ($compose_new_win == '1') { compose_Header($color, $mailbox); @@ -370,22 +486,26 @@ 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 { /* * This handles the default case as well as the error case - * (they had the same code) --> if (isset($smtpErrors)) + * (they had the same code) --> if (isset($smtpErrors)) */ if ($compose_new_win == '1') { @@ -396,11 +516,19 @@ 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); /* in case the origin is not read_body.php */ @@ -413,6 +541,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); } @@ -420,445 +551,635 @@ 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, + global $editor_size, $default_use_priority, $body, $idents, $use_signature, $composesession, $data_dir, $username, - $username, $key, $imapServerAddress, $imapPort; + $username, $key, $imapServerAddress, $imapPort, $compose_messages, + $composeMessage, $body_quote; + global $languages, $squirrelmail_language, $default_charset; - $send_to = $send_to_cc = $send_to_bcc = $subject = $body = $identity = ''; + /* + * 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); - $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; + $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; foreach ($entities as $ent) { - $bodypart = decodeBody( - mime_fetch_body($imapConnection, $passed_id, $ent), - $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); + $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("\n", ' ', $bodypart); + $bodypart = preg_replace(array('/<\/?p>/i','/