Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

removed deprecated $HTTP_XXX_VARS

  • Loading branch information...
commit 5ecd59bb8bc87443ff8b9d696388ce4a19434174 1 parent dda0bcc
@acidvertigo acidvertigo authored
Showing with 12 additions and 12 deletions.
  1. +12 −12 catalog/admin/includes/application_top.php
View
24 catalog/admin/includes/application_top.php
@@ -35,7 +35,7 @@
require(DIR_WS_FUNCTIONS . 'compatibility.php');
// set php_self in the local scope
- $PHP_SELF = (((strlen(ini_get('cgi.fix_pathinfo')) > 0) && ((bool)ini_get('cgi.fix_pathinfo') == false)) || !isset($HTTP_SERVER_VARS['SCRIPT_NAME'])) ? basename($HTTP_SERVER_VARS['PHP_SELF']) : basename($HTTP_SERVER_VARS['SCRIPT_NAME']);
+ $PHP_SELF = (((strlen(ini_get('cgi.fix_pathinfo')) > 0) && ((bool)ini_get('cgi.fix_pathinfo') == false)) || !isset($_SERVER['SCRIPT_NAME'])) ? basename($_SERVER['PHP_SELF']) : basename($_SERVER['SCRIPT_NAME']);
// Used in the "Backup Manager" to compress backups
define('LOCAL_EXE_GZIP', 'gzip');
@@ -101,7 +101,7 @@
}
// set the language
- if (!tep_session_is_registered('language') || isset($HTTP_GET_VARS['language'])) {
+ if (!tep_session_is_registered('language') || isset($_GET['language'])) {
if (!tep_session_is_registered('language')) {
tep_session_register('language');
tep_session_register('languages_id');
@@ -110,8 +110,8 @@
include(DIR_WS_CLASSES . 'language.php');
$lng = new language();
- if (isset($HTTP_GET_VARS['language']) && tep_not_null($HTTP_GET_VARS['language'])) {
- $lng->set_language($HTTP_GET_VARS['language']);
+ if (isset($_GET['language']) && tep_not_null($_GET['language'])) {
+ $lng->set_language($_GET['language']);
} else {
$lng->get_browser_language();
}
@@ -130,7 +130,7 @@
// so the redirection on a successful login is not made to the login page again
if ( ($current_page == FILENAME_LOGIN) && !tep_session_is_registered('redirect_origin') ) {
$current_page = FILENAME_DEFAULT;
- $HTTP_GET_VARS = array();
+ $_GET = array();
}
if ($current_page != FILENAME_LOGIN) {
@@ -138,21 +138,21 @@
tep_session_register('redirect_origin');
$redirect_origin = array('page' => $current_page,
- 'get' => $HTTP_GET_VARS);
+ 'get' => $_GET);
}
// try to automatically login with the HTTP Authentication values if it exists
if (!tep_session_is_registered('auth_ignore')) {
- if (isset($HTTP_SERVER_VARS['PHP_AUTH_USER']) && !empty($HTTP_SERVER_VARS['PHP_AUTH_USER']) && isset($HTTP_SERVER_VARS['PHP_AUTH_PW']) && !empty($HTTP_SERVER_VARS['PHP_AUTH_PW'])) {
- $redirect_origin['auth_user'] = $HTTP_SERVER_VARS['PHP_AUTH_USER'];
- $redirect_origin['auth_pw'] = $HTTP_SERVER_VARS['PHP_AUTH_PW'];
+ if (isset($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) && !empty($_SERVER['PHP_AUTH_PW'])) {
+ $redirect_origin['auth_user'] = $_SERVER['PHP_AUTH_USER'];
+ $redirect_origin['auth_pw'] = $_SERVER['PHP_AUTH_PW'];
}
}
$redirect = true;
}
- if (!isset($login_request) || isset($HTTP_GET_VARS['login_request']) || isset($HTTP_POST_VARS['login_request']) || isset($HTTP_COOKIE_VARS['login_request']) || isset($HTTP_SESSION_VARS['login_request']) || isset($HTTP_POST_FILES['login_request']) || isset($HTTP_SERVER_VARS['login_request'])) {
+ if (!isset($login_request) || isset($_GET['login_request']) || isset($_POST['login_request']) || isset($_COOKIE['login_request']) || isset($_SESSION['login_request']) || isset($_FILES['login_request']) || isset($_SERVER['login_request'])) {
$redirect = true;
}
@@ -201,8 +201,8 @@
require(DIR_WS_CLASSES . 'action_recorder.php');
// calculate category path
- if (isset($HTTP_GET_VARS['cPath'])) {
- $cPath = $HTTP_GET_VARS['cPath'];
+ if (isset($_GET['cPath'])) {
+ $cPath = $_GET['cPath'];
} else {
$cPath = '';
}
Please sign in to comment.
Something went wrong with that request. Please try again.