From d2eecef75c4adef637a8fc97afeb934fc72f9a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Sun, 21 Apr 2002 20:47:43 +0000
Subject: [PATCH] Fix for http authentication mode with IIS

---
 ChangeLog                         |  7 +++++++
 libraries/auth/http.auth.lib.php3 | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 83d2ae8ee..0f92eb2d6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-04-21 Loïc Chapeaux  <lolo@phpheaven.net>
+	* libraries/auth/http.auth.lib.php3: tried a fix to allow the use of http
+	  authentication mode with IIS.
+
+2002-04-21 Marc Delisle  <lem9@users.sourceforge.net>
+	* ### 2.2.6 released ###
+
 2002-04-21 Loïc Chapeaux  <lolo@phpheaven.net>
 	* sql.php3; libraries/functions.js: improved regexp used to find some
 	  statements in order to "fix" an error reported by
diff --git a/libraries/auth/http.auth.lib.php3 b/libraries/auth/http.auth.lib.php3
index fb5bf3d26..81e7a0178 100644
--- a/libraries/auth/http.auth.lib.php3
+++ b/libraries/auth/http.auth.lib.php3
@@ -88,6 +88,7 @@ h1       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
         global $PHP_AUTH_USER, $PHP_AUTH_PW;
         global $HTTP_SERVER_VARS, $HTTP_ENV_VARS;
         global $REMOTE_USER, $AUTH_USER, $REMOTE_PASSWORD, $AUTH_PASSWORD;
+        global $HTTP_AUTHORIZATION;
         global $old_usr;
 
         // Grabs the $PHP_AUTH_USER variable whatever are the values of the
@@ -162,6 +163,28 @@ h1       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo
                 $PHP_AUTH_PW = getenv('AUTH_PASSWORD');
             }
         }
+        // Gets authenticated user settings with IIS
+        if (empty($PHP_AUTH_USER) && empty($PHP_AUTH_PW)
+            && function_exists('base64_decode')) {
+            if (!empty($HTTP_AUTHORIZATION)
+                && ereg('^Basic ', $HTTP_AUTHORIZATION)) {
+                list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($HTTP_AUTHORIZATION, 6)));
+            }
+            else if (!empty($_ENV)
+                 && isset($_ENV['HTTP_AUTHORIZATION'])
+                 && ereg('^Basic ', $_ENV['HTTP_AUTHORIZATION'])) {
+                list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($_ENV['HTTP_AUTHORIZATION'], 6)));
+            }
+            else if (!empty($HTTP_ENV_VARS)
+                     && isset($HTTP_ENV_VARS['HTTP_AUTHORIZATION'])
+                     && ereg('^Basic ', $HTTP_ENV_VARS['HTTP_AUTHORIZATION'])) {
+                list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr($HTTP_ENV_VARS['HTTP_AUTHORIZATION'], 6)));
+            }
+            else if (@getenv('HTTP_AUTHORIZATION')
+                     && ereg('^Basic ', getenv('HTTP_AUTHORIZATION'))) {
+                list($PHP_AUTH_USER, $PHP_AUTH_PW) = explode(':', base64_decode(substr(getenv('HTTP_AUTHORIZATION'), 6)));
+            }
+        } // end IIS
 
         // User logged out -> ensure the new username is not the same
         if (!empty($old_usr)