From 961ca3d8994763c5c82ca7b32e478ee226f6983a Mon Sep 17 00:00:00 2001 From: ebullient Date: Mon, 3 Mar 2003 01:43:16 +0000 Subject: [PATCH] Clean up references to global vars git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4579 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/attachment_common.php | 22 +++++------ functions/i18n.php | 10 +++-- functions/plugin.php | 3 +- functions/strings.php | 66 +++++++++++++-------------------- 4 files changed, 46 insertions(+), 55 deletions(-) diff --git a/functions/attachment_common.php b/functions/attachment_common.php index eea42c5c..22b0026d 100644 --- a/functions/attachment_common.php +++ b/functions/attachment_common.php @@ -94,9 +94,9 @@ function attachment_common_link_text(&$Args) $Args[1]['attachment_common']['href'] = Where it links to This sets the 'href' of this plugin for a new link. */ - $QUERY_STRING = $_SERVER['QUERY_STRING'];; + sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER); - $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING; + $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING; $Args[1]['attachment_common']['href'] = set_url_var($Args[1]['attachment_common']['href'], 'ent_id',$Args[5]); @@ -118,7 +118,7 @@ function attachment_common_link_text(&$Args) function attachment_common_link_message(&$Args) { - $Args[1]['attachment_common']['href'] = '../src/read_body.php?startMessage=' . + $Args[1]['attachment_common']['href'] = SM_PATH . 'src/read_body.php?startMessage=' . $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] . '&passed_ent_id=' . $Args[5] . '&override_type0=message&override_type1=rfc822'; /* The link that we created needs a name. "view" will be displayed for @@ -131,9 +131,9 @@ function attachment_common_link_message(&$Args) function attachment_common_link_html(&$Args) { - $QUERY_STRING = $_SERVER['QUERY_STRING'];; + sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER); - $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING. + $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING. /* why use the overridetype? can this be removed */ '&override_type0=text&override_type1=html'; $Args[1]['attachment_common']['href'] = @@ -147,17 +147,17 @@ function attachment_common_link_html(&$Args) function attachment_common_link_image(&$Args) { - $QUERY_STRING = $_SERVER['QUERY_STRING'];; global $attachment_common_show_images, $attachment_common_show_images_list; - + sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER); + $info['passed_id'] = $Args[3]; $info['mailbox'] = $Args[4]; $info['ent_id'] = $Args[5]; $attachment_common_show_images_list[] = $info; - $Args[1]['attachment_common']['href'] = '../src/image.php?'. $QUERY_STRING; + $Args[1]['attachment_common']['href'] = SM_PATH . 'src/image.php?'. $QUERY_STRING; $Args[1]['attachment_common']['href'] = set_url_var($Args[1]['attachment_common']['href'], 'ent_id',$Args[5]); @@ -171,9 +171,9 @@ function attachment_common_link_image(&$Args) function attachment_common_link_vcard(&$Args) { - $QUERY_STRING = $_SERVER['QUERY_STRING'];; - - $Args[1]['attachment_common']['href'] = '../src/vcard.php?'. $QUERY_STRING; + sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER); + + $Args[1]['attachment_common']['href'] = SM_PATH . 'src/vcard.php?'. $QUERY_STRING; $Args[1]['attachment_common']['href'] = set_url_var($Args[1]['attachment_common']['href'], 'ent_id',$Args[5]); diff --git a/functions/i18n.php b/functions/i18n.php index 5fccb120..687b5e88 100644 --- a/functions/i18n.php +++ b/functions/i18n.php @@ -15,6 +15,8 @@ * $Id$ */ +require_once(SM_PATH . 'functions/global.php'); + /* Decodes a string to the internal encoding from the given charset */ function charset_decode ($charset, $string) { global $languages, $squirrelmail_language; @@ -553,7 +555,8 @@ function charset_decode_iso_8859_7 ($string) { } /* - ISOIEC 8859-9:1999 Latin Alphabet No. 5 + ISOIEC 8859-9:1999 Latin Alphabet No. 5require_once(SM_PATH . 'functions/global.php'); + */ function charset_decode_iso_8859_9 ($string) { global $default_charset; @@ -1118,9 +1121,10 @@ function set_up_language($sm_language, $do_search = false) { } $SetupAlready = TRUE; + sqgetGlobalVar('HTTP_ACCEPT_LANGUAGE', $accept_lang, SQ_SERVER); - if ($do_search && ! $sm_language && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - $sm_language = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); + if ($do_search && ! $sm_language && isset($accept_lang)) { + $sm_language = substr($accept_lang, 0, 2); } if (!$sm_language && isset($squirrelmail_default_language)) { diff --git a/functions/plugin.php b/functions/plugin.php index e99b7fef..63a8da17 100644 --- a/functions/plugin.php +++ b/functions/plugin.php @@ -97,8 +97,9 @@ function soupNazi(){ $soup_menu = array('Mozilla/3','Mozilla/2','Mozilla/1', 'Opera 4', 'Opera/4', 'OmniWeb', 'Lynx'); + sqgetGlobalVar('HTTP_USER_AGENT', $user_agent, SQ_SERVER); foreach($soup_menu as $browser) { - if(stristr($_SERVER['HTTP_USER_AGENT'], $browser)) { + if(stristr($user_agent, $browser)) { return 1; } } diff --git a/functions/strings.php b/functions/strings.php index 96e8fb5e..d4adfaa7 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -12,6 +12,8 @@ * $Id$ */ +require_once(SM_PATH . 'functions/global.php'); + /** * SquirrelMail version number -- DO NOT CHANGE */ @@ -164,20 +166,15 @@ function getLineOfAddrs($array) { } function php_self () { - global $PHP_SELF, $_SERVER; - - if (isset($_SERVER['REQUEST_URI']) && !empty($_SERVER['REQUEST_URI']) ) { - return $_SERVER['REQUEST_URI']; - } - - if (isset($PHP_SELF) && !empty($PHP_SELF)) { - return $PHP_SELF; - } else if (isset($_SERVER['PHP_SELF']) && - !empty($_SERVER['PHP_SELF'])) { - return $_SERVER['PHP_SELF']; - } else { - return ''; + if ( sqgetGlobalVar('REQUEST_URI', $req_uri, SQ_SERVER) && !empty($req_uri) ) { + return $req_uri; } + + if ( sqgetGlobalVar('PHP_SELF', $php_self, SQ_SERVER) && !empty($php_self) ) { + return $php_self; + } + + return ''; } @@ -192,7 +189,7 @@ function php_self () { */ function get_location () { - global $_SERVER, $imap_server_type; + global $imap_server_type; /* Get the path, handle virtual directories */ $path = substr(php_self(), 0, strrpos(php_self(), '/')); @@ -207,28 +204,24 @@ function get_location () { */ $getEnvVar = getenv('HTTPS'); if ((isset($getEnvVar) && !strcasecmp($getEnvVar, 'on')) || - (isset($_SERVER['HTTPS']) && - !strcasecmp($_SERVER['HTTPS'], 'on')) || - (isset($_SERVER['SERVER_PORT']) && - $_SERVER['SERVER_PORT'] == 443)) { + (sqgetGlobalVar('HTTPS', $https_on, SQ_SERVER) && !strcasecmp($https_on, 'on')) || + (sqgetGlobalVar('SERVER_PORT', $server_port, SQ_SERVER) && $server_port == 443)) { $proto = 'https://'; } /* Get the hostname from the Host header or server config. */ - $host = ''; - if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) { - $host = $_SERVER['HTTP_HOST']; - } else if (isset($_SERVER['SERVER_NAME']) && - !empty($_SERVER['SERVER_NAME'])) { + if ( !sqgetGlobalVar('HTTP_HOST', $host, SQ_SERVER) || empty($host) ) { + if ( !sqgetGlobalVar('SERVER_NAME', $host, SQ_SERVER) || empty($host) ) { + $host = ''; + } } - $port = ''; if (! strstr($host, ':')) { - if (isset($_SERVER['SERVER_PORT'])) { - if (($_SERVER['SERVER_PORT'] != 80 && $proto == 'http://') - || ($_SERVER['SERVER_PORT'] != 443 && $proto == 'https://')) { - $port = sprintf(':%d', $_SERVER['SERVER_PORT']); + if (sqgetGlobalVar('SERVER_PORT', $server_port, SQ_SERVER)) { + if (($server_port != 80 && $proto == 'http://') || + ($server_port != 443 && $proto == 'https://')) { + $port = sprintf(':%d', $server_port); } } } @@ -305,7 +298,6 @@ function sq_mt_seed($Val) { * the same 'random' numbers twice in one session. */ function sq_mt_randomize() { - global $_SERVER; static $randomized; if ($randomized) { @@ -313,8 +305,10 @@ function sq_mt_randomize() { } /* Global. */ + sqgetGlobalVar('REMOTE_PORT', $remote_port, SQ_SERVER); + sqgetGlobalVar('REMOTE_ADDR', $remote_addr, SQ_SERVER); sq_mt_seed((int)((double) microtime() * 1000000)); - sq_mt_seed(md5($_SERVER['REMOTE_PORT'] . $_SERVER['REMOTE_ADDR'] . getmypid())); + sq_mt_seed(md5($remote_port . $remote_addr . getmypid())); /* getrusage */ if (function_exists('getrusage')) { @@ -330,8 +324,8 @@ function sq_mt_randomize() { } } - if(isset($_SERVER['UNIQUE_ID'])) { - sq_mt_seed(md5($_SERVER['UNIQUE_ID'])); + if(sqgetGlobalVar('UNIQUE_ID', $unique_id, SQ_SERVER)) { + sq_mt_seed(md5($unique_id)); } $randomized = 1; @@ -348,14 +342,6 @@ function OneTimePadCreate ($length=100) { return base64_encode($pad); } -/** - * Duplicate function: obsoleted. Use check_php_version. - */ -function sqCheckPHPVersion($major, $minor, $release) { - - return check_php_version($major, $minor, $release); -} - /** * Returns a string showing the size of the message/attachment. */ -- 2.25.1