Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8537] trunk
|
From: <var...@us...> - 2012-11-26 13:47:35
|
Revision: 8537
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8537&view=rev
Author: vargenau
Date: 2012-11-26 13:47:24 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
$HTTP_SERVER_VARS --> $_SERVER
Modified Paths:
--------------
trunk/RPC2.php
trunk/configurator.php
trunk/lib/ErrorManager.php
trunk/lib/IniConfig.php
trunk/lib/imagecache.php
trunk/lib/main.php
trunk/passencrypt.php
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/RPC2.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -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.');
}
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/configurator.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -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'];
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/ErrorManager.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -566,8 +566,7 @@
function printSimpleTrace($bt)
{
- global $HTTP_SERVER_VARS;
- $nl = isset($HTTP_SERVER_VARS['REQUEST_METHOD']) ? "<br />" : "\n";
+ $nl = isset($_SERVER['REQUEST_METHOD']) ? "<br />" : "\n";
echo $nl . "Traceback:" . $nl;
foreach ($bt as $i => $elem) {
if (!array_key_exists('file', $elem)) {
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/IniConfig.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -586,7 +586,7 @@
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 @@
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 @@
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_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 @@
//
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 @@
// 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 @@
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']);
}
Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/imagecache.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -64,11 +64,11 @@
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'];
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/main.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -977,7 +977,7 @@
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 @@
// 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 @@
}
// 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 @@
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;
Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/passencrypt.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -149,7 +149,7 @@
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'];
?>
<form action="<?php echo $REQUEST_URI ?>" method="post">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
