file system is now initialized with apache authentication as well
This commit is contained in:
parent
e9ce704f17
commit
fb3829e8b8
|
@ -73,15 +73,11 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
|
||||||
*/
|
*/
|
||||||
public function authenticate(Sabre_DAV_Server $server, $realm) {
|
public function authenticate(Sabre_DAV_Server $server, $realm) {
|
||||||
|
|
||||||
if (OC_User::handleApacheAuth()) {
|
if (OC_User::handleApacheAuth() || OC_User::isLoggedIn()) {
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OC_User::isLoggedIn()) {
|
|
||||||
$user = OC_User::getUser();
|
$user = OC_User::getUser();
|
||||||
OC_Util::setupFS($user);
|
OC_Util::setupFS($user);
|
||||||
$this->currentUser = $user;
|
$this->currentUser = $user;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::authenticate($server, $realm);
|
return parent::authenticate($server, $realm);
|
||||||
|
|
Loading…
Reference in New Issue