X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=47bd027bb2f0e180e3fe5a6a5be755efcc1cc85f;hp=a880bc2964d569cee6faddee18d9159e447cbc50;hb=d39b729322f7d7122c7378ea99c958d4fd67c8cc;hpb=70bdc74030f9bc8bd890eeab99cb8cffa96d2770 diff --git a/src/read_body.php b/src/read_body.php index a880bc29..47bd027b 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 @@ -17,12 +17,13 @@ define('SM_PATH','../'); /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); +require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/mime.php'); require_once(SM_PATH . 'functions/date.php'); require_once(SM_PATH . 'functions/url_parser.php'); require_once(SM_PATH . 'functions/html.php'); - +require_once(SM_PATH . 'functions/global.php'); /** * Given an IMAP message id number, this will look it up in the cached @@ -121,18 +122,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; } @@ -144,12 +145,12 @@ function ServerMDNSupport($read) { } function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { - global $username, $attachment_dir, $_SERVER, + global $username, $attachment_dir, $version, $attachments, $squirrelmail_language, $default_charset, $languages, $useSendmail, $domain, $sent_folder, $popuser, $data_dir, $username; - $SERVER_NAME = $_SERVER['SERVER_NAME']; + sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER); $header = $message->rfc822_header; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); @@ -164,7 +165,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } $rfc822_header->content_type = $content_type; $rfc822_header->to[] = $header->dnt; - $rfc822_header->subject = _("Read:") . ' ' . $header->subject; + $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject); $reply_to = ''; @@ -201,8 +202,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $now = getLongDateString( time() ); set_my_charset(); $body = _("Your message") . "\r\n\r\n" . - "\t" . _("To:") . ' ' . $to . "\r\n" . - "\t" . _("Subject:") . ' ' . $header->subject . "\r\n" . + "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" . + "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" . "\t" . _("Sent:") . ' ' . $senton . "\r\n" . "\r\n" . sprintf( _("Was displayed on %s"), $now ); @@ -270,18 +271,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) { @@ -289,7 +290,9 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $success = $deliver->finalizeStream($stream); } if (!$success) { - $msg = $deliver->dlv_msg . '
Server replied: '.$deliver->dlv_ret_nr; + $msg = $deliver->dlv_msg . '
' . + _("Server replied: ") . $deliver->dlv_ret_nr . ' '. + $deliver->dlv_server_msg; require_once(SM_PATH . 'functions/display_messages.php'); plain_error_message($msg, $color); } else { @@ -306,7 +309,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)'; @@ -320,15 +322,17 @@ function ClearAttachments() { $hashed_attachment_dir = getHashedDir($username, $attachment_dir); $rem_attachments = array(); - foreach ($attachments as $info) { - if ($info['session'] == -1) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } else { - $rem_attachments[] = $info; - } + if (isset($attachments)) { + foreach ($attachments as $info) { + if ($info['session'] == -1) { + $attached_file = "$hashed_attachment_dir/$info[localfilename]"; + if (file_exists($attached_file)) { + unlink($attached_file); + } + } else { + $rem_attachments[] = $info; + } + } } $attachments = $rem_attachments; } @@ -366,7 +370,7 @@ function formatRecipientString($recipients, $item ) { $cnt = count($recipients); foreach($recipients as $r) { - $add = htmlspecialchars($r->getAddress()); + $add = decodeHeader($r->getAddress(true)); if ($string) { $string .= '
' . $add; } else { @@ -388,13 +392,13 @@ 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, + $squirrelmail_language; $header = $message->rfc822_header; $env = array(); - $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject)); + $env[_("Subject")] = decodeHeader($header->subject); $from_name = $header->getAddr_s('from'); if (!$from_name) { $from_name = $header->getAddr_s('sender'); @@ -402,13 +406,13 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $from_name = _("Unknown sender"); } } - $env[_("From")] = htmlspecialchars(decodeHeader($from_name)); + $env[_("From")] = decodeHeader($from_name); $env[_("Date")] = getLongDateString($header->date); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc"); if ($default_use_priority) { - $env[_("Priority")] = getPriorityStr($header->priority); + $env[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority)); } if ($show_xmailer_default) { $env[_("Mailer")] = decodeHeader($header->xmailer); @@ -420,8 +424,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'; @@ -460,7 +463,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, echo ''."\n"; echo $s; - do_hook("read_body_header"); + do_hook('read_body_header'); formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); echo ''; echo ''."\n"; @@ -468,14 +471,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, - $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft, + global $base_uri, $draft_folder, $where, $what, $color, $sort, + $startMessage, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment; $topbar_delimiter = ' | '; $urlMailbox = urlencode($mailbox); $s = '' . + html_tag( 'td', '', 'left', '', 'width="33%"' ) . ''; $msgs_url = $base_uri . 'src/'; if (isset($where) && isset($what)) { @@ -488,7 +492,6 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $msgs_str = _("Message List"); } $s .= '' . $msgs_str . ''; - $s .= $topbar_delimiter; $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox . '&message=' . $passed_id . '&'; @@ -498,31 +501,25 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp } else { $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage; } + $s .= $topbar_delimiter; $s .= '' . _("Delete") . ''; } - $comp_uri = $base_uri . 'src/compose.php' . + $comp_uri = 'src/compose.php' . '?passed_id=' . $passed_id . '&mailbox=' . $urlMailbox . (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:''); - if ($compose_new_win == '1') { - $link_open = ''; - } else { - $link_open = ''; - } 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)) { $s .= $topbar_delimiter; - $s .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . ''; + $s .= makeComposeLink($comp_alt_uri, $comp_alt_string); } $s .= '' . "\n" . '' . "\n" . + html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . ''; $comp_action_uri = $comp_uri . '&action=forward'; - $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; - $s .= $topbar_delimiter; + $s .= makeComposeLink($comp_action_uri, _("Forward")); if ($enable_forward_as_attachment) { $comp_action_uri = $comp_uri . '&action=forward_as_attachment'; - $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . ''; $s .= $topbar_delimiter; + $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment")); } - $comp_action_uri = decodeHeader($comp_uri . '&action=reply'); - $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . ''; + $comp_action_uri = $comp_uri . '&action=reply'; $s .= $topbar_delimiter; + $s .= makeComposeLink($comp_action_uri, _("Reply")); $comp_action_uri = $comp_uri . '&action=reply_all'; - $s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . ''; + $s .= $topbar_delimiter; + $s .= makeComposeLink($comp_action_uri, _("Reply All")); $s .= '
'; + ' border="0" bgcolor="'.$color[9].'">
'; @@ -554,10 +551,13 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $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"); @@ -584,38 +584,40 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $s .= $topbar_delimiter . $next_link; } - $s .= ''; + $s .= '
'; - do_hook("read_body_menu_top"); + do_hook('read_body_menu_top'); echo $s; - do_hook("read_body_menu_bottom"); + do_hook('read_body_menu_bottom'); } function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { 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" . - '' . + 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. */ @@ -635,99 +637,59 @@ 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 = $_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 = $_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 = $_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']; +/** 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); +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); /** @@ -736,10 +698,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; @@ -797,8 +759,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()); @@ -822,9 +784,10 @@ echo ' '; @@ -832,25 +795,25 @@ 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 '
'; echo '
'; echo ' '; echo ''."\n"; + $color[4].'">'."\n"; $attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id); if ($attachmentsdisplay) { - echo ' '; + echo ' '; echo ' '; echo ' '; - echo '
'; echo ' '; - echo ' ' . html_tag( 'td', '', 'left', $color[9] ); echo ' ' . _("Attachments") . ':'; echo ' '; echo '
'; + echo '
'; echo '
'; echo $attachmentsdisplay; echo '
'; - echo '
'; - echo ' '; + echo ' '; echo ' '; + echo ''; } echo '';