X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=7a7d9f8e39bbbe11ab674f4ae0602ca09bded266;hp=81cab1c33a99b8ec19cf0becb38062bc5df1c586;hb=d31f73f16e3e6acd2e1be41f8e8d0e17ecd4f393;hpb=8f11a776ecc934ba5e698a83bc964fbb007af801 diff --git a/src/read_body.php b/src/read_body.php index 81cab1c3..7a7d9f8e 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -1,31 +1,36 @@ move to mailbox_display require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/url_parser.php'); -require_once(SM_PATH . 'functions/html.php'); -require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/identity.php'); require_once(SM_PATH . 'functions/mailbox_display.php'); +require_once(SM_PATH . 'functions/forms.php'); +require_once(SM_PATH . 'functions/attachment_common.php'); +require_once(SM_PATH . 'functions/compose.php'); /** * Given an IMAP message id number, this will look it up in the cached @@ -34,41 +39,19 @@ require_once(SM_PATH . 'functions/mailbox_display.php'); * @param int $passed_id The current message UID * @return the index of the next valid message from the array */ -function findNextMessage($passed_id) { - global $msort, $msgs, $sort, - $thread_sort_messages, $allow_server_sort, - $server_sort_array; - if (!is_array($server_sort_array)) { - $thread_sort_messages = 0; - $allow_server_sort = FALSE; - } - $result = -1; - if ($thread_sort_messages || $allow_server_sort) { - $count = count($server_sort_array) - 1; - foreach($server_sort_array as $key=>$value) { - if ($passed_id == $value) { - if ($key == $count) { - break; - } - $result = $server_sort_array[$key + 1]; - break; - } - } +function findNextMessage($uidset,$passed_id='backwards') { + if (!is_array($uidset)) { + return -1; + } + if ($passed_id=='backwards' || !is_array($uidset)) { // check for backwards compattibilty gpg plugin + $passed_id = $uidset; + } + $result = sqm_array_get_value_by_offset($uidset,$passed_id,1); + if ($result === false) { + return -1; } else { - if (is_array($msort)) { - for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { - if ($passed_id == $msgs[$key]['ID']) { - next($msort); - $key = key($msort); - if (isset($key)){ - $result = $msgs[$key]['ID']; - break; - } - } - } - } + return $result; } - return $result; } /** @@ -78,91 +61,80 @@ function findNextMessage($passed_id) { * @param int $passed_id The current message UID * @return the index of the next valid message from the array */ -function findPreviousMessage($numMessages, $passed_id) { - global $msort, $sort, $msgs, - $thread_sort_messages, - $allow_server_sort, $server_sort_array; - $result = -1; - if (!is_array($server_sort_array)) { - $thread_sort_messages = 0; - $allow_server_sort = FALSE; - } - if ($thread_sort_messages || $allow_server_sort ) { - foreach($server_sort_array as $key=>$value) { - if ($passed_id == $value) { - if ($key != 0) { - $result = $server_sort_array[$key - 1]; - } - break; - } - } + +function findPreviousMessage($uidset, $passed_id) { + if (!is_array($uidset)) { + return -1; + } + $result = sqm_array_get_value_by_offset($uidset,$passed_id,-1); + if ($result === false) { + return -1; } else { - if (is_array($msort)) { - for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { - if ($passed_id == $msgs[$key]['ID']) { - prev($msort); - $key = key($msort); - if (isset($key)) { - $result = $msgs[$key]['ID']; - break; - } - } - } - } + return $result; } - return $result; } -/** - * Displays a link to a page where the message is displayed more - * "printer friendly". - * @param string $mailbox Name of current mailbox - * @param int $passed_id - */ -function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) { - global $javascript_on, $color; - - $params = '?passed_ent_id=' . $passed_ent_id . - '&mailbox=' . urlencode($mailbox) . - '&passed_id=' . $passed_id; - - $print_text = _("View Printable Version"); - - $result = ''; - /* Output the link. */ - if ($javascript_on) { - $result = '\n" . - "$print_text\n"; +function html_toggle_href ($mailbox, $passed_id, $passed_ent_id, $message) { + global $base_uri, $show_html_default; + + $has_html = false; + if ($message->header->type0 == 'message' && $message->header->type1 == 'rfc822') { + $type0 = $message->rfc822_header->content_type->type0; + $type1 = $message->rfc822_header->content_type->type1; } else { - $result = '$print_text\n"; + $type0 = $message->header->type0; + $type1 = $message->header->type1; + } + if($type0 == 'multipart' && + ($type1 == 'alternative' || $type1 == 'mixed' || $type1 == 'related' || $type1=='signed')) { + if ($message->findDisplayEntity(array(), array('text/html'), true)) { + $has_html = true; + } + } + /* + * Normal single part message so check its type. + */ + else { + if($type0 == 'text' && $type1 == 'html') { + $has_html = true; + } } - return $result; + if($has_html == true) { + $vars = array('passed_ent_id', 'show_more', 'show_more_cc', 'override_type0', 'override_type1', 'startMessage','where', 'what'); + + $new_link = $base_uri . 'src/read_body.php?passed_id=' . urlencode($passed_id) . + '&passed_ent_id=' . urlencode($passed_ent_id) . + '&mailbox=' . urlencode($mailbox); + foreach($vars as $var) { + if(sqgetGlobalVar($var, $temp)) { + $new_link .= '&' . $var . '=' . urlencode($temp); + } + } + + if($show_html_default == 1) { + $new_link .= '&show_html_default=0'; + } else { + $new_link .= '&show_html_default=1'; + } + return $new_link; + } + return ''; } -function ServerMDNSupport($read) { - /* escaping $ doesn't work -> \x36 */ - $ret = preg_match('/(\x36MDNSent|\\\\\*)/i', $read); - return $ret; +function ServerMDNSupport($aFlags) { + /* escaping $ doesn't work -> \x36 */ + return ( in_array('$mdnsent',$aFlags,true) || + in_array('\\*',$aFlags,true) ) ; } -function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { - global $username, $attachment_dir, - $version, $attachments, $squirrelmail_language, $default_charset, - $languages, $useSendmail, $domain, $sent_folder, - $popuser, $data_dir, $username; +function SendMDN ( $mailbox, $passed_id, $message, $imapConnection) { + global $squirrelmail_language, $default_charset, $default_move_to_sent, + $languages, $useSendmail, $domain, $sent_folder, $username, + $data_dir; sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER); $header = $message->rfc822_header; - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); $rfc822_header = new Rfc822Header(); $content_type = new ContentType('multipart/report'); @@ -174,38 +146,29 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } $rfc822_header->content_type = $content_type; $rfc822_header->to[] = $header->dnt; - $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject); - - // Patch #793504 Return Receipt Failing with <@> from Tim Craig (burny_md) - // This merely comes from compose.php and only happens when there is no - // email_addr specified in user's identity (which is the startup config) - if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) { - $popuser = $usernamedata[1]; - $domain = $usernamedata[2]; - unset($usernamedata); - } else { - $popuser = $username; - } - - $reply_to = ''; - $ident = get_identities(); - if(!isset($identity)) $identity = 0; - $full_name = $ident[$identity]['full_name']; - $from_mail = $ident[$identity]['email_address']; - $from_addr = '"'.$full_name.'" <'.$from_mail.'>'; - $reply_to = $ident[$identity]['reply_to']; + $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject,true,false); - if (!$from_mail) { - $from_mail = "$popuser@$domain"; - $from_addr = $from_mail; + $idents = get_identities(); + $needles = array(); + if ($header->to) { + foreach ($header->to as $message_to) { + $needles[] = $message_to->mailbox.'@'.$message_to->host; + } } + $identity = find_identity($needles); + $from_addr = build_from_header($identity); + $reply_to = isset($idents[$identity]['reply_to']) ? $idents[$identity]['reply_to'] : ''; + // FIXME: this must actually be the envelope address of the orginal message, + // but do we have that information? For now the first identity is our best guess. + $final_recipient = $idents[0]['email_address']; + $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true); if ($reply_to) { $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true); } // part 1 (RFC2298) - $senton = getLongDateString( $header->date ); + $senton = getLongDateString( $header->date, $header->date_unparsed ); $to_array = $header->to; $to = ''; foreach ($to_array as $line) { @@ -214,16 +177,16 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $now = getLongDateString( time() ); set_my_charset(); $body = _("Your message") . "\r\n\r\n" . - "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" . - "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" . - "\t" . _("Sent:") . ' ' . $senton . "\r\n" . + "\t" . _("To") . ': ' . decodeHeader($to,false,false) . "\r\n" . + "\t" . _("Subject") . ': ' . decodeHeader($header->subject,false,false) . "\r\n" . + "\t" . _("Sent") . ': ' . $senton . "\r\n" . "\r\n" . sprintf( _("Was displayed on %s"), $now ); $special_encoding = ''; - if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { - $body = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $body); + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode')) { + $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encode', $body); if (strtolower($default_charset) == 'iso-2022-jp') { if (mb_detect_encoding($body) == 'ASCII') { $special_encoding = '8bit'; @@ -232,6 +195,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $special_encoding = '7bit'; } } + } elseif (sq_is8bit($body)) { + $special_encoding = '8bit'; } $part1 = new Message(); $part1->setBody($body); @@ -252,11 +217,10 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $original_recipient = $to; $original_message_id = $header->message_id; - $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version $version) \r\n"; + $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version " . SM_VERSION . ") \r\n"; if ($original_recipient != '') { $report .= "Original-Recipient : $original_recipient\r\n"; } - $final_recipient = $sender; $report .= "Final-Recipient: rfc822; $final_recipient\r\n" . "Original-Message-ID : $original_message_id\r\n" . "Disposition: manual-action/MDN-sent-manually; displayed\r\n"; @@ -277,13 +241,21 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { if ($useSendmail) { require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); - global $sendmail_path; - $deliver = new Deliver_SendMail(); + global $sendmail_path, $sendmail_args; + // Check for outdated configuration + if (!isset($sendmail_args)) { + if ($sendmail_path=='/var/qmail/bin/qmail-inject') { + $sendmail_args = ''; + } else { + $sendmail_args = '-i -t'; + } + } + $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args)); $stream = $deliver->initStream($composeMessage,$sendmail_path); } else { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp; + global $smtpServerAddress, $smtpPort, $pop_before_smtp; $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; get_smtp_user($user, $pass); $stream = $deliver->initStream($composeMessage,$domain,0, @@ -291,23 +263,51 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } $success = false; if ($stream) { - $length = $deliver->mail($composeMessage, $stream); + $deliver->mail($composeMessage, $stream); $success = $deliver->finalizeStream($stream); } if (!$success) { - $msg = $deliver->dlv_msg . '
' . - _("Server replied: ") . $deliver->dlv_ret_nr . ' '. - $deliver->dlv_server_msg; - require_once(SM_PATH . 'functions/display_messages.php'); - plain_error_message($msg, $color); + $msg = _("Message not sent.") . "
\n" . + $deliver->dlv_msg; + if (! empty($deliver->dlv_server_msg)) { + $msg.= '
' . + _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . + nl2br(htmlspecialchars($deliver->dlv_server_msg)); + } + plain_error_message($msg); } else { unset ($deliver); - if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) { - sqimap_append ($imapConnection, $sent_folder, $length); + + // move to sent folder + // + $move_to_sent = getPref($data_dir,$username,'move_to_sent'); + if (isset($default_move_to_sent) && ($default_move_to_sent != 0)) { + $svr_allow_sent = true; + } else { + $svr_allow_sent = false; + } + + if (isset($sent_folder) && (($sent_folder != '') || ($sent_folder != 'none')) + && sqimap_mailbox_exists( $imapConnection, $sent_folder)) { + $fld_sent = true; + } else { + $fld_sent = false; + } + + if ((isset($move_to_sent) && ($move_to_sent != 0)) || (!isset($move_to_sent))) { + $lcl_allow_sent = true; + } else { + $lcl_allow_sent = false; + } + + if (($fld_sent && $svr_allow_sent && !$lcl_allow_sent) || ($fld_sent && $lcl_allow_sent)) { + $save_reply_with_orig=getPref($data_dir,$username,'save_reply_with_orig'); + if ($save_reply_with_orig) { + $sent_folder = $mailbox; + } require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php'); $imap_deliver = new Deliver_IMAP(); - $imap_deliver->mail($composeMessage, $imapConnection); - sqimap_append_done ($imapConnection); + $imap_deliver->mail($composeMessage, $imapConnection, 0, 0, $sent_folder); unset ($imap_deliver); } } @@ -317,34 +317,13 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) { $sg = $set?'+':'-'; $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)'; - $read = sqimap_run_command ($imapConnection, $cmd, true, $response, + $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $readmessage, TRUE); } -function ClearAttachments() { - global $username, $attachments, $attachment_dir; - - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - - $rem_attachments = array(); - if (isset($attachments)) { - foreach ($attachments as $info) { - if ($info['session'] == -1) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } else { - $rem_attachments[] = $info; - } - } - } - $attachments = $rem_attachments; -} - function formatRecipientString($recipients, $item ) { - global $show_more_cc, $show_more, $show_more_bcc, - $PHP_SELF; + global $show_more, $show_more_cc, $show_more_bcc, + $PHP_SELF, $oTemplate; $string = ''; if ((is_array($recipients)) && (isset($recipients[0]))) { @@ -373,33 +352,32 @@ function formatRecipientString($recipients, $item ) { } } - $cnt = count($recipients); - foreach($recipients as $r) { - $add = decodeHeader($r->getAddress(true)); - if ($string) { - $string .= '
' . $add; - } else { - $string = $add; - if ($cnt > 1) { - $string .= ' ('._("less").')'; - } else { - $string .= '">'._("more").')'; - break; - } - } - } + $a = array(); + foreach ($recipients as $r) { + $a[] = array( + 'Name' => htmlspecialchars($r->getAddress(false)), + 'Email' => htmlspecialchars($r->getEmail()), + 'Full' => htmlspecialchars($r->getAddress(true)) + ); } + + $oTemplate->assign('which_field', $item); + $oTemplate->assign('recipients', $a); + $oTemplate->assign('more_less_toggle_href', $url); + $oTemplate->assign('show_more', $show); + + $string = $oTemplate->fetch('read_recipient_list.tpl'); } return $string; } -function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, +function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee) { - global $msn_user_support, $default_use_mdn, $default_use_priority, - $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on, - $squirrelmail_language; + global $default_use_mdn, $default_use_priority, + $show_xmailer_default, $mdn_user_support, $PHP_SELF, + $squirrelmail_language, $oTemplate; + + $mailbox = $aMailbox['NAME']; $header = $message->rfc822_header; $env = array(); @@ -412,96 +390,96 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $env[_("From")] = _("Unknown sender"); else $env[_("From")] = decodeHeader($from_name); - $env[_("Date")] = getLongDateString($header->date); + $env[_("Date")] = getLongDateString($header->date, $header->date_unparsed); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc"); if ($default_use_priority) { - $env[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority)); + $oTemplate->assign('message_priority', $header->priority); + $env[_("Priority")] = $oTemplate->fetch('read_message_priority.tpl'); } if ($show_xmailer_default) { - $env[_("Mailer")] = decodeHeader($header->xmailer); + $oTemplate->assign('xmailer', decodeHeader($header->xmailer)); + $env[_("Mailer")] = $oTemplate->fetch('read_xmailer.tpl'); } + + // this is used for both mdn and also general use for plugins, etc + $oTemplate->assign('first_time_reading', $FirstTimeSee); + if ($default_use_mdn) { if ($mdn_user_support) { if ($header->dnt) { - if ($message->is_mdnsent) { - $env[_("Read receipt")] = _("sent"); - } else { - $env[_("Read receipt")] = _("requested"); - if (!(handleAsSent($mailbox) || - $message->is_deleted || - $passed_ent_id)) { - $mdn_url = $PHP_SELF . '&sendreceipt=1'; - if ($FirstTimeSee && $javascript_on) { - $script = ''. "\n"; - echo $script; - } - $env[_("Read receipt")] .= ' [' . - _("Send read receipt now") . ']'; - } - } + $mdn_url = $PHP_SELF; + $mdn_url = set_url_var($mdn_url, 'mailbox', urlencode($mailbox)); + $mdn_url = set_url_var($mdn_url, 'passed_id', $passed_id); + $mdn_url = set_url_var($mdn_url, 'passed_ent_id', $passed_ent_id); + $mdn_url = set_url_var($mdn_url, 'sendreceipt', 1); + + $oTemplate->assign('read_receipt_sent', $message->is_mdnsent); + $oTemplate->assign('send_receipt_href', $mdn_url); + + $env[_("Read Receipt")] = $oTemplate->fetch('read_handle_receipt.tpl'); } } } - $s = ''; - foreach ($env as $key => $val) { - if ($val) { - $s .= ''; - $s .= html_tag('TD', '' . $key . ':  ', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n"; - $s .= html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n"; - $s .= ''; + $statuses = array(); + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) { + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\deleted']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\deleted'] === true) { + $statuses[] = _("deleted"); + } + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\answered']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\answered'] === true) { + $statuses[] = _("answered"); + } + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\draft']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\draft'] === true) { + $statuses[] = _("draft"); + } + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\flagged']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\flagged'] === true) { + $statuses[] = _("flagged"); + } + if ( count($statuses) ) { + $env[_("Status")] = implode(', ', $statuses); } } - echo '
'."\n"; - echo '
'."\n"; - echo $s; - do_hook('read_body_header'); - formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); - echo '
'; - echo ''."\n"; - echo ''; + + $env[_("Options")] = formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); + + + $oTemplate->assign('headers_to_display', $env); + + $oTemplate->display('read_headers.tpl'); } /** - * Format message toolbar - * - * @param string $mailbox Name of current mailbox + * Format message toolbar + * + * @param array $aMailbox Current mailbox information array * @param int $passed_id UID of current message * @param int $passed_ent_id Id of entity within message * @param object $message Current message object * @param object $mbx_response */ -function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, $nav_on_top = TRUE) { - global $base_uri, $draft_folder, $where, $what, $color, $sort, - $startMessage, $PHP_SELF, $save_as_draft, +function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removedVar, $nav_on_top = TRUE) { + global $base_uri, $draft_folder, $where, $what, $sort, + $startMessage, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, - $data_dir, $username, $delete_prev_next_display, - $compose_new_win, $javascript_on; + $delete_prev_next_display, $show_copy_buttons, + $compose_new_win, $compose_width, $compose_height, + $oTemplate; - $topbar_delimiter = ' | '; - $double_delimiter = '    '; - $urlMailbox = urlencode($mailbox); - - $msgs_url = $base_uri . 'src/'; + //FIXME cleanup argument list, use $aMailbox where possible + $mailbox = $aMailbox['NAME']; - // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc. - $nav_row = ''; + $urlMailbox = urlencode($mailbox); // Create Prev & Next links // Handle nested entities first (i.e. Mime Attach parts) + $prev_href = $next_href = $up_href = $del_href = $del_prev_href = $del_next_href = ''; + $msg_list_href = $search_href = $view_msg_href = ''; if (isset($passed_ent_id) && $passed_ent_id) { // code for navigating through attached message/rfc822 messages $url = set_url_var($PHP_SELF, 'passed_ent_id',0); @@ -511,241 +489,259 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp foreach($message->parent->entities as $ent) { if ($ent->type0 == 'message' && $ent->type1 == 'rfc822') { + $c++; $entity_count[$c] = $ent->entity_id; $entities[$ent->entity_id] = $c; } } - $prev_link = _("Previous"); - if($entities[$passed_ent_id] > 1) { + if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] > 1) { $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1]; - $prev_link = '' . $prev_link . ''; + $prev_href = set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id); } - $next_link = _("Next"); - if($entities[$passed_ent_id] < $c) { + if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] < $c) { $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1]; - $next_link = '' . $next_link . ''; + $next_href = set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id); } $par_ent_id = $message->parent->entity_id; - $up_link = ''; if ($par_ent_id) { $par_ent_id = substr($par_ent_id,0,-2); if ( $par_ent_id != 0 ) { - $up_link = $topbar_delimiter; - $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); - $up_link .= ''._("Up").''; + $up_href = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); } } - $nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link; - $nav_row .= $double_delimiter . '['._("View Message").']'; + $view_msg_href = $url; // Prev/Next links for regular messages - } else if ( !(isset($where) && isset($what)) ) { - $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id); - $next = findNextMessage($passed_id); + } else if ( true ) { //!(isset($where) && isset($what)) ) { + $prev = findPreviousMessage($aMailbox['UIDSET'][$what], $passed_id); + $next = findNextMessage($aMailbox['UIDSET'][$what],$passed_id); - $prev_link = _("Previous"); if ($prev >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + $prev_href = $base_uri . 'src/read_body.php?passed_id='.$prev. '&mailbox='.$urlMailbox.'&sort='.$sort. + "&where=$where&what=$what" . '&startMessage='.$startMessage.'&show_more=0'; - $prev_link = ''.$prev_link.''; } - $next_link = _("Next"); if ($next >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + $next_href = $base_uri . 'src/read_body.php?passed_id='.$next. '&mailbox='.$urlMailbox.'&sort='.$sort. + "&where=$where&what=$what" . '&startMessage='.$startMessage.'&show_more=0'; - $next_link = ''.$next_link.''; } // Only bother with Delete & Prev and Delete & Next IF // top display is enabled. - if ( $delete_prev_next_display == 1 ) { - $del_prev_link = _("Delete & Prev"); + if ( $delete_prev_next_display == 1 && + in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) { if ($prev >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + $del_prev_href = $base_uri . 'src/read_body.php?passed_id='.$prev. '&mailbox='.$urlMailbox.'&sort='.$sort. '&startMessage='.$startMessage.'&show_more=0'. + "&where=$where&what=$what" . '&delete_id='.$passed_id; - $del_prev_link = ''.$del_prev_link.''; } - $del_next_link = _("Delete & Next"); if ($next >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + $del_next_href = $base_uri . 'src/read_body.php?passed_id='.$next. '&mailbox='.$urlMailbox.'&sort='.$sort. '&startMessage='.$startMessage.'&show_more=0'. + "&where=$where&what=$what" . '&delete_id='.$passed_id; - $del_next_link = ''.$del_next_link.''; } } - - $nav_row .= '['.$prev_link.$topbar_delimiter.$next_link.']'; - if ( isset($del_prev_link) && isset($del_next_link) ) - $nav_row .= $double_delimiter.'['.$del_prev_link.$topbar_delimiter.$del_next_link.']'; - } - - // Start with Search Results or Message List link. - if (isset($where) && isset($what)) { - $msgs_url .= 'search.php?where=' . urlencode($where) . - '&what=' . urlencode($what) . '&mailbox=' . $urlMailbox; - $msgs_str = _("Search Results"); - } else { - $msgs_url .= 'right_main.php?sort=' . $sort . '&startMessage=' . - $startMessage . '&mailbox=' . $urlMailbox; - $msgs_str = _("Message List"); } - $nav_row .= $double_delimiter . - '[' . $msgs_str . ']'; - - $nav_row .= ''; + $msg_list_href = get_message_list_uri($aMailbox['NAME'], $startMessage, $what); + if ($where == 'search.php') + $search_href = str_replace('read_body.php', 'search.php', $msg_list_href); + else + $search_href = ''; - // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc. - $menu_row = ''; $comp_uri = $base_uri.'src/compose.php' . '?passed_id=' . $passed_id . '&mailbox=' . $urlMailbox . '&startMessage=' . $startMessage . (isset($passed_ent_id) ? '&passed_ent_id='.$passed_ent_id : ''); - - // Start form for reply/reply all/forward.. + + // Start form for reply/reply all/forward.. $target = ''; $on_click=''; - $method='method="post" '; + $method='post'; + $onsubmit=''; if ($compose_new_win == '1') { - if ( $javascript_on ) { - $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"'; + if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { + $compose_width = '640'; + } + if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) { + $compose_height = '550'; + } + if ( checkForJavascript() ) { + $on_click='comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')'; $comp_uri = 'javascript:void(0)'; - $method='method="get" '; + $method='get'; + $onsubmit = 'return false'; } else { - $target = 'target="_blank"'; + $target = '_blank'; } } - $menu_row .= "\n".'
'."\n"; + $oTemplate->assign('nav_on_top', $nav_on_top); - // If Draft folder - create Resume link - if (($mailbox == $draft_folder) && ($save_as_draft)) { - $new_button = 'smaction_draft'; - $comp_alt_string = _("Resume Draft"); - } else if (handleAsSent($mailbox)) { - // If in Sent folder, edit as new - $new_button = 'smaction_edit_new'; - $comp_alt_string = _("Edit Message as New"); - } - // Show Alt URI for Draft/Sent - if (isset($comp_alt_string)) - $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n"; - - $menu_row .= getButton('SUBMIT', 'smaction_reply', _("Reply"), $on_click) . "\n"; - $menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n"; - $menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click); - if ($enable_forward_as_attachment) - $menu_row .= '' . _("Attachment") ."\n"; + $oTemplate->assign('prev_href', $prev_href); + $oTemplate->assign('up_href', $up_href); + $oTemplate->assign('next_href', $next_href); + $oTemplate->assign('del_prev_href', $del_prev_href); + $oTemplate->assign('del_next_href', $del_next_href); + $oTemplate->assign('view_msg_href', $view_msg_href); - $menu_row .= ''.'  '."\n"; + $oTemplate->assign('message_list_href', $msg_list_href); + $oTemplate->assign('search_href', $search_href); - // Form for deletion - $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox; - $menu_row .= '
'; + $oTemplate->assign('form_extra', ''); + $oTemplate->assign('form_method', $method); + $oTemplate->assign('form_target', $target); + $oTemplate->assign('form_onsubmit', $onsubmit); + $oTemplate->assign('compose_href', $comp_uri); + $oTemplate->assign('button_onclick', $on_click); + $oTemplate->assign('forward_as_attachment_enabled', $enable_forward_as_attachment==1); - if (!(isset($passed_ent_id) && $passed_ent_id)) { - $menu_row .= ''; + //FIXME: I am surprised these aren't already given to the template; probably needs to be given at a higher level, so I have NO IDEA if this is the right place to do this... adding them so template can construct its own API calls... we can build those herein too if preferrable + $oTemplate->assign('mailbox', $aMailbox['NAME']); + $oTemplate->assign('passed_id', $passed_id); + $oTemplate->assign('what', $what); - if ($where && $what) { - $menu_row .= ''; - $menu_row .= ''; - } else { - $menu_row .= ''; - $menu_row .= ''; - } - $menu_row .= getButton('SUBMIT', 'delete', _("Delete")); - $menu_row .= '' . _("Bypass Trash"); + // If Draft folder - create Resume link + $resume_draft = $edit_as_new = false; + if (($mailbox == $draft_folder) && ($save_as_draft)) { + $resume_draft = true; 'smaction_draft'; + } else if (handleAsSent($mailbox)) { + $edit_as_new = true; } - else - $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled - - $menu_row .= '' . "\n"; - - - // Add top move link - $menu_row .= '
'; - if ( !(isset($passed_ent_id) && $passed_ent_id) ) { - - $current_box = 'mailbox='.$mailbox.'&sort='.$sort.'&startMessage='.$startMessage; - - // Set subsequent location based on whether or not there is a 'next' message. - if ( isset($next) && $next >= 0 ) { - $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&'; + $oTemplate->assign('can_resume_draft', $resume_draft); + $oTemplate->assign('can_edit_as_new', $edit_as_new); + + $oTemplate->assign('mailboxes', sqimap_mailbox_option_array($imapConnection)); + if (in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true)) { + $delete_url = $base_uri . "src/$where"; + $oTemplate->assign('can_be_deleted', true); + $oTemplate->assign('move_delete_form_action', $base_uri.'src/'.$where); + $oTemplate->assign('delete_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" . + addHidden('msg[0]', $passed_id)."\n" . + addHidden('startMessage', $startMessage)."\n" ); + if (!(isset($passed_ent_id) && $passed_ent_id)) { + $oTemplate->assign('can_be_moved', true); + $oTemplate->assign('move_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" . + addHidden('msg[0]', $passed_id)."\n" ); + $oTemplate->assign('last_move_target', isset($lastTargetMailbox) && !empty($lastTargetMailbox) ? $lastTargetMailbox : ''); + $oTemplate->assign('can_be_copied', $show_copy_buttons==1); } else { - $location = $base_uri . 'src/right_main.php?'; + $oTemplate->assign('can_be_moved', false); + $oTemplate->assign('move_form_extra', ''); + $oTemplate->assign('last_move_target', ''); + $oTemplate->assign('can_be_copied', false); } + } else { + $oTemplate->assign('can_be_deleted', false); + $oTemplate->assign('move_delete_form_action', ''); + $oTemplate->assign('delete_form_extra', ''); + $oTemplate->assign('can_be_moved', false); + $oTemplate->assign('move_form_extra', ''); + $oTemplate->assign('last_move_target', ''); + $oTemplate->assign('can_be_copied', false); + } - $menu_row .= '
'. - ''. - ''. - ''._("Move to:") . - ' '; + global $null; + do_hook('read_body_menu', $null); - $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . ''; + if ($nav_on_top) { + $oTemplate->display('read_menubar_nav.tpl'); + $oTemplate->display('read_menubar_buttons.tpl'); + } else { + $oTemplate->display('read_menubar_buttons.tpl'); + $oTemplate->display('read_menubar_nav.tpl'); } - $menu_row .= ''; - // echo rows, with hooks - $ret = do_hook_function('read_body_menu_top', array($nav_row, $menu_row)); - if (is_array($ret)) { - if (isset($ret[0]) && !empty($ret[0])) { - $nav_row = $ret[0]; - } - if (isset($ret[1]) && !empty($ret[1])) { - $menu_row = $ret[1]; - } - } - echo ''; - echo $nav_on_top ? $nav_row . $menu_row : $menu_row . $nav_row; - echo '
'."\n"; - do_hook('read_body_menu_bottom'); } function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { - global $base_uri; + global $base_uri, $where, $what, $show_html_default, + $oTemplate, $download_href, + $unsafe_image_toggle_href, $unsafe_image_toggle_text; $urlMailbox = urlencode($mailbox); - sqgetGlobalVar('QUERY_STRING', $query_string, SQ_SERVER); + $urlPassed_id = urlencode($passed_id); + $urlPassed_ent_id = urlencode($passed_ent_id); + + $query_string = 'mailbox=' . $urlMailbox . '&passed_id=' . $urlPassed_id . '&passed_ent_id=' . $urlPassed_ent_id; + if (!empty($where)) { + $query_string .= '&where=' . urlencode($where); + } + if (!empty($what)) { + $query_string .= '&what=' . urlencode($what); + } $url = $base_uri.'src/view_header.php?'.$query_string; - $s = "\n" . - html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '' . _("Options") . ":  \n" . - html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '' . - ''._("View Full Header").''; - /* Output the printer friendly link if we are in subtle mode. */ - $s .= ' | ' . - printer_friendly_link($mailbox, $passed_id, $passed_ent_id); - echo $s; - do_hook("read_body_header_right"); - $s = "\n" . - "\n"; - echo $s; + // Build the printer friend link + /* hackydiehack */ + + // Pull "view_unsafe_images" from the URL to find out if the unsafe images + // should be displayed. The default is not to display unsafe images. + if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) { + // If "view_unsafe_images" isn't part of the URL, default to not + // displaying unsafe images. + $view_unsafe_images = false; + } else { + // If "view_unsafe_images" is part of the URL, display unsafe images + // regardless of the value of the URL variable. + // FIXME: Do we really want to display the unsafe images regardless of the value in URL variable? + $view_unsafe_images = true; + } + $pf_params = '?passed_ent_id=' . $urlPassed_ent_id . + '&mailbox=' . $urlMailbox . + '&passed_id=' . $urlPassed_id . + '&view_unsafe_images='. (bool) $view_unsafe_images . + '&show_html_default=' . $show_html_default; + + $links = array(); + $links[] = array ( + 'URL' => $url, + 'Text' => _("View Full Header") + ); + $links[] = array ( + 'URL' => $pf_params, + 'Text' => _("View Printable Version") + ); + $links[] = array ( + 'URL' => $download_href, + 'Text' => _("Download this as a file") + ); + $toggle = html_toggle_href($mailbox, $passed_id, $passed_ent_id, $message); + if (!empty($toggle)) { + $links[] = array ( + 'URL' => $toggle, + 'Text' => $show_html_default==1 ? _("View as plain text") : _("View as HTML") + ); + } + if (!empty($unsafe_image_toggle_href)) { + $links[] = array ( + 'URL' => $unsafe_image_toggle_href, + 'Text' => $unsafe_image_toggle_text + ); + } + + do_hook('read_body_header_right', $links); + + $oTemplate->assign('links', $links); + + return $oTemplate->fetch('read_toolbar.tpl'); } /***************************/ @@ -754,24 +750,28 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { /* get the globals we may need */ -sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); - -sqgetGlobalVar('msgs', $msgs, SQ_SESSION); -sqgetGlobalVar('msort', $msort, SQ_SESSION); sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); -sqgetGlobalVar('server_sort_array', $server_sort_array, SQ_SESSION); if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) { $messages = array(); } - +sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION); +if (is_array($delayed_errors)) { + $oErrorHandler->AssignDelayedErrors($delayed_errors); + sqsession_unregister("delayed_errors"); +} /** GET VARS */ sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET); -sqgetGlobalVar('where', $where, SQ_GET); -sqgetGlobalVar('what', $what, SQ_GET); +if (!sqgetGlobalVar('where', $where, SQ_GET) ) { + $where = 'right_main.php'; +} +/* + * Used as entry key to the list of uid's cached in the mailbox cache + * we use the cached uid's to get the next and prev message. + */ +if (!sqgetGlobalVar('what', $what, SQ_GET) ){ + $what = 0; +} if ( sqgetGlobalVar('show_more', $temp, SQ_GET) ) { $show_more = (int) $temp; } @@ -785,6 +785,12 @@ if ( sqgetGlobalVar('view_hdr', $temp, SQ_GET) ) { $view_hdr = (int) $temp; } +if ( sqgetGlobalVar('account', $temp, SQ_GET) ) { + $iAccount = (int) $temp; +} else { + $iAccount = 0; +} + /** GET/POST VARS */ sqgetGlobalVar('passed_ent_id', $passed_ent_id); sqgetGlobalVar('mailbox', $mailbox); @@ -797,22 +803,106 @@ if ( sqgetGlobalVar('sort', $temp) ) { } if ( sqgetGlobalVar('startMessage', $temp) ) { $startMessage = (int) $temp; +} else { + $startMessage = 1; +} +if(sqgetGlobalVar('show_html_default', $temp)) { + $show_html_default = (int) $temp; } +if(sqgetGlobalVar('view_unsafe_images', $temp)) { + $view_unsafe_images = (int) $temp; + if($view_unsafe_images == 1) { + $show_html_default = 1; + } +} else { + $view_unsafe_images = 0; +} + +/** + * Retrieve mailbox cache + */ +sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); + /* end of get globals */ -global $sqimap_capabilities, $lastTargetMailbox; -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); +$aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); + + +/** + Start code to set the columns to fetch in case of hitting the next/prev link + The reason for this is the fact that the cache can be invalidated which means that the headers + to fetch aren't there anymore. Before they got calculated when the messagelist was shown. + + Todo, better central handling of setting the mailbox options so we do not need to do the stuff below +*/ + +/** + * Replace From => To in case it concerns a draft or sent folder + */ +$aColumns = array(); +if (($mailbox == $sent_folder || $mailbox == $draft_folder) && + !in_array(SQM_COL_TO,$index_order)) { + $aNewOrder = array(); // nice var name ;) + foreach($index_order as $iCol) { + if ($iCol == SQM_COL_FROM) { + $iCol = SQM_COL_TO; + } + $aColumns[$iCol] = array(); + } +} else { + foreach ($index_order as $iCol) { + $aColumns[$iCol] = array(); + } +} + +$aProps = array( + 'columns' => $aColumns, // columns bound settings + 'config' => array( + 'highlight_list' => $message_highlight_list, // row highlighting rules + 'trash_folder' => $trash_folder, + 'sent_folder' => $sent_folder, + 'draft_folder' => $draft_folder)); + +calcFetchColumns($aMailbox,$aProps); + +/** + End code to set the columns to fetch in case of hitting the next/prev link +*/ + + + +/** + * Check if cache is still valid, $what contains the key + * which gives us acces to the array with uid's. At this moment + * 0 is used for a normal message list and search uses 1 as key. This can be + * changed / extended in the future. + * If on a select of a mailbox we detect that the cache should be invalidated due to + * the delete of messages or due to new messages we empty the list with uid's and + * that's what we detect below. + */ +if (!is_array($aMailbox['UIDSET'][$what])) { + fetchMessageHeaders($imapConnection, $aMailbox); +} + +$iSetIndex = $aMailbox['SETINDEX']; +$aMailbox['CURRENT_MSG'][$iSetIndex] = $passed_id; + +/** + * Update the seen state + * and ignore in_array('\\seen',$aMailbox['PERMANENTFLAGS'],true) + */ +if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) { + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\seen'] = true; +} /** * Process Delete from delete-move-next * but only if delete_id was set */ if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) { - sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox); - - sqimap_mailbox_expunge_dmn($delete_id); + handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id)); } /** @@ -820,37 +910,39 @@ if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) { * including header and body */ -$uidvalidity = $mbx_response['UIDVALIDITY']; - -if (!isset($messages[$uidvalidity])) { - $messages[$uidvalidity] = array(); -} -if (!isset($messages[$uidvalidity][$passed_id])) { - $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); - $FirstTimeSee = !$message->is_seen; - $message->is_seen = true; - $messages[$uidvalidity][$passed_id] = $message; +if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'])) { + $message = $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']; + $FirstTimeSee = !$message->is_seen; } else { -// $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); - $message = $messages[$uidvalidity][$passed_id]; - $FirstTimeSee = !$message->is_seen; + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $FirstTimeSee = !$message->is_seen; } +/** + * update message seen status and put in cache + */ +$message->is_seen = true; +$aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message; + if (isset($passed_ent_id) && $passed_ent_id) { - $message = $message->getEntity($passed_ent_id); - if ($message->type0 != 'message' && $message->type1 != 'rfc822') { - $message = $message->parent; - } - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, TRUE); - $rfc822_header = new Rfc822Header(); - $rfc822_header->parseHeader($read); - $message->rfc822_header = $rfc822_header; + $message = $message->getEntity($passed_ent_id); + if ($message->type0 != 'message' && $message->type1 != 'rfc822') { + $message = $message->parent; + } + $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, TRUE); + $rfc822_header = new Rfc822Header(); + $rfc822_header->parseHeader($read); + $message->rfc822_header = $rfc822_header; +} else if ($message->type0 == 'message' && $message->type1 == 'rfc822' && isset($message->entities[0])) { + $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[1.HEADER]", true, $response, $msg, TRUE); + $rfc822_header = new Rfc822Header(); + $rfc822_header->parseHeader($read); + $message->rfc822_header = $rfc822_header; } else { - $passed_ent_id = 0; + $passed_ent_id = 0; } $header = $message->header; -do_hook('html_top'); /****************************************/ /* Block for handling incoming url vars */ @@ -858,28 +950,20 @@ do_hook('html_top'); if (isset($sendreceipt)) { if ( !$message->is_mdnsent ) { - $final_recipient = ''; - if ((isset($identity)) && ($identity != 0)) //Main identity - $final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' )); - if ($final_recipient == '' ) - $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' )); - $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]); - if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) { + $supportMDN = ServerMDNSupport($aMailbox["PERMANENTFLAGS"]); + if ( SendMDN( $mailbox, $passed_id, $message, $imapConnection ) > 0 && $supportMDN ) { ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id); $message->is_mdnsent = true; - $messages[$uidvalidity][$passed_id]=$message; + $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message; } - ClearAttachments(); } } /***********************************************/ /* End of block for handling incoming url vars */ /***********************************************/ -$msgs[$passed_id]['FLAG_SEEN'] = true; - $messagebody = ''; -do_hook('read_body_top'); +do_hook('read_body_top', $null); if ($show_html_default == 1) { $ent_ar = $message->findDisplayEntity(array()); } else { @@ -889,55 +973,32 @@ $cnt = count($ent_ar); for ($i = 0; $i < $cnt; $i++) { $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox); if ($i != $cnt-1) { - $messagebody .= '
'; + $messagebody .= '
'; } } -displayPageHeader($color, $mailbox); -formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response); -formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee); -echo ''; -echo ' '; - -echo ''."\n"; - -$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id); -if ($attachmentsdisplay) { - echo '
'; -echo ' '; -echo ' '; -echo '
'; -echo ' '; -echo ' '; -echo '
'; -// echo ' '; -echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' ); -echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left') - . ''; -echo '
'; -echo '
'; -echo '
'; - echo ' '; - echo ' '; - echo ''; -} -echo '
'; - echo ' '; - echo ' ' . html_tag( 'td', '', 'left', $color[9] ); - echo ' ' . _("Attachments") . ':'; - echo ' '; - echo '
'; - echo '
'; - echo $attachmentsdisplay; - echo '
'; - echo '
'; - echo '
'; +/** + * Write mailbox with updated seen flag information back to cache. + */ +$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; +sqsession_register($mailbox_cache,'mailbox_cache'); +$_SESSION['mailbox_cache'] = $mailbox_cache; + +// message list URI is used in page header when on read_body +$oTemplate->assign('message_list_href', get_message_list_uri($aMailbox['NAME'], $startMessage, $what)); + +displayPageHeader($color, $mailbox,'',''); +formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message,false); +formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee); + +$oTemplate->assign('message_body', $messagebody); +$oTemplate->display('read_message_body.tpl'); + +formatAttachments($message,$ent_ar,$mailbox, $passed_id); /* show attached images inline -- if pref'fed so */ -if (($attachment_common_show_images) && - is_array($attachment_common_show_images_list)) { +if ($attachment_common_show_images && is_array($attachment_common_show_images_list)) { + $images = array(); foreach ($attachment_common_show_images_list as $img) { $imgurl = SM_PATH . 'src/download.php' . '?' . @@ -945,25 +1006,19 @@ if (($attachment_common_show_images) && '&mailbox=' . urlencode($mailbox) . '&ent_id=' . urlencode($img['ent_id']) . '&absolute_dl=true'; - - echo html_tag( 'table', "\n" . - html_tag( 'tr', "\n" . - html_tag( 'td', '' ."\n", 'left' - ) - ) , - 'center', '', 'cellspacing=0 border="0" cellpadding="2"'); + $a = array(); + $a['Name'] = $img['name']; + $a['DisplayURL'] = $imgurl; + $a['DownloadURL'] = $img['download_href']; + $images[] = $a; } + + $oTemplate->assign('images', $images); + $oTemplate->display('read_display_images_inline.tpl'); } -formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE); +formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE); -do_hook('read_body_bottom'); -do_hook('html_bottom'); +do_hook('read_body_bottom', $null); sqimap_logout($imapConnection); -/* sessions are written at the end of the script. it's better to register - them at the end so we avoid double session_register calls */ -sqsession_register($messages,'messages'); - -?> - - +$oTemplate->display('footer.tpl');