X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=fa386594bbeab12ec99ddd965e798aa1fb09b6ce;hb=6f927fceb563eb7461ac9fd3604e9efe14fdf9ad;hp=77a53162cb9f8d7fd062a4a7b93db16750187df2;hpb=36e67fa41e819af47f07a0ad74433a27637961af;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 77a53162..fa386594 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -3,7 +3,7 @@ /** * read_body.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This file is used for reading the msgs array and displaying @@ -23,7 +23,6 @@ require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/url_parser.php'); require_once(SM_PATH . 'functions/html.php'); - /** * Given an IMAP message id number, this will look it up in the cached * and sorted msgs array and return the index. Used for finding the next @@ -121,18 +120,18 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) { $result = ''; /* Output the link. */ if ($javascript_on) { - $result .= '\n" . - "$print_text\n"; + $result = '\n" . + "$print_text\n"; } else { - $result .= '$print_text\n"; + $result = '$print_text\n"; } return $result; } @@ -270,18 +269,18 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } else { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp; - if ($use_authenticated_smtp) { + global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp; + if ($smtp_auth_mech == 'none') { + $user = ''; + $pass = ''; + } else { global $key, $onetimepad; $user = $username; $pass = OneTimePadDecrypt($key, $onetimepad); - } else { - $user = ''; - $pass = ''; } $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; $stream = $deliver->initStream($composeMessage,$domain,0, - $smtpServerAddress, $smtpPort, $authPop); + $smtpServerAddress, $smtpPort, $user, $pass, $authPop); } $success = false; if ($stream) { @@ -306,7 +305,6 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { return $success; } - function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) { $sg = $set?'+':'-'; $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)'; @@ -388,9 +386,8 @@ function formatRecipientString($recipients, $item ) { function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee) { - global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder, - $default_use_priority, $show_xmailer_default, - $mdn_user_support, $PHP_SELF, $javascript_on; + global $msn_user_support, $default_use_mdn, $default_use_priority, + $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on; $header = $message->rfc822_header; $env = array(); @@ -420,8 +417,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $env[_("Read receipt")] = _("send"); } else { $env[_("Read receipt")] = _("requested"); - if (!($mailbox == $draft_folder || - $mailbox == $sent_folder || + if (!(handleAsSent($mailbox) || $message->is_deleted || $passed_ent_id)) { $mdn_url = $PHP_SELF . '&sendreceipt=1'; @@ -468,18 +464,15 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, } function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) { - global $base_uri, $sent_folder, $draft_folder, $where, $what, $color, $sort, + global $base_uri, $draft_folder, $where, $what, $color, $sort, $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment; $topbar_delimiter = ' | '; $urlMailbox = urlencode($mailbox); - $sNav = $sCmp = ''; - $sBar = ''; - $sBar .= ''; - $sBar .= '
' - ._("Navigation").': '; + $s = '' . "\n"; - $sBar .= ''; - $sBar .= '' . "\n" . '
'; + $msgs_url = $base_uri . 'src/'; if (isset($where) && isset($what)) { $msgs_url .= 'search.php?where=' . urlencode($where) . @@ -490,8 +483,7 @@ 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 . ''; $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox . '&message=' . $passed_id . '&'; @@ -501,7 +493,8 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp } else { $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage; } - $sNav .= '' . _("Delete") . ''; + $s .= $topbar_delimiter; + $s .= '' . _("Delete") . ''; } $comp_uri = $base_uri . 'src/compose.php' . @@ -519,17 +512,17 @@ 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"); } 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,30 +530,33 @@ 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; + foreach($message->parent->entities as $ent) { - $c++; - $entity_count[$c] = $ent->entity_id; - $entities[$ent->entity_id] = $c; + 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"); @@ -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 . '
' - ._("Compose").': '; + $s .= ''; $comp_action_uri = $comp_uri . '&action=forward'; - $sCmp .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; - $sCmp .= $topbar_delimiter; + $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; if ($enable_forward_as_attachment) { $comp_action_uri = $comp_uri . '&action=forward_as_attachment'; - $sCmp .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . ''; - $sCmp .= $topbar_delimiter; + $s .= $topbar_delimiter; + $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . ''; } $comp_action_uri = decodeHeader($comp_uri . '&action=reply'); - $sCmp .= $link_open . $comp_action_uri . $link_close . _("Reply") . ''; - $sCmp .= $topbar_delimiter; + $s .= $topbar_delimiter; + $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . ''; $comp_action_uri = $comp_uri . '&action=reply_all'; - $sCmp .= $link_open . $comp_action_uri . $link_close . _("Reply All") . ''; - - $sBar .= $sCmp .'
'; + $s .= $topbar_delimiter; + $s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . ''; + $s .= '
'; do_hook("read_body_menu_top"); - echo $sBar; + echo $s; do_hook("read_body_menu_bottom"); } @@ -643,18 +634,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'])) { @@ -669,29 +660,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']; -} -if (isset($_GET['view_unsafe_images'])) { - $view_unsafe_images = $_GET['view_unsafe_images']; + $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']; @@ -706,7 +693,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']; @@ -739,7 +726,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); /** @@ -748,10 +735,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; @@ -809,8 +796,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()); @@ -824,7 +811,7 @@ for ($i = 0; $i < $cnt; $i++) { $messagebody .= '
'; } } -echo ''; + displayPageHeader($color, $mailbox); formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response); formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee); @@ -836,7 +823,7 @@ echo '
'; echo '
'; echo ' '; echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left') - . ''; + . ''; echo '
'; echo '
'; @@ -844,7 +831,7 @@ echo ' '; echo ' '; echo ''."\n"; + $color[4].'">'."\n"; $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id); if ($attachmentsdisplay) { @@ -859,13 +846,12 @@ if ($attachmentsdisplay) { echo '
'; echo $attachmentsdisplay; echo '
'; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ' '; + echo ''; } -echo ''."\n"; - echo ''; /* show attached images inline -- if pref'fed so */ @@ -894,7 +880,7 @@ 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'); -echo ''; + ?>