';
+
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
$msgs_url .= 'search.php?where=' . urlencode($where) .
@@ -490,8 +486,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$startMessage . '&mailbox=' . $urlMailbox;
$msgs_str = _("Message List");
}
- $sNav = '' . $msgs_str . '';
- $sNav .= $topbar_delimiter;
+ $s .= '' . $msgs_str . '';
+ $s .= $topbar_delimiter;
$delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
'&message=' . $passed_id . '&';
@@ -501,7 +497,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
} else {
$delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
}
- $sNav .= '' . _("Delete") . '';
+ $s .= '' . _("Delete") . '';
}
$comp_uri = $base_uri . 'src/compose.php' .
@@ -524,12 +520,12 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$comp_alt_string = _("Edit Message as New");
}
if (isset($comp_alt_uri)) {
- $sCmp .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . '';
- $sCmp .= $topbar_delimiter;
+ $s .= $topbar_delimiter;
+ $s .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . '';
}
-// $sNav .= ' | ';
- $sNav .= ' ';
+ $s .= ' | ';
+
if (!(isset($where) && isset($what)) && !$passed_ent_id) {
$prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
$next = findNextMessage($passed_id);
@@ -537,23 +533,23 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
'&mailbox='.$urlMailbox.'&sort='.$sort.
'&startMessage='.$startMessage.'&show_more=0';
- $sNav .= ''._("Previous").'';
+ $s .= ''._("Previous").'';
} else {
- $sNav .= _("Previous");
+ $s .= _("Previous");
}
- $sNav .= $topbar_delimiter;
+ $s .= $topbar_delimiter;
if ($next != -1) {
$uri = $base_uri . 'src/read_body.php?passed_id='.$next.
'&mailbox='.$urlMailbox.'&sort='.$sort.
'&startMessage='.$startMessage.'&show_more=0';
- $sNav .= ''._("Next").'';
+ $s .= ''._("Next").'';
} else {
- $sNav .= _("Next");
+ $s .= _("Next");
}
} else 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);
- $sNav .= ''._("View Message").'';
+ $s .= ''._("View Message").'';
$entities = array();
$entity_count = array();
$c = 0;
@@ -576,42 +572,37 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
. set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
. '">' . $next_link . '';
}
- $sNav .= $topbar_delimiter . $prev_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);
- $sNav .= $topbar_delimiter;
+ $s .= $topbar_delimiter;
$url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
- $sNav .= ''._("Up").'';
+ $s .= ''._("Up").'';
}
- $sNav .= $topbar_delimiter . $next_link;
-
+ $s .= $topbar_delimiter . $next_link;
}
- $sBar .= $sNav . ' |
' . "\n";
- $sBar .= '