';
+ $s = '| ';
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
@@ -484,7 +496,6 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$msgs_str = _("Message List");
}
$s .= '' . $msgs_str . '';
- $s .= $topbar_delimiter;
$delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
'&message=' . $passed_id . '&';
@@ -494,6 +505,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
} else {
$delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
}
+ $s .= $topbar_delimiter;
$s .= '' . _("Delete") . '';
}
@@ -512,7 +524,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
if (($mailbox == $draft_folder) && ($save_as_draft)) {
$comp_alt_uri = $comp_uri . '&action=draft';
$comp_alt_string = _("Resume Draft");
- } else if ($mailbox == $sent_folder) {
+ } else if (handleAsSent($mailbox)) {
$comp_alt_uri = $comp_uri . '&action=edit_as_new';
$comp_alt_string = _("Edit Message as New");
}
@@ -547,6 +559,32 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
/* code for navigating through attached message/rfc822 messages */
$url = set_url_var($PHP_SELF, 'passed_ent_id',0);
$s .= ''._("View Message").'';
+ $entities = array();
+ $entity_count = array();
+ $c = 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");
+ $next_link = _("Next");
+ if($entities[$passed_ent_id] > 1) {
+ $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1];
+ $prev_link = '' . $prev_link . '';
+ }
+ if($entities[$passed_ent_id] < $c) {
+ $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1];
+ $next_link = '' . $next_link . '';
+ }
+ $s .= $topbar_delimiter . $prev_link;
$par_ent_id = $message->parent->entity_id;
if ($par_ent_id) {
$par_ent_id = substr($par_ent_id,0,-2);
@@ -554,24 +592,25 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
$s .= ''._("Up").'';
}
+ $s .= $topbar_delimiter . $next_link;
}
$s .= ' | ' . "\n" . '';
$comp_action_uri = $comp_uri . '&action=forward';
$s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '';
- $s .= $topbar_delimiter;
if ($enable_forward_as_attachment) {
$comp_action_uri = $comp_uri . '&action=forward_as_attachment';
- $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '';
$s .= $topbar_delimiter;
+ $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '';
}
$comp_action_uri = decodeHeader($comp_uri . '&action=reply');
- $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '';
$s .= $topbar_delimiter;
+ $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '';
$comp_action_uri = $comp_uri . '&action=reply_all';
+ $s .= $topbar_delimiter;
$s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . '';
$s .= ' |
';
do_hook("read_body_menu_top");
@@ -580,14 +619,14 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri;
+ global $base_uri, $language_align;
$urlMailbox = urlencode($mailbox);
$url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING'];
- $s = "\n" .
- '| ' . _("Options") . ": | \n" .
- '' .
+ $s = "\n" .
+ '| ' . _("Options") . ": | \n" .
+ '' .
''._("View Full Header").'';
/* Output the printer friendly link if we are in subtle mode. */
@@ -607,18 +646,18 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
/* get the globals we may need */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
$onetimepad = $_SESSION['onetimepad'];
-$msgs = $_SESSION['msgs'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
+$msgs = $_SESSION['msgs'];
+$base_uri = $_SESSION['base_uri'];
+$delimiter = $_SESSION['delimiter'];
if (isset($_GET['passed_id'])) {
- $passed_id = $_GET['passed_id'];
+ $passed_id = (int) $_GET['passed_id'];
}
elseif (isset($_POST['passed_id'])) {
- $passed_id = $_POST['passed_id'];
+ $passed_id = (int) $_POST['passed_id'];
}
if (isset($_GET['passed_ent_id'])) {
@@ -633,25 +672,25 @@ if (isset($_GET['sendreceipt'])) {
}
if (isset($_GET['sort'])) {
- $sort = $_GET['sort'];
+ $sort = (int) $_GET['sort'];
}
elseif (isset($_POST['sort'])) {
- $sort = $_POST['sort'];
+ $sort = (int) $_POST['sort'];
}
if (isset($_GET['startMessage'])) {
- $startMessage = $_GET['startMessage'];
+ $startMessage = (int) $_GET['startMessage'];
}
elseif (isset($_POST['startMessage'])) {
- $startMessage = $_POST['startMessage'];
+ $startMessage = (int) $_POST['startMessage'];
}
if (isset($_GET['show_more'])) {
- $show_more = $_GET['show_more'];
+ $show_more = (int) $_GET['show_more'];
}
if (isset($_GET['show_more_cc'])) {
- $show_more_cc = $_GET['show_more_cc'];
+ $show_more_cc = (int) $_GET['show_more_cc'];
}
if (isset($_GET['show_more_bcc'])) {
- $show_more_bcc = $_GET['show_more_bcc'];
+ $show_more_bcc = (int) $_GET['show_more_bcc'];
}
if (isset($_GET['mailbox'])) {
$mailbox = $_GET['mailbox'];
@@ -666,7 +705,7 @@ if (isset($_GET['what'])) {
$what = $_GET['what'];
}
if (isset($_GET['view_hdr'])) {
- $view_hdr = $_GET['view_hdr'];
+ $view_hdr = (int) $_GET['view_hdr'];
}
if (isset($_SESSION['server_sort_array'])) {
$server_sort_array = $_SESSION['server_sort_array'];
@@ -699,7 +738,7 @@ if (isset($mailbox)) {
}
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
/**
@@ -708,10 +747,10 @@ $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, t
*/
$uidvalidity = $mbx_response['UIDVALIDITY'];
-
+
if (!isset($messages[$uidvalidity])) {
$messages[$uidvalidity] = array();
-}
+}
if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$FirstTimeSee = !$message->is_seen;
@@ -769,8 +808,8 @@ if (isset($sendreceipt)) {
/***********************************************/
$msgs[$passed_id]['FLAG_SEEN'] = true;
-
-$messagebody = '';
+
+$messagebody = '';
do_hook('read_body_top');
if ($show_html_default == 1) {
$ent_ar = $message->findDisplayEntity(array());
@@ -788,37 +827,42 @@ for ($i = 0; $i < $cnt; $i++) {
displayPageHeader($color, $mailbox);
formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response);
formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee);
-echo '';
+echo '';
echo ' ';
-echo ' ';
+echo ' ';
echo ' ';
-echo ' ';
+echo ' ';
echo ' ';
-echo ' ';
-echo ' '. html_tag( 'td', '
'. $messagebody."\n", 'left').'';
+echo ' ';
+echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left')
+ . ' ';
echo ' ';
echo ' ';
echo ' | ';
echo ' ';
echo ' ';
+echo ' | '."\n";
+
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
echo ' ';
echo ' ';
echo ' ';
- echo ' ';
- echo ' ';
+ echo ' ';
+ echo ' | ';
echo ' ' . _("Attachments") . ':';
echo ' | ';
echo ' ';
echo ' | ';
echo $attachmentsdisplay;
echo ' |
';
- echo ' | | ';
- echo ' | ';
- echo ' ';
+ echo ' | ';
+ echo ' | ';
echo ' ';
+ echo ' | ';
}
echo ' ';
| | | |