Merge pull request #11130 from owncloud/moveBasicAuthCheck

Move basic auth check

1 files changed, 4 insertions, 12 deletions

diff --git a/lib/base.php b/lib/base.php
index e21d0124b32..76e0b9cf670 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -710,15 +710,6 @@ class OC {
 			self::checkUpgrade();
 		}
 
-		if (!OC_User::isLoggedIn()) {
-			// Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-			if (!OC_Config::getValue('maintenance', false) && !self::checkUpgrade(false)) {
-				OC_App::loadApps(array('authentication'));
-			}
-			OC::tryBasicAuthLogin();
-		}
-
-
 		if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
 			try {
 				if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
@@ -842,8 +833,9 @@ class OC {
 		} // remember was checked after last login
 		elseif (OC::tryRememberLogin()) {
 			$error[] = 'invalidcookie';
-		} // logon via web form
-		elseif (OC::tryFormLogin()) {
+		} // logon via web form or WebDAV
+		elseif (OC::tryFormLogin()) {}
+		elseif (OC::tryBasicAuthLogin()) {
 			$error[] = 'invalidpassword';
 		}
 
@@ -974,10 +966,10 @@ 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();
 			$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
 		}
+
 		return true;
 	}