X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=41ae3d5f0e0965142c87f568e0322657e3c4a47c;hb=474fc5fab3acc09ba21189e8c7c7a19dacb04c40;hp=137a19fdd8aa3b31513d564ce99c0ca6a846cb87;hpb=fe369c7058d247ee83505595d6770d77cd7fa476;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 137a19fd..41ae3d5f 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -52,20 +52,14 @@ function findNextMessage($passed_id) { } } } else { - if ($sort == 6) { - if ($passed_id != 1) { - $result = $passed_id - 1; - } - } else { - if (is_array($msort)) { - for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { - if ($passed_id == $msgs[$key]['ID']) { - next($msort); - $key = key($msort); - if (isset($key)){ - $result = $msgs[$key]['ID']; - break; - } + if (is_array($msort)) { + for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { + if ($passed_id == $msgs[$key]['ID']) { + next($msort); + $key = key($msort); + if (isset($key)){ + $result = $msgs[$key]['ID']; + break; } } } @@ -95,21 +89,14 @@ function findPreviousMessage($numMessages, $passed_id) { } } } else { - if ($sort == 6) { - if ($passed_id != $numMessages) { - $result = $passed_id + 1; - } - } else { - if (is_array($msort)) { - for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { - if ($passed_id == $msgs[$key]['ID']) { - prev($msort); - $key = key($msort); - if (isset($key)) { - //echo $msort[$key]; /* Why again were we echoing here? */ - $result = $msgs[$key]['ID']; - break; - } + if (is_array($msort)) { + for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { + if ($passed_id == $msgs[$key]['ID']) { + prev($msort); + $key = key($msort); + if (isset($key)) { + $result = $msgs[$key]['ID']; + break; } } } @@ -458,8 +445,8 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, } } - $s = ''; + $s = '
'; foreach ($env as $key => $val) { if ($val) { $s .= ''; @@ -468,10 +455,16 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $s .= ''; } } + echo '
'."\n"; + echo '
'."\n"; echo $s; do_hook("read_body_header"); formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); echo '
'; + echo ''."\n"; + echo ''; } function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) { @@ -632,6 +625,13 @@ 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']; } @@ -651,8 +651,11 @@ elseif (isset($_POST['startMessage'])) { if (isset($_GET['show_more'])) { $show_more = $_GET['show_more']; } -elseif (isset($_POST['show_more'])) { - $show_more = $_POST['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']; @@ -684,9 +687,15 @@ if (isset($_POST['move_id'])) { if (isset($_SESSION['lastTargetMailbox'])) { $lastTargetMailbox = $_SESSION['lastTargetMailbox']; } +if (isset($_SESSION['messages'])) { + $messages = $_SESSION['messages']; +} else { + $messages = array(); +} + -/* end of get globals */ +/* end of get globals */ global $uid_support, $sqimap_capabilities; if (isset($mailbox)) { @@ -696,10 +705,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 @@ -716,15 +721,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); @@ -797,20 +798,24 @@ echo ' '; echo '
'; echo ' '; echo ' '; echo '
'; -echo ' '; -echo ' '; +echo '

' . $messagebody . '
'; +echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left') + . ''; echo '
'; echo '
'; echo ' '; +echo ''."\n"; + $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id); if ($attachmentsdisplay) { echo ' '; echo ' '; echo '
'; - echo ' '; + echo '
'; echo ' '; @@ -825,12 +830,11 @@ if ($attachmentsdisplay) { } echo '
'; echo ' ' . _("Attachments") . ':'; 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) . @@ -848,8 +852,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'); + ?>