From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 30 May 2013 22:53:57 +0000 (+0200)
Subject: Cleanup hacke v.2
X-Git-Tag: v6.0.0alpha2~459^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad5c4bf7717d96142d3b7a3526022e5bccecfdcc;p=nextcloud-server.git

Cleanup hacke v.2
---

diff --git a/lib/base.php b/lib/base.php
index 8622d0f8bf1..42d8fb3c8d9 100644
--- 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;
 	}