X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=465c2e9428f73b5050f336a2be225c00fcb327d3;hb=f38b7cf06c3343a7fead417d90bd67d291f5dc29;hp=cfab22a3eaad195379e04ac76e70026db59d7924;hpb=70ce22184a6bab6279631b1f7f43fe98c833f317;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index cfab22a3..465c2e94 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,11 +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
@@ -130,7 +132,7 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) {
"\n" .
"$print_text\n";
} else {
- $result = '$print_text\n";
}
return $result;
@@ -143,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);
@@ -163,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:") . ' ' . decodeHeader($header->subject);
$reply_to = '';
@@ -200,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) . "\r\n" .
+ "\t" . _("Subject:") . ' ' . decodeHeader($header->subject) . "\r\n" .
"\t" . _("Sent:") . ' ' . $senton . "\r\n" .
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
@@ -269,14 +271,14 @@ 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,
@@ -288,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 {
@@ -318,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;
}
@@ -364,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 {
@@ -386,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');
@@ -400,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);
@@ -418,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';
@@ -458,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";
@@ -466,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,
+ 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);
$s = '';
+ ' border="0" bgcolor="'.$color[9].'">' .
+ html_tag( 'td', '', 'left', '', 'width="33%"' ) . '';
$msgs_url = $base_uri . 'src/';
if (isset($where) && isset($what)) {
@@ -514,7 +520,7 @@ 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");
}
@@ -585,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") . '';
@@ -595,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") . '';
@@ -612,11 +619,12 @@ 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. */
@@ -636,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 = $_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);
@@ -823,7 +791,8 @@ echo ' ';
echo ' ';
echo ' ';
-echo ' ';
+// echo ' ';
+echo html_tag( 'table' ,'' , 'left', '', 'cellpadding="1" cellspacing="5" border="0"' );
echo ' ' . html_tag( 'td', ' '. $messagebody."\n", 'left')
. ' ';
echo ' ';
@@ -841,7 +810,8 @@ if ($attachmentsdisplay) {
echo ' ';
echo ' ';
echo ' ';
- echo ' ';
+ // echo ' | ';
+ echo ' | ' . html_tag( 'td', '', 'left', $color[9] );
echo ' ' . _("Attachments") . ':';
echo ' ';
echo ' ';
| | | |
|