X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=d9a7fbe7904df7ba2a646b691e4b52dc75091890;hp=d77f5240abbbebbb50e181d73b0174f4164b6e1e;hb=bc94707193083bed407443b3b9e1f101992b77c8;hpb=d9c1dcccb1fe3a547f92cc48f4b964a580ec35ee;ds=sidebyside
diff --git a/src/read_body.php b/src/read_body.php
index d77f5240..d9a7fbe7 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -157,11 +157,13 @@ function ServerMDNSupport($read) {
}
function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
- global $username, $attachment_dir, $SERVER_NAME,
+ global $username, $attachment_dir, $_SERVER,
$version, $attachments, $squirrelmail_language, $default_charset,
$languages, $useSendmail, $domain, $sent_folder,
$popuser, $data_dir, $username;
+ $SERVER_NAME = $_SERVER['SERVER_NAME'];
+
$header = $message->rfc822_header;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
@@ -589,10 +591,10 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
- global $QUERY_STRING, $base_uri;
-
+ global $base_uri;
+
$urlMailbox = urlencode($mailbox);
- $url = $base_uri.'src/view_header.php?'.$QUERY_STRING;
+ $url = $base_uri.'src/view_header.php?'.$_SERVER['QUERY_STRING'];
$s = "
\n" .
'' . _("Options") . ": | \n" .
@@ -614,12 +616,93 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
/* Main of read_body.php */
/***************************/
-/*
- Urled vars
- ----------
- $passed_id
-*/
+/* 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'];
+
+if (isset($_GET['passed_id'])) {
+ $passed_id = $_GET['passed_id'];
+}
+elseif (isset($_POST['passed_id'])) {
+ $passed_id = $_POST['passed_id'];
+}
+
+if (isset($_GET['passed_ent_id'])) {
+ $passed_ent_id = $_GET['passed_ent_id'];
+}
+elseif (isset($_POST['passed_ent_id'])) {
+ $passed_ent_id = $_POST['passed_ent_id'];
+}
+
+if (isset($_GET['sendreceipt'])) {
+ $sendreceipt = $_GET['sendreceipt'];
+}
+
+if (isset($_GET['sort'])) {
+ $sort = $_GET['sort'];
+}
+elseif (isset($_POST['sort'])) {
+ $sort = $_POST['sort'];
+}
+if (isset($_GET['startMessage'])) {
+ $startMessage = $_GET['startMessage'];
+}
+elseif (isset($_POST['startMessage'])) {
+ $startMessage = $_POST['startMessage'];
+}
+if (isset($_GET['show_more'])) {
+ $show_more = $_GET['show_more'];
+}
+if (isset($_GET['show_more_cc'])) {
+ $show_more_cc = $_GET['show_more_cc'];
+}
+if (isset($_GET['show_more_bcc'])) {
+ $show_more_bcc = $_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 = $_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'];
+}
+if (isset($_SESSION['lastTargetMailbox'])) {
+ $lastTargetMailbox = $_SESSION['lastTargetMailbox'];
+}
+if (isset($_SESSION['messages'])) {
+ $messages = $_SESSION['messages'];
+} else {
+ $messages = array();
+}
+
+
+/* end of get globals */
global $uid_support, $sqimap_capabilities;
if (isset($mailbox)) {
@@ -629,10 +712,6 @@ if (isset($mailbox)) {
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
-if (!isset($messages)) {
- $messages = array();
- sqsession_register($messages,'messages');
-}
/**
* $message contains all information about the message
@@ -649,15 +728,11 @@ if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
$FirstTimeSee = !$message->is_seen;
$message->is_seen = true;
$messages[$uidvalidity][$passed_id] = $message;
- sqsession_register($messages, 'messages');
} else {
// $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$message = $messages[$uidvalidity][$passed_id];
$FirstTimeSee = !$message->is_seen;
}
-//$FirstTimeSee = !$message->is_seen;
-//$message->is_seen = true;
-//$messages[$uidvalidity][$passed_id] = $message;
if (isset($passed_ent_id) && $passed_ent_id) {
$message = $message->getEntity($passed_ent_id);
@@ -730,8 +805,8 @@ echo ' ';
echo ' ';
echo ' ';
-echo ' ';
-echo ' ' . $messagebody . ' | ';
+echo ' ';
+echo ' '. html_tag( 'td', ' '. $messagebody."\n", 'left').'';
echo ' ';
echo ' ';
echo ' | ';
@@ -758,12 +833,11 @@ if ($attachmentsdisplay) {
}
echo ' ';
-
/* show attached images inline -- if pref'fed so */
if (($attachment_common_show_images) &&
is_array($attachment_common_show_images_list)) {
foreach ($attachment_common_show_images_list as $img) {
- $imgurl = '../src/download.php' .
+ $imgurl = SM_PATH . 'src/download.php' .
'?' .
'passed_id=' . urlencode($img['passed_id']) .
'&mailbox=' . urlencode($mailbox) .
@@ -781,8 +855,11 @@ if (($attachment_common_show_images) &&
do_hook('read_body_bottom');
do_hook('html_bottom');
-//$message->clean_up();
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');
+
?>
|