';
+ $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" ';
@@ -649,60 +631,44 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
}
// 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 .= ' ';
- 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?';
- }
+ if ( !(isset($passed_ent_id) && $passed_ent_id) &&
+ in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) {
- $menu_row .= '';
+ $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . '';
}
$menu_row .= ' \n" .
- html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '' . _("Options") . ": \n" .
- html_tag( 'td', '', 'left', '', 'VALIGN="MIDDLE" WIDTH="80%"' ) . '' .
+ $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. */
@@ -761,8 +727,8 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
echo $s;
do_hook("read_body_header_right");
- $s = " \n" .
- " \n";
+ $s = " \n" .
+ " \n";
echo $s;
}
@@ -778,19 +744,19 @@ 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();
}
/** 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;
}
@@ -816,22 +782,36 @@ if ( sqgetGlobalVar('sort', $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);
+ 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);
}
/**
@@ -839,37 +819,30 @@ 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;
+ $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 */
@@ -878,15 +851,15 @@ do_hook('html_top');
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();
}
@@ -895,7 +868,7 @@ if (isset($sendreceipt)) {
/* End of block for handling incoming url vars */
/***********************************************/
-$msgs[$passed_id]['FLAG_SEEN'] = true;
+
$messagebody = '';
do_hook('read_body_top');
@@ -908,13 +881,13 @@ $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 .= '';
echo ' ';
echo ' ';
@@ -923,16 +896,16 @@ echo ' ';
// echo ' ';
echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
-echo ' ' . html_tag( 'td', ' ' . html_tag( 'td', ' ';
echo '
';
-echo ' ';
+echo ' ';
echo '
';
echo '
';
echo ' ';
echo ' ';
echo ' ';
- echo ' ' . html_tag( 'td', '', 'left', $color[9] );
+ echo ' ' . html_tag( 'td', '', 'left', $color[9] );
echo ' ' . _("Attachments") . ': ';
echo ' ';
echo ' ';
@@ -949,8 +922,8 @@ if ($attachmentsdisplay) {
echo '
';
echo '
';
echo ' ';
- echo '
';
@@ -967,22 +940,21 @@ if (($attachment_common_show_images) &&
echo html_tag( 'table', "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', ' 
' ."\n", 'left'
+ html_tag( 'td', '