From e21649ccfffc8f4c02b62126d8b49d45ba280656 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 31 May 2013 00:53:15 +0200
Subject: [PATCH] Revert "Clean up hack."

This reverts commit 138c7f615bef9994629d4aa283ae7f037dc0f14d.
---
 3rdparty     | 2 +-
 lib/base.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 mode change 120000 => 160000 3rdparty

diff --git a/3rdparty b/3rdparty
deleted file mode 120000
index ae24324a4bd..00000000000
--- a/3rdparty
+++ /dev/null
@@ -1 +0,0 @@
-/home/tol/owncloud/3rdparty/
\ No newline at end of file
diff --git a/3rdparty b/3rdparty
new file mode 160000
index 00000000000..a13af72fbe8
--- /dev/null
+++ b/3rdparty
@@ -0,0 +1 @@
+Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
diff --git a/lib/base.php b/lib/base.php
index 42d8fb3c8d9..8622d0f8bf1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -572,7 +572,6 @@ class OC {
 		}
 
 		OC::tryBasicAuthLogin();
-
 		if (!self::$CLI) {
 			try {
 				if (!OC_Config::getValue('maintenance', false)) {
@@ -680,8 +679,9 @@ 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,6 +779,8 @@ 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;
 	}
-- 
2.39.5