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

PHP_AUTH_* is only available in $_SERVER

Browse Source
This commit is contained in:
Sebastian Mendel
2006-04-11 13:41:18 +00:00
parent e89d764725
commit bb282af7a6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,9 @@ function PMA_auth_check()
// '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+ // 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 (getenv('PHP_AUTH_USER')) { if (isset($_SERVER['PHP_AUTH_USER'])) {
$PHP_AUTH_USER = $_SERVER['PHP_AUTH_USER'];
} elseif (getenv('PHP_AUTH_USER')) {
$PHP_AUTH_USER = getenv('PHP_AUTH_USER'); $PHP_AUTH_USER = getenv('PHP_AUTH_USER');
} elseif (getenv('REMOTE_USER')) { } elseif (getenv('REMOTE_USER')) {
// CGI, might be encoded, see bellow // CGI, might be encoded, see bellow
@@ -99,15 +101,15 @@ function PMA_auth_check()
// '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+ // 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 (getenv('PHP_AUTH_PW')) { if (isset($_SERVER['PHP_AUTH_PW'])) {
$PHP_AUTH_PW = $_SERVER['PHP_AUTH_PW'];
} elseif (getenv('PHP_AUTH_PW')) {
$PHP_AUTH_PW = getenv('PHP_AUTH_PW'); $PHP_AUTH_PW = getenv('PHP_AUTH_PW');
} } elseif (getenv('REMOTE_PASSWORD')) {
// Apache/CGI // Apache/CGI
elseif (@getenv('REMOTE_PASSWORD')) {
$PHP_AUTH_PW = getenv('REMOTE_PASSWORD'); $PHP_AUTH_PW = getenv('REMOTE_PASSWORD');
} } elseif (getenv('AUTH_PASSWORD')) {
// WebSite Professional // WebSite Professional
elseif (@getenv('AUTH_PASSWORD')) {
$PHP_AUTH_PW = getenv('AUTH_PASSWORD'); $PHP_AUTH_PW = getenv('AUTH_PASSWORD');
} }
} }