X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=47bd027bb2f0e180e3fe5a6a5be755efcc1cc85f;hb=884eba1e4912ab6c67039c2ed98512f446cbc2dc;hp=57448d74ac0c4f380b49f9bfdbddeff5d6a39f07;hpb=77836429ca2171dfa7bbff0cbccda16818b6b71c;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index 57448d74..47bd027b 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -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
@@ -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:") . ' ' . encodeHeader($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,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,10 +272,10 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp;
- if ($smtp_auth_mech == 'none') {
- $user = '';
- $pass = '';
- } else {
+ if ($smtp_auth_mech == 'none') {
+ $user = '';
+ $pass = '';
+ } else {
global $key, $onetimepad;
$user = $username;
$pass = OneTimePadDecrypt($key, $onetimepad);
@@ -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 {
@@ -394,11 +398,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
$header = $message->rfc822_header;
$env = array();
- if ($squirrelmail_language == 'ja_JP') {
- $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
- } else {
- $env[_("Subject")] = decodeHeader(htmlspecialchars($header->subject));
- }
+ $env[_("Subject")] = decodeHeader($header->subject);
$from_name = $header->getAddr_s('from');
if (!$from_name) {
$from_name = $header->getAddr_s('sender');
@@ -406,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);
@@ -472,13 +472,14 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
global $base_uri, $draft_folder, $where, $what, $color, $sort,
- $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft,
+ $startMessage, $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)) {
@@ -504,18 +505,11 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
$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");
@@ -525,7 +519,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp
}
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 .= '';
@@ -590,38 +584,40 @@ 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") . '';
+ $s .= makeComposeLink($comp_action_uri, _("Forward"));
if ($enable_forward_as_attachment) {
$comp_action_uri = $comp_uri . '&action=forward_as_attachment';
$s .= $topbar_delimiter;
- $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '';
+ $s .= makeComposeLink($comp_action_uri, _("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") . '';
+ $s .= makeComposeLink($comp_action_uri, _("Reply"));
$comp_action_uri = $comp_uri . '&action=reply_all';
$s .= $topbar_delimiter;
- $s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . '';
+ $s .= makeComposeLink($comp_action_uri, _("Reply All"));
$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. */
@@ -641,97 +637,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 = (int) $_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 = (int) $_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 = (int) $_GET['sort'];
-}
-elseif (isset($_POST['sort'])) {
- $sort = (int) $_POST['sort'];
-}
-if (isset($_GET['startMessage'])) {
- $startMessage = (int) $_GET['startMessage'];
-}
-elseif (isset($_POST['startMessage'])) {
- $startMessage = (int) $_POST['startMessage'];
-}
-if (isset($_GET['show_more'])) {
- $show_more = (int) $_GET['show_more'];
-}
-if (isset($_GET['show_more_cc'])) {
- $show_more_cc = (int) $_GET['show_more_cc'];
-}
-if (isset($_GET['show_more_bcc'])) {
- $show_more_bcc = (int) $_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 = (int) $_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);
@@ -828,7 +784,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 ' ';
@@ -842,11 +799,11 @@ echo '';
echo ' | ';
echo ' ';
- echo ' ';
+ echo ' | ' . html_tag( 'td', '', 'left', $color[9] );
echo ' ' . _("Attachments") . ':';
echo ' ';
echo ' ';
@@ -854,7 +811,6 @@ if ($attachmentsdisplay) {
echo $attachmentsdisplay;
echo ' | ';
echo ' | ';
- echo ' | ';
echo ' | ';
echo ' |
';