From 336c4540a79570777503fc7dfe364d63a12ded9d Mon Sep 17 00:00:00 2001 From: vargenau Date: Mon, 26 Nov 2012 13:47:24 +0000 Subject: [PATCH] $HTTP_SERVER_VARS --> $_SERVER git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8537 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- RPC2.php | 2 +- configurator.php | 2 +- lib/ErrorManager.php | 3 +-- lib/IniConfig.php | 26 +++++++++++++------------- lib/imagecache.php | 6 +++--- lib/main.php | 20 ++++++++++---------- passencrypt.php | 2 +- 7 files changed, 30 insertions(+), 31 deletions(-) diff --git a/RPC2.php b/RPC2.php index e6f3fb2c3..7c6901b2d 100644 --- a/RPC2.php +++ b/RPC2.php @@ -11,7 +11,7 @@ // Intercept GET requests from confused users. Only POST is allowed here! if (empty($GLOBALS['HTTP_SERVER_VARS'])) $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER; -if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST") { +if ($_SERVER['REQUEST_METHOD'] != "POST") { die('This is the address of the XML-RPC interface.' . ' You must use XML-RPC calls to access information here.'); } diff --git a/configurator.php b/configurator.php index b7a7d5e87..04cf5ffa1 100644 --- a/configurator.php +++ b/configurator.php @@ -53,7 +53,7 @@ * subsequent requests will fail. (POST to save the INI) */ -global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth; +global $HTTP_POST_VARS, $tdwidth; if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS']; if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS']; diff --git a/lib/ErrorManager.php b/lib/ErrorManager.php index 664bc41d4..4cfb02e05 100644 --- a/lib/ErrorManager.php +++ b/lib/ErrorManager.php @@ -566,8 +566,7 @@ class PhpError function printSimpleTrace($bt) { - global $HTTP_SERVER_VARS; - $nl = isset($HTTP_SERVER_VARS['REQUEST_METHOD']) ? "
" : "\n"; + $nl = isset($_SERVER['REQUEST_METHOD']) ? "
" : "\n"; echo $nl . "Traceback:" . $nl; foreach ($bt as $i => $elem) { if (!array_key_exists('file', $elem)) { diff --git a/lib/IniConfig.php b/lib/IniConfig.php index 81e999ca4..16ccee1c1 100644 --- a/lib/IniConfig.php +++ b/lib/IniConfig.php @@ -586,7 +586,7 @@ function _ignore_unknown_charset_warning(&$error) function fixup_static_configs($file) { global $FieldSeparator, $charset, $WikiNameRegexp, $AllActionPages; - global $HTTP_SERVER_VARS, $DBParams, $LANG, $ErrorManager; + global $DBParams, $LANG, $ErrorManager; // init FileFinder to add proper include paths FindFile("lib/interwiki.map", true); @@ -864,7 +864,7 @@ function fixup_static_configs($file) run_install("_part1"); trigger_error($error, E_USER_ERROR); exit(); - } elseif ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") { + } elseif ($_SERVER["REQUEST_METHOD"] == "POST") { $GLOBALS['HTTP_GET_VARS']['show'] = '_part1'; trigger_error($error, E_USER_WARNING); } @@ -880,7 +880,7 @@ function fixup_static_configs($file) run_install("_part1"); trigger_error($error, E_USER_ERROR); exit(); - } elseif ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") { + } elseif ($_SERVER["REQUEST_METHOD"] == "POST") { $GLOBALS['HTTP_GET_VARS']['show'] = '_part1'; trigger_error($error, E_USER_WARNING); } @@ -925,7 +925,7 @@ function fixup_static_configs($file) function fixup_dynamic_configs() { global $WikiNameRegexp; - global $HTTP_SERVER_VARS, $DBParams, $LANG; + global $DBParams, $LANG; if (defined('INCLUDE_PATH') and INCLUDE_PATH) { @ini_set('include_path', INCLUDE_PATH); @@ -1017,21 +1017,21 @@ function fixup_dynamic_configs() // foreach (array('SERVER_NAME', 'SERVER_PORT') as $var) { //FIXME: for CGI without _SERVER - if (!defined($var) and !empty($HTTP_SERVER_VARS[$var])) + if (!defined($var) and !empty($_SERVER[$var])) // IPV6 fix by matt brown, #1546571 // An IPv6 address must be surrounded by square brackets to form a valid server name. if ($var == 'SERVER_NAME' && - strstr($HTTP_SERVER_VARS[$var], ':') + strstr($_SERVER[$var], ':') ) { - define($var, '[' . $HTTP_SERVER_VARS[$var] . ']'); + define($var, '[' . $_SERVER[$var] . ']'); } else { - define($var, $HTTP_SERVER_VARS[$var]); + define($var, $_SERVER[$var]); } } if (!defined('SERVER_NAME')) define('SERVER_NAME', '127.0.0.1'); if (!defined('SERVER_PORT')) define('SERVER_PORT', 80); if (!defined('SERVER_PROTOCOL')) { - if (empty($HTTP_SERVER_VARS['HTTPS']) || $HTTP_SERVER_VARS['HTTPS'] == 'off') + if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') define('SERVER_PROTOCOL', 'http'); else define('SERVER_PROTOCOL', 'https'); @@ -1100,7 +1100,7 @@ function fixup_dynamic_configs() // pages will appear at e.g. '/wikidir/index.php/HomePage'. // - $REDIRECT_URL = &$HTTP_SERVER_VARS['REDIRECT_URL']; + $REDIRECT_URL = &$_SERVER['REDIRECT_URL']; if (USE_PATH_INFO and isset($REDIRECT_URL) and !IsProbablyRedirectToIndex() ) { @@ -1140,11 +1140,11 @@ function fixup_dynamic_configs() define('SCRIPT_FILENAME', $SCRIPT_FILENAME); // Get remote host name, if Apache hasn't done it for us - if (empty($HTTP_SERVER_VARS['REMOTE_HOST']) - and !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) + if (empty($_SERVER['REMOTE_HOST']) + and !empty($_SERVER['REMOTE_ADDR']) and ENABLE_REVERSE_DNS ) - $HTTP_SERVER_VARS['REMOTE_HOST'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']); + $_SERVER['REMOTE_HOST'] = gethostbyaddr($_SERVER['REMOTE_ADDR']); } diff --git a/lib/imagecache.php b/lib/imagecache.php index a5b3e50f6..ebc20dcc5 100644 --- a/lib/imagecache.php +++ b/lib/imagecache.php @@ -64,11 +64,11 @@ function deducePagename($request) function deduceUsername() { - global $request, $HTTP_SERVER_VARS, $HTTP_ENV_VARS; + global $request, $HTTP_ENV_VARS; if (!empty($request->args['auth']) and !empty($request->args['auth']['userid'])) return $request->args['auth']['userid']; - if (!empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) - return $HTTP_SERVER_VARS['PHP_AUTH_USER']; + if (!empty($_SERVER['PHP_AUTH_USER'])) + return $_SERVER['PHP_AUTH_USER']; if (!empty($HTTP_ENV_VARS['REMOTE_USER'])) return $HTTP_ENV_VARS['REMOTE_USER']; diff --git a/lib/main.php b/lib/main.php index 3accc9349..4ef473f0c 100644 --- a/lib/main.php +++ b/lib/main.php @@ -977,7 +977,7 @@ class WikiRequest extends Request function _deduceUsername() { - global $HTTP_SERVER_VARS, $HTTP_ENV_VARS; + global $HTTP_ENV_VARS; if (!empty($this->args['auth']) and !empty($this->args['auth']['userid'])) return $this->args['auth']['userid']; @@ -987,7 +987,7 @@ class WikiRequest extends Request // Note: There's no way to demandload a missing class-definition // afterwards! Stupid php. if (defined('FUSIONFORGE') and FUSIONFORGE) { - if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) { + if (empty($_SERVER['PHP_AUTH_USER'])) { return false; } } elseif (isa($user, WikiUserClassname())) { @@ -998,11 +998,11 @@ class WikiRequest extends Request } // Sessions override http auth - if (!empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) - return $HTTP_SERVER_VARS['PHP_AUTH_USER']; + if (!empty($_SERVER['PHP_AUTH_USER'])) + return $_SERVER['PHP_AUTH_USER']; // pubcookie et al - if (!empty($HTTP_SERVER_VARS['REMOTE_USER'])) - return $HTTP_SERVER_VARS['REMOTE_USER']; + if (!empty($_SERVER['REMOTE_USER'])) + return $_SERVER['REMOTE_USER']; if (!empty($HTTP_ENV_VARS['REMOTE_USER'])) return $HTTP_ENV_VARS['REMOTE_USER']; @@ -1018,10 +1018,10 @@ class WikiRequest extends Request trigger_error("Wrong always_populate_raw_post_data = Off setting in your php.ini\nCannot use xmlrpc!", E_USER_ERROR); // wiki.putPage has special otional userid/passwd arguments. check that later. $userid = ''; - if (isset($HTTP_SERVER_VARS['REMOTE_USER'])) - $userid = $HTTP_SERVER_VARS['REMOTE_USER']; - elseif (isset($HTTP_SERVER_VARS['REMOTE_ADDR'])) - $userid = $HTTP_SERVER_VARS['REMOTE_ADDR']; elseif (isset($HTTP_ENV_VARS['REMOTE_ADDR'])) + if (isset($_SERVER['REMOTE_USER'])) + $userid = $_SERVER['REMOTE_USER']; + elseif (isset($_SERVER['REMOTE_ADDR'])) + $userid = $_SERVER['REMOTE_ADDR']; elseif (isset($HTTP_ENV_VARS['REMOTE_ADDR'])) $userid = $HTTP_ENV_VARS['REMOTE_ADDR']; elseif (isset($GLOBALS['REMOTE_ADDR'])) $userid = $GLOBALS['REMOTE_ADDR']; return $userid; diff --git a/passencrypt.php b/passencrypt.php index b00ffe168..cdfd3a13b 100644 --- a/passencrypt.php +++ b/passencrypt.php @@ -149,7 +149,7 @@ if (($posted['password'] != "") if (empty($REQUEST_URI)) $REQUEST_URI = $HTTP_ENV_VARS['REQUEST_URI']; if (empty($REQUEST_URI)) - $REQUEST_URI = $HTTP_SERVER_VARS['REQUEST_URI']; + $REQUEST_URI = $_SERVER['REQUEST_URI']; ?>
-- 2.45.0