<?php
+
/**
* read_body.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 $server_sort_array;
+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 = -1;
- $count = count($server_sort_array) - 1;
- foreach($server_sort_array as $key=>$value) {
+ $count = count($uidset) - 1;
+ foreach($uidset as $key=>$value) {
if ($passed_id == $value) {
if ($key == $count) {
break;
}
- $result = $server_sort_array[$key + 1];
+ $result = $uidset[$key + 1];
break;
}
}
* @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 $server_sort_array;
+
+function findPreviousMessage($uidset, $passed_id) {
+ if (!is_array($uidset)) {
+ return -1;
+ }
$result = -1;
- foreach($server_sort_array as $key=>$value) {
+ foreach($uidset as $key=>$value) {
if ($passed_id == $value) {
if ($key != 0) {
- $result = $server_sort_array[$key - 1];
+ $result = $uidset[$key - 1];
}
break;
}
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;
+ return ( in_array('$mdnsent',$aFlags,true) ||
+ in_array('\\*',$aFlags,true) ) ;
}
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);
+ 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';
$success = $deliver->finalizeStream($stream);
}
if (!$success) {
- $msg = $deliver->dlv_msg . '<br>' .
+ $msg = $deliver->dlv_msg . '<br />' .
_("Server replied: ") . $deliver->dlv_ret_nr . ' '.
$deliver->dlv_server_msg;
require_once(SM_PATH . 'functions/display_messages.php');
$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;
- }
- }
+ 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;
}
foreach($recipients as $r) {
$add = decodeHeader($r->getAddress(true));
if ($string) {
- $string .= '<BR>' . $add;
+ $string .= '<br />' . $add;
} else {
$string = $add;
if ($cnt > 1) {
- $string .= ' (<A HREF="'.$url;
+ $string .= ' (<a href="'.$url;
if ($show) {
- $string .= '">'._("less").'</A>)';
+ $string .= '">'._("less").'</a>)';
} else {
- $string .= '">'._("more").'</A>)';
+ $string .= '">'._("more").'</a>)';
break;
}
}
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;
+ $squirrelmail_language;
+
+ $mailbox = $aMailbox['NAME'];
$header = $message->rfc822_header;
$env = array();
}
}
- $s = '<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="2" BORDER="0"';
- $s .= ' ALIGN="center" BGCOLOR="'.$color[0].'">';
+ $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>';
+ $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>';
}
}
- 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 '<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>';
+ echo '</table>';
+ echo '</td></tr><tr><td height="5" colspan="2" bgcolor="'.$color[4].'"></td></tr>'."\n";
+ echo '</table>';
}
/**
* @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, $removedVar, $nav_on_top = TRUE) {
global $base_uri, $draft_folder, $where, $what, $color, $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;
+ //FIXME cleanup argument list, use $aMailbox where possible
+ $mailbox = $aMailbox['NAME'];
+
$topbar_delimiter = ' | ';
$double_delimiter = ' ';
$urlMailbox = urlencode($mailbox);
$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);
+ } else if ( true ) { //!(isset($where) && isset($what)) ) {
+ /**
+ * Check if cache is still valid
+ */
+ if (!is_array($aMailbox['UIDSET'][$what])) {
+ fetchMessageHeaders($imapConnection, $aMailbox);
+ }
+ $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.
'&mailbox='.$urlMailbox.'&sort='.$sort.
+ "&where=$where&what=$what" .
'&startMessage='.$startMessage.'&show_more=0';
$prev_link = '<a href="'.$uri.'">'.$prev_link.'</a>';
}
if ($next >= 0) {
$uri = $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 &&
- array_search('\\deleted', $mbx_response['PERMANENTFLAGS'],true) !== false) {
+ in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
$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'.
+ "&where=$where&what=$what" .
'&delete_id='.$passed_id;
$del_prev_link = '<a href="'.$uri.'">'.$del_prev_link.'</a>';
}
$uri = $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>';
}
}
// 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_url .= "$where?where=read_body.php&what=$what&mailbox=" . $urlMailbox.
+ "&startMessage=$startMessage";
+ if ($where == 'search.php') {
$msgs_str = _("Search Results");
} else {
- $msgs_url .= 'right_main.php?sort=' . $sort . '&startMessage=' .
- $startMessage . '&mailbox=' . $urlMailbox;
$msgs_str = _("Message List");
}
$nav_row .= $double_delimiter .
}
// 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', $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);
+ $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";
+ $menu_row .= '<input type="checkbox" name="smaction_attache" />' . _("As Attachment") .' '."\n";
$menu_row .= '</form> ';
- 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">';
+ if ( in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
+ // Form for deletion. Form is handled by the originating display in $where. This is right_main.php or search.php
+ $delete_url = $base_uri . "src/$where";
+ $menu_row .= '<form name="deleteMessageForm" action="'.$delete_url.'" method="post" style="display: inline">';
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");
+ $menu_row .= addHidden('mailbox', $aMailbox['NAME']);
+ $menu_row .= addHidden('msg[0]', $passed_id);
+ $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
}
- else
- $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
$menu_row .= '</form>';
}
// Add top move link
$menu_row .= '</small></td><td align="right">';
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?';
- }
+ in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
- $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post" style="display: inline">'.
+ $menu_row .= '<form name="moveMessageForm" action="'.$base_uri.'src/'.$where.'?'.'" 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:") .
+
+ addHidden('mailbox',$aMailbox['NAME']) .
+ addHidden('msg[0]', $passed_id) . _("Move to:") .
'<select name="targetMailbox" style="padding: 0px; margin: 0px">';
if (isset($lastTargetMailbox) && !empty($lastTargetMailbox)) {
}
$menu_row .= '</select> ';
- $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '</form>';
+ $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '</form>';
}
$menu_row .= '</td></tr>';
$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>' .
+ $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. */
printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
echo $s;
do_hook("read_body_header_right");
- $s = "</SMALL></TD>\n" .
- "</TR>\n";
+ $s = "</small></td>\n" .
+ "</tr>\n";
echo $s;
}
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();
}
/** 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';
+}
+if (!sqgetGlobalVar('what', $what, SQ_GET) ){
+ $what = 0;
+}
if ( sqgetGlobalVar('show_more', $temp, SQ_GET) ) {
$show_more = (int) $temp;
}
}
if ( sqgetGlobalVar('startMessage', $temp) ) {
$startMessage = (int) $temp;
+} else {
+ $startMessage = 1;
}
+/**
+ * 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);
+$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array('setindex' => $what),array());
+
+/**
+ * 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,$mbx_response,$server_sort_array);
+ handleMessageListForm($imapConnection,$aMailbox,$sButton='setDeleted', array($delete_id));
+// sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+// sqimap_mailbox_expunge_dmn($imapConnection,$aMailbox,$delete_id);
}
/**
* including header and body
*/
-$uidvalidity = $mbx_response['UIDVALIDITY'];
-
-if (!isset($messages[$uidvalidity])) {
- $messages[$uidvalidity] = array();
-}
-if (!isset($messages[$uidvalidity][$passed_id]) || $delete_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 {
- $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');
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 noshade size="1" />';
}
}
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,false);
+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 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')
+echo ' <tr>' . html_tag( 'td', '<br />'. $messagebody."\n", 'left')
. '</tr>';
echo ' </table>';
echo ' </td></tr>';
echo ' </table>';
echo ' </td></tr>';
-echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
- $color[4].'"></TD></TR>'."\n";
+echo '<tr><td height="5" colspan="2" bgcolor="'.
+ $color[4].'"></td></tr>'."\n";
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($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 '<tr><td height="5" colspan="2" bgcolor="'.
+ $color[4].'"></td></tr>';
}
echo '</table>';
echo html_tag( 'table', "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', '<img src="' . $imgurl . '">' ."\n", 'left'
+ html_tag( 'td', '<img src="' . $imgurl . '" />' ."\n", 'left'
)
) ,
- 'center', '', 'cellspacing=0 border="0" cellpadding="2"');
+ 'center', '', 'cellspacing="0" border="0" cellpadding="2"');
}
}
-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');
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');
-
+/* add the mailbox to the cache */
+$mailbox_cache[$aMailbox['NAME']] = $aMailbox;
+sqsession_register($mailbox_cache,'mailbox_cache');
?>
-</body>
-</html>
+</body></html>