From f734fdbf746a73fbca9138e1734a3f6f55f8eb0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Mon, 3 Sep 2001 23:18:08 +0000
Subject: [PATCH] fixed bug #458160 - Advanced auth fails on WebSite Pro,
 thanks to Matthias Fichtner

---
 ChangeLog    |  7 +++++--
 lib.inc.php3 | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db85fca09..e9f412f25 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,11 @@ $Source$
 	  Michal Cihar <nijel at users.sourceforge.net>.
 	* lang/brazilian_portuguese.inc.php3: updated thanks to
 	  Renato Lins <TheBest at Information4u.com>.
-	* lib.inc.php3: fixed bug #458009 - Database list with advanced auth.,
-	  thanks to an anonymous contributor.
+	* lib.inc.php3:
+	  - fixed bug #458009 - Database list with advanced auth., thanks to
+	    an anonymous contributor;
+	  - fixed bug #458160 - Advanced auth fails on WebSite Pro, thanks to
+	    Matthias Fichtner <mfichtner at users.sourceforge.net>.
 	* db_readdump.php3, lines 101-104: removed non alphabetic characters from
 	  the beginning of the sql query submitted.
 
diff --git a/lib.inc.php3 b/lib.inc.php3
index f51c2cf32..a6a84e40e 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -259,6 +259,13 @@ if (!defined('__LIB_INC__')){
                 else if (@getenv('REMOTE_USER')) {
                     $PHP_AUTH_USER = getenv('REMOTE_USER');
                 }
+                // Fix from Matthias Fichtner for WebSite Professional - Part 1
+                else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['AUTH_USER'])) {
+                    $PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_USER'];
+                }
+                else if (@getenv('AUTH_USER')) {
+                    $PHP_AUTH_USER = getenv('AUTH_USER');
+                }
             }
             // Grabs the $PHP_AUTH_PW variable whatever are the values of the
             // 'register_globals' and the 'variables_order' directives
@@ -275,6 +282,13 @@ if (!defined('__LIB_INC__')){
                 else if (@getenv('REMOTE_PASSWORD')) {
                     $PHP_AUTH_PW = getenv('REMOTE_PASSWORD');
                 }
+                // Fix from Matthias Fichtner for WebSite Professional - Part 2
+                else if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['AUTH_PASSWORD'])) {
+                    $PHP_AUTH_USER = $HTTP_ENV_VARS['AUTH_PASSWORD'];
+                }
+                else if (@getenv('AUTH_PASSWORD')) {
+                    $PHP_AUTH_USER = getenv('AUTH_PASSWORD');
+                }
             }
             // Grabs the $old_usr variable whatever are the values of the
             // 'register_globals' and the 'variables_order' directives