From 14ff3c472912c9745ce25e0588a0a2a6d871113a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 15 Dec 2006 17:47:38 +0000
Subject: [PATCH] bug #1615313, doc refers to auth_type HTTP so enable it

---
 ChangeLog                    | 5 +++++
 Documentation.html           | 6 +++---
 libraries/common.lib.php     | 2 ++
 libraries/config.default.php | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a9a9c17c..7744076a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2006-12-15 Marc Delisle  <lem9@users.sourceforge.net>
+    * Documentation.html, libraries/common.lib.php, config.default.php:
+      bug #1615313, doc referred to HTTP so enable the code to accept
+      either HTTP or http as auth_type
+
 2006-12-15 Michal Čihař  <michal@cihar.com>
     * lang/czech: Updated.
 
diff --git a/Documentation.html b/Documentation.html
index e6bb3f759..971cb1129 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -657,9 +657,9 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
         &quot;stduser/stdpass&quot;.</dd>
 
     <dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string
-        <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'cookie'|'config']</tt></dt>
+        <tt>['<abbr title="HyperText Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt></dt>
     <dd>Whether config or cookie or
-        <abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication
+        <abbr title="HyperText Transfer Protocol">HTTP</abbr> or signon authentication
         should be used for this server.
         <ul><li>'config' authentication (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>)
                 is the plain old way: username and password are stored in
@@ -672,7 +672,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
                 ends. This can also allow you to log in in arbitrary server if
                 <tt><a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled.
             </li>
-            <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in older versions)
+            <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in older versions and can be written also as 'http')
                 (<tt>$auth_type&nbsp;=&nbsp;'<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) as introduced in 1.3.0
                 allows you to log in as any valid MySQL user via HTTP-Auth.</li>
             <li>'signon' authentication mode 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 63c18d09f..4c4e6e437 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3046,6 +3046,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // (for a quick check of path disclosure in auth/cookies:)
         $coming_from_common = true;
 
+        // to allow HTTP or http
+        $cfg['Server']['auth_type'] = strtolower($cfg['Server']['auth_type']);
         if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
             header('Location: error.php'
                     . '?lang='  . urlencode($available_languages[$lang][2])
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 71df2e4bb..7c1fd6c8a 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -69,7 +69,7 @@ $cfg['Servers'][$i]['controlpass']   = '';          // access to the "mysql/user
                                                     // The controluser is also
                                                     // used for all relational
                                                     // features (pmadb)
-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http, signon or cookie based)?
+$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
 $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
 $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                     // with 'config' auth_type)