|
|
|
|
@ -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); |
|
|
|
|
|