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

improved the fix for bug #458160 thanks to Matthias Fichtner again

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-09-04 06:26:26 +00:00
parent f734fdbf74
commit 916d7bfbf5
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-09-04 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* lib.inc.php3: improved the fix for bug #458160 - Advanced auth fails on
WebSite Pro, thanks to Matthias Fichtner again.
2001-09-03 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-09-03 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* lang/czech-iso.inc.php3 & czech-win1250.inc.php3: updated thanks to * lang/czech-iso.inc.php3 & czech-win1250.inc.php3: updated thanks to
Michal Cihar <nijel at users.sourceforge.net>. Michal Cihar <nijel at users.sourceforge.net>.

6
lib.inc.php3
View File

@@ -260,6 +260,9 @@ if (!defined('__LIB_INC__')){
$PHP_AUTH_USER = getenv('REMOTE_USER'); $PHP_AUTH_USER = getenv('REMOTE_USER');
} }
// Fix from Matthias Fichtner for WebSite Professional - Part 1 // Fix from Matthias Fichtner for WebSite Professional - Part 1
else if (isset($AUTH_USER)) {
$PHP_AUTH_USER = $AUTH_USER;
}
else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['AUTH_USER'])) { else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['AUTH_USER'])) {
$PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_USER']; $PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_USER'];
} }
@@ -283,6 +286,9 @@ if (!defined('__LIB_INC__')){
$PHP_AUTH_PW = getenv('REMOTE_PASSWORD'); $PHP_AUTH_PW = getenv('REMOTE_PASSWORD');
} }
// Fix from Matthias Fichtner for WebSite Professional - Part 2 // Fix from Matthias Fichtner for WebSite Professional - Part 2
else if (isset($AUTH_PASSWORD)) {
$PHP_AUTH_PW = $AUTH_PASSWORD;
}
else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['AUTH_PASSWORD'])) { else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['AUTH_PASSWORD'])) {
$PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_PASSWORD']; $PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_PASSWORD'];
} }