<?php
-
/**
* read_body.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This file is used for reading the msgs array and displaying
* the resulting emails in the right frame.
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
* @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;
+function findNextMessage($uidset,$passed_id='backwards') {
+ if ($passed_id=='backwards' || !is_array($uidset)) { // check for backwards compattibilty gpg plugin
+ $passed_id = $uidset;
+ sqgetGlobalVar('server_sort_array',$server_sort_array,SQ_SESSION);
+ $uidset = $server_sort_array;
}
$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;
- }
- }
- } 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;
- }
- }
+ $count = count($uidset) - 1;
+ foreach($uidset as $key=>$value) {
+ if ($passed_id == $value) {
+ if ($key == $count) {
+ break;
}
+ $result = $uidset[$key + 1];
+ break;
}
}
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;
+
+function findPreviousMessage($uidset, $passed_id) {
+ if (!is_array($uidset)) { //obsolete check
+ sqgetGlobalVar('server_sort_array',$server_sort_array,SQ_SESSION);
+ $uidset = $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) {
- break;
- }
- $result = $server_sort_array[$key - 1];
- break;
- }
- }
- } 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;
- }
- }
+ foreach($uidset as $key=>$value) {
+ if ($passed_id == $value) {
+ if ($key != 0) {
+ $result = $uidset[$key - 1];
}
+ break;
}
}
+
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
+ * @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 .
+ $params = '?passed_ent_id=' . urlencode($passed_ent_id) .
'&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id;
+ '&passed_id=' . urlencode($passed_id);
$print_text = _("View Printable Version");
return $result;
}
-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 (array_search('$mdnsent',$aFlags,true) !== false ||
+ array_search('\\*',$aFlags,true) !== false) ? true : false;
+ //$ret = preg_match('/(\x36MDNSent|\\\\\*)/i', $read);
+ //return $ret;
}
function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
- global $username, $attachment_dir,
+ global $username, $attachment_dir,
$version, $attachments, $squirrelmail_language, $default_charset,
$languages, $useSendmail, $domain, $sent_folder,
$popuser, $data_dir, $username;
sprintf( _("Was displayed on %s"), $now );
$special_encoding = '';
- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
$body = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $body);
if (strtolower($default_charset) == 'iso-2022-jp') {
return $success;
}
-function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
+function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) {
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
- $read = sqimap_run_command ($imapConnection, $cmd, true, $response,
- $readmessage, $uid_support);
+ $read = sqimap_run_command ($imapConnection, $cmd, true, $response,
+ $readmessage, TRUE);
}
function ClearAttachments() {
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;
+ $mailbox = $aMailbox['NAME'] ;
+
$header = $message->rfc822_header;
$env = array();
$env[_("Subject")] = str_replace(" "," ",decodeHeader($header->subject));
if ($message->is_mdnsent) {
$env[_("Read receipt")] = _("sent");
} else {
- $env[_("Read receipt")] = _("requested");
- if (!(handleAsSent($mailbox) ||
+ $env[_("Read receipt")] = _("requested");
+ if (!(handleAsSent($mailbox) ||
$message->is_deleted ||
$passed_ent_id)) {
$mdn_url = $PHP_SELF . '&sendreceipt=1';
}
/**
- * 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) {
+function formatMenubar($aMailbox, $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, $uid_support,
+ $startMessage, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
- $delete_move_next_t, $delete_move_next_b;
+ $data_dir, $username, $delete_prev_next_display,
+ $compose_new_win, $javascript_on;
+
+ //FIXME cleanup argument list, use $aMailbox where possible
+ $mailbox = $aMailbox['NAME'];
$topbar_delimiter = ' | ';
$double_delimiter = ' ';
$urlMailbox = urlencode($mailbox);
- $comp_uri = 'src/compose.php' .
- '?passed_id=' . $passed_id .
- '&mailbox=' . $urlMailbox .
- '&startMessage=' . $startMessage .
- (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
-
$msgs_url = $base_uri . 'src/';
// BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc.
}
$nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link;
- $nav_row .= $double_delimiter . '<a href="'.$url.'">'._("View Message").'</a>';
+ $nav_row .= $double_delimiter . '[<a href="'.$url.'">'._("View Message").'</a>]';
// Prev/Next links for regular messages
} else if ( !(isset($where) && isset($what)) ) {
- $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
- $next = findNextMessage($passed_id);
+ $prev = findPreviousMessage($aMailbox['UIDSET'], $passed_id);
+ $next = findNextMessage($aMailbox['UIDSET'],$passed_id);
$prev_link = _("Previous");
if ($prev >= 0) {
}
// Only bother with Delete & Prev and Delete & Next IF
- // we have UID support, and top display is enabled.
- if ( $uid_support && $delete_move_next_t == 'on' ) {
+ // top display is enabled.
+ if ( $delete_prev_next_display == 1 &&
+ array_search('\\deleted', $mbx_response['PERMANENTFLAGS'],true) !== false) {
$del_prev_link = _("Delete & Prev");
if ($prev >= 0) {
$uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
'&mailbox='.$urlMailbox.'&sort='.$sort.
'&startMessage='.$startMessage.'&show_more=0'.
'&delete_id='.$passed_id;
- $del_prev_link = '<a href="'.$uri.'">'.$del_prev_link.'</a>';
+ $del_prev_link = '<a href="'.$uri.'">'.$del_prev_link.'</a>';
}
- $del_prev_link .= $topbar_delimiter;
$del_next_link = _("Delete & Next");
if ($next >= 0) {
'&delete_id='.$passed_id;
$del_next_link = '<a href="'.$uri.'">'.$del_next_link.'</a>';
}
- $del_next_link .= $topbar_delimiter;
- } else {
- $del_prev_link = '';
- $del_next_link = '';
}
- $nav_row .= $prev_link.$topbar_delimiter
- .$del_prev_link.$del_next_link
- .$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.
$msgs_str = _("Message List");
}
$nav_row .= $double_delimiter .
- '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
+ '[<a href="' . $msgs_url . '">' . $msgs_str . '</a>]';
$nav_row .= '</small></td></tr>';
// 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..
+ $target = '';
+ $on_click='';
+ $method='method="post" ';
+ if ($compose_new_win == '1') {
+ if ( $javascript_on ) {
+ $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"';
+ $comp_uri = 'javascript:void(0)';
+ $method='method="get" ';
+ } else {
+ $target = 'target="_blank"';
+ }
+ }
+
+ $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.' style="display: inline">'."\n";
// If Draft folder - create Resume link
if (($mailbox == $draft_folder) && ($save_as_draft)) {
- $comp_alt_uri = $comp_uri . '&smaction=draft';
+ $new_button = 'smaction_draft';
$comp_alt_string = _("Resume Draft");
} else if (handleAsSent($mailbox)) {
// If in Sent folder, edit as new
- $comp_alt_uri = $comp_uri . '&smaction=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_uri)) {
- $menu_row .= $topbar_delimiter;
- $menu_row .= makeComposeLink($comp_alt_uri, $comp_alt_string);
- $menu_row .= $topbar_delimiter;
- }
+ if (isset($comp_alt_string))
+ $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n";
- $delete_link = _("Delete");
- if (!(isset($passed_ent_id) && $passed_ent_id)) {
- $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
- '&message=' . $passed_id . '&';
+ $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";
- if ($where && $what) {
- $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what);
- } else {
- $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
- }
- $delete_link = '<a href="' . $delete_url . '">' . $delete_link . '</a>';
- }
- $menu_row .= $delete_link;
+ $menu_row .= '</form> ';
- $comp_action_uri = $comp_uri . '&smaction=reply';
- $menu_row .= $topbar_delimiter;
- $menu_row .= makeComposeLink($comp_action_uri, _("Reply"));
+ if (array_search('\\deleted', $mbx_response['PERMANENTFLAGS'],true) !== false) {
+ // Form for deletion
+ $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox;
+ $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline">';
- $comp_action_uri = $comp_uri . '&smaction=reply_all';
- $menu_row .= $topbar_delimiter;
- $menu_row .= makeComposeLink($comp_action_uri, _("Reply All"));
+ 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);
+ } else {
+ $menu_row .= addHidden('sort', $sort);
+ $menu_row .= addHidden('startMessage', $startMessage);
+ }
+ $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
+ $menu_row .= '<input type="checkbox" name="bypass_trash">' . _("Bypass Trash");
+ }
+ else
+ $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
- $comp_action_uri = $comp_uri . '&smaction=forward';
- $menu_row .= $topbar_delimiter;
- $menu_row .= makeComposeLink($comp_action_uri, _("Forward"));
-
- if ($enable_forward_as_attachment) {
- $comp_action_uri = $comp_uri . '&smaction=forward_as_attachment';
- $menu_row .= $topbar_delimiter;
- $menu_row .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
+ $menu_row .= '</form>';
}
// Add top move link
$menu_row .= '</small></td><td align="right">';
- if (!(isset($passed_ent_id) && $passed_ent_id)) {
- $menu_row .= '<form action="read_body.php?mailbox='.$mailbox.'&sort='.$sort.'&startMessage='.$startMessage.'&passed_id='.$next.'" method="post">'.
- '<small><input type="hidden" name="show_more" value="0" />'.
- '<input type="hidden" name="move_id" value="'.$passed_id.'" />'._("Move to:") .
+ if ( !(isset($passed_ent_id) && $passed_ent_id) &&
+ array_search('\\deleted', $mbx_response['PERMANENTFLAGS'],true) !== false) {
+
+ $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> '.
- '<input type="submit" value="' . _("Move") . '" style="padding: 0px; margin: 0px"/>'.
- '</small></form>';
+ $menu_row .= '</select> ';
+
+ $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '</form>';
}
$menu_row .= '</td></tr>';
// echo rows, with hooks
- do_hook('read_body_menu_top');
+ $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";
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri;
+ global $base_uri, $where, $what;
$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 = "<TR>\n" .
}
/* end of get globals */
-global $uid_support, $sqimap_capabilities, $auto_expunge, $lastTargetMailbox;
+global $sqimap_capabilities, $lastTargetMailbox;
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, 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);
+global $allow_thread_sort, $auto_expunge;
-// if ($auto_expunge) {
-// sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-// }
+if ($allow_thread_sort && getPref($data_dir, $username, "thread_$mailbox",0)) {
+ $aMailbox['SORT_METHOD'] = 'THREAD';
+} else if ($allow_server_sort) {
+ $aMailbox['SORT_METHOD'] = 'SERVER';
+} else {
+ $aMailbox['SORT_METHOD'] = 'SQUIRREL';
}
+sqgetGlobalVar('aLastSelectedMailbox',$aMailbox,SQ_SESSION);
+$aMailbox['UIDSET'] = $server_sort_array;
+$aMailbox['SORT'] = $sort;
+$aMailbox['NAME'] = $mailbox;
+$aMailbox['EXISTS'] = $mbx_response['EXISTS'];
+$aMailbox['AUTO_EXPUNGE'] = $auto_expunge;
+$aMailbox['MSG_HEADERS'] = $msgs;
+
/**
- * Process Move from delete-move-next
- * but only if move_id and target_mailbox were set
+ * Process Delete from delete-move-next
+ * but only if delete_id was set
*/
-if ( sqgetGlobalVar('move_id', $move_id, SQ_POST) &&
- sqgetGlobalVar('targetMailbox', $targetMailbox, SQ_POST) ) {
- // Move message
-// sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
-// sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted', true);
-
-// if ($auto_expunge) {
-// sqimap_mailbox_expunge($imapConnection, $mailbox, true);
-// }
-
-// if ($targetMailbox != $lastTargetMailbox) {
-// $lastTargetMailbox = $targetMailbox;
-// sqsession_register('lastTargetMailbox' , $lastTargetMailbox);
-// }
+if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
+ sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+ sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox,$delete_id);
}
-
/**
* $message contains all information about the message
* including header and body
if (!isset($messages[$uidvalidity])) {
$messages[$uidvalidity] = array();
}
-if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
+if (!isset($messages[$uidvalidity][$passed_id]) || $delete_id) {
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$FirstTimeSee = !$message->is_seen;
$message->is_seen = true;
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, $uid_support);
+ $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;
$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 ) {
- ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id, $uid_support);
+ ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id);
$message->is_mdnsent = true;
$messages[$uidvalidity][$passed_id]=$message;
}
}
displayPageHeader($color, $mailbox);
-formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
-formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
+formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
+formatEnvheader($aMailbox, $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>' . html_tag( 'td', '<br>'. $messagebody."\n", 'left')
. '</tr>';
echo ' </table>';
-echo ' </td></tr>';
+echo ' </td></tr>';
echo ' </table></td></tr>';
echo ' </table>';
echo ' </td></tr>';
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 ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo ' <tr><td>';
}
}
-// If a bar at the bottom is also wanted, print menu bar again,
-// only upside down.
-if ($delete_move_next_b != 'off') {
- formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE);
-}
-
+formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE);
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
-/* sessions are written at the end of the script. it's better to register
+/* 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');