Cleanup hacke v.2

diff --git a/lib/base.php b/lib/base.php
index 8622d0f8bf10b1d7219a249d7108b7f5bc1c093e..42d8fb3c8d921e70d872599a90b761726ff92f9f 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -572,6 +572,7 @@ class OC {
                }
 
                OC::tryBasicAuthLogin();
+
                if (!self::$CLI) {
                        try {
                                if (!OC_Config::getValue('maintenance', false)) {
@@ -679,9 +680,8 @@ class OC {
                        $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));
        }
 
@@ -779,8 +779,6 @@ 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();
                }
                return true;
        }