From 916d7bfbf50905182342b210f010afca34cbcead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Tue, 4 Sep 2001 06:26:26 +0000
Subject: [PATCH] improved the fix for bug #458160 thanks to Matthias Fichtner
 again

---
 ChangeLog    | 4 ++++
 lib.inc.php3 | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e9f412f25..cbb75dc19 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-09-04  Loï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ïc Chapeaux  <lolo@phpheaven.net>
 	* lang/czech-iso.inc.php3 & czech-win1250.inc.php3: updated thanks to
 	  Michal Cihar <nijel at users.sourceforge.net>.
diff --git a/lib.inc.php3 b/lib.inc.php3
index a6a84e40e..58cd52c8a 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -260,6 +260,9 @@ if (!defined('__LIB_INC__')){
                     $PHP_AUTH_USER = getenv('REMOTE_USER');
                 }
                 // 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'])) {
                     $PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_USER'];
                 }
@@ -283,6 +286,9 @@ if (!defined('__LIB_INC__')){
                     $PHP_AUTH_PW = getenv('REMOTE_PASSWORD');
                 }
                 // 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'])) {
                     $PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_PASSWORD'];
                 }