From fb3829e8b89237c12048344fb6b2fd6151ee0d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 14 Oct 2013 14:46:43 +0200 Subject: [PATCH 1/2] file system is now initialized with apache authentication as well --- lib/private/connector/sabre/auth.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index d2fd74c44f..5491d37631 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -73,15 +73,11 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { */ public function authenticate(Sabre_DAV_Server $server, $realm) { - if (OC_User::handleApacheAuth()) { - return true; - } - - if (OC_User::isLoggedIn()) { + if (OC_User::handleApacheAuth() || OC_User::isLoggedIn()) { $user = OC_User::getUser(); OC_Util::setupFS($user); $this->currentUser = $user; - return true; + return true; } return parent::authenticate($server, $realm); From 5318df3b3c45e9a5e99ac4eae62f909542de52ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 14 Oct 2013 14:51:25 +0200 Subject: [PATCH 2/2] there shall be tabs --- lib/private/connector/sabre/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index 5491d37631..0c84fa6b75 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -77,7 +77,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { $user = OC_User::getUser(); OC_Util::setupFS($user); $this->currentUser = $user; - return true; + return true; } return parent::authenticate($server, $realm);