Backport #3487 Basic Auth fix

diff --git a/lib/base.php b/lib/base.php
index 9a59e63dc45379f515c2e235fa4c93529842dd23..93ecb9d1aa665cf696a38feab43ef4dd357a131b 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -609,6 +609,9 @@ class OC {
                        self::checkUpgrade();
                }
 
+               // Test if the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+               OC::tryBasicAuthLogin();
+
                if (!self::$CLI) {
                        try {
                                if (!OC_Config::getValue('maintenance', false)) {
@@ -714,10 +717,6 @@ class OC {
                        // Someone wants to log in :
                } elseif (OC::tryFormLogin()) {
                        $error[] = 'invalidpassword';
-
-                       // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-               } elseif (OC::tryBasicAuthLogin()) {
-                       $error[] = 'invalidpassword';
                }
                OC_Util::displayLoginPage(array_unique($error));
        }
@@ -816,8 +815,7 @@ class OC {
                if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
                        //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
                        OC_User::unsetMagicInCookie();
-                       $_REQUEST['redirect_url'] = OC_Request::requestUri();
-                       OC_Util::redirectToDefaultPage();
+                       $_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
                }
                return true;
        }