/* 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
}
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);
}
$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 = '';
$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 );
$cnt = count($recipients);
foreach($recipients as $r) {
- $add = htmlspecialchars(decodeHeader($r->getAddress()));
+ $add = decodeHeader($r->getAddress(true));
if ($string) {
$string .= '<BR>' . $add;
} else {
$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');
$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[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority));
}
if ($show_xmailer_default) {
- $env[_("Mailer")] = htmlspecialchars(decodeHeader($header->xmailer));
+ $env[_("Mailer")] = decodeHeader($header->xmailer);
}
if ($default_use_mdn) {
if ($mdn_user_support) {
$s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
}
- $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") . '</a>';
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 = "<TR>\n" .
html_tag( 'td', '', 'right', '', 'VALIGN="MIDDLE" WIDTH="20%"' ) . '<B>' . _("Options") . ": </B></TD>\n" .
/* 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'];
+/** GET/POST VARS */
+sqgetGlobalVar('passed_ent_id', $passed_ent_id);
+sqgetGlobalVar('mailbox', $mailbox);
+
+if ( sqgetGlobalVar('passed_id', $temp) ) {
+ $passed_id = (int) $temp;
}
-if (isset($_POST['move_id'])) {
- $move_id = $_POST['move_id'];
+if ( sqgetGlobalVar('sort', $temp) ) {
+ $sort = (int) $temp;
}
-if (isset($_SESSION['lastTargetMailbox'])) {
- $lastTargetMailbox = $_SESSION['lastTargetMailbox'];
+if ( sqgetGlobalVar('startMessage', $temp) ) {
+ $startMessage = (int) $temp;
}
-if (isset($_SESSION['messages'])) {
- $messages = $_SESSION['messages'];
-} else {
- $messages = array();
-}
-
-
/* 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);
projects / squirrelmail.git / blobdiff