<?php
+
/**
* read_body.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This file is used for reading the msgs array and displaying
* the resulting emails in the right frame.
*
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
/* 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/imap_asearch.php'); // => 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
* @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;
}
/**
* @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=' . urlencode($passed_ent_id) .
- '&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . urlencode($passed_id);
-
- $print_text = _("View Printable Version");
-
- $result = '';
- /* Output the link. */
- if ($javascript_on) {
- $result = '<script language="javascript" type="text/javascript">' . "\n" .
- '<!--' . "\n" .
- " function printFormat() {\n" .
- ' window.open("../src/printer_friendly_main.php' .
- $params . '","Print","width=800,height=600");' . "\n".
- " }\n" .
- "// -->\n" .
- "</script>\n" .
- "<a href=\"javascript:printFormat();\">$print_text</a>\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 = '<a target="_blank" href="../src/printer_friendly_bottom.php' .
- "$params\">$print_text</a>\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;
+ }
}
- return $result;
+ /*
+ * Normal single part message so check its type.
+ */
+ else {
+ if($type0 == 'text' && $type1 == 'html') {
+ $has_html = true;
+ }
+ }
+ 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;
+ global $username, $attachment_dir, $popuser, $username, $color,
+ $version, $squirrelmail_language, $default_charset,
+ $languages, $useSendmail, $domain, $sent_folder;
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');
$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';
$special_encoding = '7bit';
}
}
+ } elseif (sq_is8bit($body)) {
+ $special_encoding = '8bit';
}
$part1 = new Message();
$part1->setBody($body);
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,
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . '<br>' .
- _("Server replied: ") . $deliver->dlv_ret_nr . ' '.
- $deliver->dlv_server_msg;
- require_once(SM_PATH . 'functions/display_messages.php');
+ $msg = _("Message not sent.") . "<br />\n" .
+ $deliver->dlv_msg;
+ if (! empty($deliver->dlv_server_msg)) {
+ $msg.= '<br />' .
+ _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' .
+ nl2br(htmlspecialchars($deliver->dlv_server_msg));
+ }
plain_error_message($msg, $color);
} else {
unset ($deliver);
if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
- sqimap_append ($imapConnection, $sent_folder, $length);
+ $sid = sqimap_append ($imapConnection, $sent_folder, $length);
require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
$imap_deliver = new Deliver_IMAP();
$imap_deliver->mail($composeMessage, $imapConnection);
- sqimap_append_done ($imapConnection);
+ sqimap_append_done ($imapConnection, $sent_folder);
unset ($imap_deliver);
}
}
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;
+ $PHP_SELF, $oTemplate;
$string = '';
if ((is_array($recipients)) && (isset($recipients[0]))) {
}
}
- $cnt = count($recipients);
- foreach($recipients as $r) {
- $add = decodeHeader($r->getAddress(true));
- if ($string) {
- $string .= '<BR>' . $add;
- } else {
- $string = $add;
- if ($cnt > 1) {
- $string .= ' (<A HREF="'.$url;
- if ($show) {
- $string .= '">'._("less").'</A>)';
- } else {
- $string .= '">'._("more").'</A>)';
- 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();
$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');
}
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 = '<script language="JavaScript" type="text/javascript">' . "\n";
- $script .= '<!--'. "\n";
- $script .= 'if(window.confirm("' .
- _("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?") .
- '")) { '."\n" .
- ' sendMDN()'.
- '}' . "\n";
- $script .= '// -->'. "\n";
- $script .= '</script>'. "\n";
- echo $script;
- }
- $env[_("Read receipt")] .= ' <a href="' . $mdn_url . '">[' .
- _("Send read receipt now") . ']</a>';
- }
- }
+ $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('first_time_reading', $FirstTimeSee);
+ $oTemplate->assign('send_receipt_href', $mdn_url);
+
+ $env[_("Read Receipt")] = $oTemplate->fetch('read_handle_receipt.tpl');
}
}
}
- $s = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="2" BORDER="0"';
- $s .= ' ALIGN="center" BGCOLOR="'.$color[0].'">';
- foreach ($env as $key => $val) {
- if ($val) {
- $s .= '<TR>';
- $s .= html_tag('TD', '<B>' . $key . ': </B>', 'RIGHT', '', 'VALIGN="TOP" WIDTH="20%"') . "\n";
- $s .= html_tag('TD', $val, 'left', '', 'VALIGN="TOP" WIDTH="80%"') . "\n";
- $s .= '</TR>';
+ $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 '<TABLE BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
- ' CELLSPACING="0" BORDER="0" ALIGN="center">'."\n";
- echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
- $color[4].'"></TD></TR><TR><TD align=center>'."\n";
- echo $s;
- do_hook('read_body_header');
- formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color);
- echo '</TABLE>';
- echo '</TD></TR><TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.$color[4].'"></TD></TR>'."\n";
- echo '</TABLE>';
+
+ $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
- *
+ * Format message toolbar
+ *
* @param string $mailbox Name of current mailbox
* @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;
+
+ //FIXME cleanup argument list, use $aMailbox where possible
+ $mailbox = $aMailbox['NAME'];
- $topbar_delimiter = ' | ';
- $double_delimiter = ' ';
$urlMailbox = urlencode($mailbox);
$msgs_url = $base_uri . 'src/';
- // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc.
- $nav_row = '<tr><td align="left" colspan="2" style="border: 1px solid '.$color[9].';"><small>';
-
// 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);
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 = '<a href="'
- . set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id)
- . '">' . $prev_link . '</a>';
+ $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 = '<a href="'
- . set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
- . '">' . $next_link . '</a>';
+ $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 .= '<a href="'.$url.'">'._("Up").'</a>';
+ $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 . '[<a href="'.$url.'">'._("View Message").'</a>]';
+ $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 = '<a href="'.$uri.'">'.$prev_link.'</a>';
}
- $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 = '<a href="'.$uri.'">'.$next_link.'</a>';
}
// 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 = '<a href="'.$uri.'">'.$del_prev_link.'</a>';
}
- $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 = '<a href="'.$uri.'">'.$del_next_link.'</a>';
}
}
-
- $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 .
- '[<a href="' . $msgs_url . '">' . $msgs_str . '</a>]';
-
- $nav_row .= '</small></td></tr>';
-
+ $list_xtra = "?where=read_body.php&what=$what&mailbox=" . $urlMailbox.
+ "&startMessage=$startMessage";
+ $msg_list_href = $base_uri .'src/right_main.php'. $list_xtra;
+ $search_href = $where=='search.php' ? $base_uri .'src/search.php?'.$list_xtra : '';
- // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc.
- $menu_row = '<tr bgcolor="'.$color[9].'"><td><small>';
$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=' onclick="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".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.' style="display: inline">'."\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";
+ $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 .= 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 .= '<input type="checkbox" name="smaction_attache">' . _("As Attachment") .' '."\n";
+ $oTemplate->assign('message_list_href', $msg_list_href);
+ $oTemplate->assign('search_href', $search_href);
- $menu_row .= '</form> ';
+ $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);
- // Form for deletion
- $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox;
- $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline">';
+ //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 (!(isset($passed_ent_id) && $passed_ent_id)) {
- $menu_row .= addHidden('message', $passed_id);
-
- if ($where && $what) {
- $menu_row .= addHidden('where', $where);
- $menu_row .= addHidden('what', $what);
+ // 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;
+ }
+ $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 {
- $menu_row .= addHidden('sort', $sort);
- $menu_row .= addHidden('startMessage', $startMessage);
+ $oTemplate->assign('can_be_moved', false);
+ $oTemplate->assign('move_form_extra', '');
+ $oTemplate->assign('last_move_target', '');
+ $oTemplate->assign('can_be_copied', false);
}
- $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
- $menu_row .= '<input type="checkbox" name="bypass_trash">' . _("Bypass Trash");
+ } 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);
}
- else
- $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
-
- $menu_row .= '</form>';
+ global $null;
+ do_hook('read_body_menu', $null);
- // Add top move link
- $menu_row .= '</small></td><td align="right">';
- 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.'&';
- } elseif (isset($prev) && $prev >= 0) {
- $location = $base_uri . 'src/read_body.php?passed_id='.$prev.'&';
- } else {
- $location = $base_uri . 'src/right_main.php?';
- }
-
- $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post" style="display: inline">'.
- '<small>'.
- addHidden('show_more', '0' ).
- addHidden('dmn', '1').
- addHidden('location', $location.$current_box).
- addHidden('msg[0]', $passed_id) . _("Move to:") .
- '<select name="targetMailbox" style="padding: 0px; margin: 0px">';
-
- if (isset($lastTargetMailbox) && !empty($lastTargetMailbox)) {
- $menu_row .= sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)));
- } else {
- $menu_row .= sqimap_mailbox_option_list($imapConnection);
- }
- $menu_row .= '</select> ';
-
- $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '</form>';
+ 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 .= '</td></tr>';
- // 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 '<table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
- echo $nav_on_top ? $nav_row . $menu_row : $menu_row . $nav_row;
- echo '</table>'."\n";
- do_hook('read_body_menu_bottom');
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri, $where, $what;
-
+ global $base_uri, $where, $what, $show_html_default,
+ $oTemplate, $download_href,
+ $unsafe_image_toggle_href, $unsafe_image_toggle_text;
+
$urlMailbox = urlencode($mailbox);
$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 = "<TR>\n" .
- html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '<B>' . _("Options") . ": </B></TD>\n" .
- html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '<SMALL>' .
- '<a href="'.$url.'">'._("View Full Header").'</a>';
-
- /* 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 = "</SMALL></TD>\n" .
- "</TR>\n";
- echo $s;
+ // Build the printer friend link
+ /* hackydiehack */
+ if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
+ $view_unsafe_images = false;
+ } else {
+ $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');
}
/***************************/
/* 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;
}
$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);
}
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));
}
/**
* 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;
+ $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 */
if (isset($sendreceipt)) {
if ( !$message->is_mdnsent ) {
$final_recipient = '';
- if ((isset($identity)) && ($identity != 0)) //Main identity
+ 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"]);
+ $supportMDN = ServerMDNSupport($aMailbox["PERMANENTFLAGS"]);
if ( SendMDN( $mailbox, $passed_id, $final_recipient, $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 {
for ($i = 0; $i < $cnt; $i++) {
$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
if ($i != $cnt-1) {
- $messagebody .= '<hr noshade size=1>';
+ $messagebody .= '<hr />';
}
}
-displayPageHeader($color, $mailbox);
-formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
-formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
-echo '<table width="100%" cellpadding="0" cellspacing="0" align="center" border="0">';
-echo ' <tr><td>';
-echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[9].'">';
-echo ' <tr><td>';
-echo ' <table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
-echo ' <tr bgcolor="'.$color[4].'"><td>';
-// echo ' <table cellpadding="1" cellspacing="5" align="left" border="0">';
-echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
-echo ' <tr>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
- . '</tr>';
-echo ' </table>';
-echo ' </td></tr>';
-echo ' </table></td></tr>';
-echo ' </table>';
-echo ' </td></tr>';
-
-echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
- $color[4].'"></TD></TR>'."\n";
-
-$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
-if ($attachmentsdisplay) {
- echo ' </table>';
- echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
- echo ' <tr><td>';
- echo ' <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
- echo ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
- echo ' <b>' . _("Attachments") . ':</b>';
- echo ' </td></tr>';
- echo ' <tr><td>';
- echo ' <table width="100%" cellpadding="2" cellspacing="2" align="center"'.' border="0" bgcolor="'.$color[0].'"><tr><td>';
- echo $attachmentsdisplay;
- echo ' </td></tr></table>';
- echo ' </td></tr></table>';
- echo ' </td></tr>';
- echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
- $color[4].'"></TD></TR>';
-}
-echo '</table>';
+/**
+ * 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;
+
+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' .
'?' .
'&mailbox=' . urlencode($mailbox) .
'&ent_id=' . urlencode($img['ent_id']) .
'&absolute_dl=true';
-
- echo html_tag( 'table', "\n" .
- html_tag( 'tr', "\n" .
- html_tag( 'td', '<img src="' . $imgurl . '">' ."\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');
?>
-</body>
-</html>
projects / squirrelmail.git / blobdiff