nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Sebastian Mendel
2007-10-18 09:03:01 +00:00
parent 37a4099a4f
commit d138f1f856
5 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
index.php
View File

@@ -42,7 +42,6 @@ require_once './libraries/relation.lib.php';
session_write_close(); session_write_close();
// Gets the host name // Gets the host name
// loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
if (empty($HTTP_HOST)) { if (empty($HTTP_HOST)) {
if (PMA_getenv('HTTP_HOST')) { if (PMA_getenv('HTTP_HOST')) {
$HTTP_HOST = PMA_getenv('HTTP_HOST'); $HTTP_HOST = PMA_getenv('HTTP_HOST');

7
libraries/File.class.php
View File

@@ -342,14 +342,9 @@ class PMA_File
'type' => $file['type']['multi_edit'][$primary], 'type' => $file['type']['multi_edit'][$primary],
'size' => $file['size']['multi_edit'][$primary], 'size' => $file['size']['multi_edit'][$primary],
'tmp_name' => $file['tmp_name']['multi_edit'][$primary], 'tmp_name' => $file['tmp_name']['multi_edit'][$primary],
//'error' => $file['error']['multi_edit'][$primary], 'error' => $file['error']['multi_edit'][$primary],
); );
// ['error'] exists since PHP 4.2.0
if (isset($file['error'])) {
$new_file['error'] = $file['error']['multi_edit'][$primary];
}
return $new_file; return $new_file;
} }

2
libraries/auth/http.auth.lib.php
View File

@@ -99,7 +99,6 @@ function PMA_auth_check()
// Grabs the $PHP_AUTH_USER variable whatever are the values of the // Grabs the $PHP_AUTH_USER variable whatever are the values of the
// 'register_globals' and the 'variables_order' directives // 'register_globals' and the 'variables_order' directives
// loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
if (empty($PHP_AUTH_USER)) { if (empty($PHP_AUTH_USER)) {
if (PMA_getenv('PHP_AUTH_USER')) { if (PMA_getenv('PHP_AUTH_USER')) {
$PHP_AUTH_USER = PMA_getenv('PHP_AUTH_USER'); $PHP_AUTH_USER = PMA_getenv('PHP_AUTH_USER');
@@ -122,7 +121,6 @@ function PMA_auth_check()
} }
// Grabs the $PHP_AUTH_PW variable whatever are the values of the // Grabs the $PHP_AUTH_PW variable whatever are the values of the
// 'register_globals' and the 'variables_order' directives // 'register_globals' and the 'variables_order' directives
// loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
if (empty($PHP_AUTH_PW)) { if (empty($PHP_AUTH_PW)) {
if (PMA_getenv('PHP_AUTH_PW')) { if (PMA_getenv('PHP_AUTH_PW')) {
$PHP_AUTH_PW = PMA_getenv('PHP_AUTH_PW'); $PHP_AUTH_PW = PMA_getenv('PHP_AUTH_PW');

2
libraries/grab_globals.lib.php
View File

@@ -6,8 +6,6 @@
* the same work for the $PHP_SELF, $HTTP_ACCEPT_LANGUAGE and * the same work for the $PHP_SELF, $HTTP_ACCEPT_LANGUAGE and
* $HTTP_AUTHORIZATION variables. * $HTTP_AUTHORIZATION variables.
* *
* loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
*
* @version $Id$ * @version $Id$
*/ */

1
libraries/ip_allow_deny.lib.php
View File

@@ -170,7 +170,6 @@ function PMA_allowDeny($type)
} }
// Handle shortcuts with above array // Handle shortcuts with above array
// DON'T use "array_key_exists" as it's only PHP 4.1 and newer.
if (isset($shortcuts[$rule_data[2]])) { if (isset($shortcuts[$rule_data[2]])) {
$rule_data[2] = $shortcuts[$rule_data[2]]; $rule_data[2] = $shortcuts[$rule_data[2]];
} }