';
+ $s = '' .
+ html_tag( 'td', '', 'left', '', 'width="33%"' ) . '';
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
@@ -595,7 +591,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$s .= $topbar_delimiter . $next_link;
}
- $s .= '' . "\n" . '';
+ $s .= ' | ' . "\n" .
+ html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '';
$comp_action_uri = $comp_uri . '&action=forward';
$s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '';
@@ -605,7 +602,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '';
}
- $comp_action_uri = decodeHeader($comp_uri . '&action=reply');
+ $comp_action_uri = $comp_uri . '&action=reply';
$s .= $topbar_delimiter;
$s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '';
@@ -619,14 +616,15 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $base_uri, $language_align;
+ global $base_uri;
$urlMailbox = urlencode($mailbox);
- $url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING'];
+ sqgetGlobalVar('QUERY_STRING', $query_string, SQ_SERVER);
+ $url = $base_uri.'src/view_header.php?'.$query_string;
- $s = "\n" .
- '' . _("Options") . ": | \n" .
- '' .
+ $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. */
@@ -646,97 +644,57 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
/* get the globals we may need */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-$msgs = $_SESSION['msgs'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+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();
+}
-if (isset($_GET['passed_id'])) {
- $passed_id = (int) $_GET['passed_id'];
+/** GET VARS */
+sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET);
+sqgetGlobalVar('where', $where, SQ_GET);
+sqgetGlobalVar('what', $what, SQ_GET);
+if ( sqgetGlobalVar('show_more', $temp, SQ_GET) ) {
+ $show_more = (int) $temp;
}
-elseif (isset($_POST['passed_id'])) {
- $passed_id = (int) $_POST['passed_id'];
+if ( sqgetGlobalVar('show_more_cc', $temp, SQ_GET) ) {
+ $show_more_cc = (int) $temp;
}
-
-if (isset($_GET['passed_ent_id'])) {
- $passed_ent_id = $_GET['passed_ent_id'];
+if ( sqgetGlobalVar('show_more_bcc', $temp, SQ_GET) ) {
+ $show_more_bcc = (int) $temp;
}
-elseif (isset($_POST['passed_ent_id'])) {
- $passed_ent_id = $_POST['passed_ent_id'];
+if ( sqgetGlobalVar('view_hdr', $temp, SQ_GET) ) {
+ $view_hdr = (int) $temp;
}
-if (isset($_GET['sendreceipt'])) {
- $sendreceipt = $_GET['sendreceipt'];
-}
+/** POST VARS */
+sqgetGlobalVar('move_id', $move_id, SQ_POST);
-if (isset($_GET['sort'])) {
- $sort = (int) $_GET['sort'];
-}
-elseif (isset($_POST['sort'])) {
- $sort = (int) $_POST['sort'];
-}
-if (isset($_GET['startMessage'])) {
- $startMessage = (int) $_GET['startMessage'];
-}
-elseif (isset($_POST['startMessage'])) {
- $startMessage = (int) $_POST['startMessage'];
-}
-if (isset($_GET['show_more'])) {
- $show_more = (int) $_GET['show_more'];
-}
-if (isset($_GET['show_more_cc'])) {
- $show_more_cc = (int) $_GET['show_more_cc'];
-}
-if (isset($_GET['show_more_bcc'])) {
- $show_more_bcc = (int) $_GET['show_more_bcc'];
-}
-if (isset($_GET['mailbox'])) {
- $mailbox = $_GET['mailbox'];
-}
-elseif (isset($_POST['mailbox'])) {
- $mailbox = $_POST['mailbox'];
-}
-if (isset($_GET['where'])) {
- $where = $_GET['where'];
-}
-if (isset($_GET['what'])) {
- $what = $_GET['what'];
-}
-if (isset($_GET['view_hdr'])) {
- $view_hdr = (int) $_GET['view_hdr'];
-}
-if (isset($_SESSION['server_sort_array'])) {
- $server_sort_array = $_SESSION['server_sort_array'];
-}
-if (isset($_SESSION['msgs'])) {
- $msgs = $_SESSION['msgs'];
-}
-if (isset($_SESSION['msort'])) {
- $msort = $_SESSION['msort'];
-}
-if (isset($_POST['move_id'])) {
- $move_id = $_POST['move_id'];
+/** GET/POST VARS */
+sqgetGlobalVar('passed_ent_id', $passed_ent_id);
+sqgetGlobalVar('mailbox', $mailbox);
+
+if ( sqgetGlobalVar('passed_id', $temp) ) {
+ $passed_id = (int) $temp;
}
-if (isset($_SESSION['lastTargetMailbox'])) {
- $lastTargetMailbox = $_SESSION['lastTargetMailbox'];
+if ( sqgetGlobalVar('sort', $temp) ) {
+ $sort = (int) $temp;
}
-if (isset($_SESSION['messages'])) {
- $messages = $_SESSION['messages'];
-} else {
- $messages = array();
+if ( sqgetGlobalVar('startMessage', $temp) ) {
+ $startMessage = (int) $temp;
}
-
-
/* end of get globals */
global $uid_support, $sqimap_capabilities;
-if (isset($mailbox)) {
- $mailbox = urldecode( $mailbox );
-}
-
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
@@ -827,13 +785,14 @@ 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 ' ';
+echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
echo ' ' . html_tag( 'td', ' '. $messagebody."\n", 'left')
. ' ';
echo ' ';
@@ -851,7 +810,8 @@ if ($attachmentsdisplay) {
echo ' ';
echo ' ';
echo ' ';
- echo ' ';
+ // echo ' | ';
+ echo ' | ' . html_tag( 'td', '', 'left', $color[9] );
echo ' ' . _("Attachments") . ':';
echo ' ';
echo ' ';
| | | | | |
|