From 4938f0fbfe5cef3b51206e41bc524631160457d0 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Fri, 20 Dec 2013 03:57:18 +0400 Subject: [PATCH] DAV Server configuration update --- .../app/libraries/RainLoop/ServiceActions.php | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php index ed4d65bf8..b90685c92 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php @@ -742,21 +742,27 @@ class ServiceActions $oCarddavBackend = new \RainLoop\SabreDAV\CardDAV($oPersonalAddressBookProvider, $oAuthBackend); $oPrincipalBackend = new \RainLoop\SabreDAV\Principal($oPersonalAddressBookProvider, $oAuthBackend); - $aNodes = array( - new \Sabre\DAVACL\PrincipalCollection($oPrincipalBackend), - new \Sabre\CardDAV\AddressBookRoot($oPrincipalBackend, $oCarddavBackend), - ); + $oPrincipalCollection = new \Sabre\DAVACL\PrincipalCollection($oPrincipalBackend); + $oPrincipalCollection->disableListing = true; - $oServer = new \Sabre\DAV\Server($aNodes); + $oAddressBookRoot = new \Sabre\CardDAV\AddressBookRoot($oPrincipalBackend, $oCarddavBackend); + + $oServer = new \Sabre\DAV\Server(array( + $oPrincipalCollection, $oAddressBookRoot + )); $aPath = \trim($this->oHttp->GetPath(), '/\\ '); $oServer->setBaseUri((0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/'); // Plugins - $oServer->addPlugin(new \Sabre\DAV\Auth\Plugin($oAuthBackend, 'SabreDAV')); + $oServer->addPlugin(new \Sabre\DAV\Auth\Plugin($oAuthBackend, 'RainLoop')); $oServer->addPlugin(new \Sabre\DAV\Browser\Plugin()); $oServer->addPlugin(new \Sabre\CardDAV\Plugin()); - $oServer->addPlugin(new \Sabre\DAVACL\Plugin()); + +// $oAclPlugin = new \Sabre\DAVACL\Plugin(); +// $oAclPlugin->hideNodesFromListings = true; +// $oAclPlugin->allowAccessToNodesWithoutACL = false; +// $oServer->addPlugin($oAclPlugin); $oServer->exec(); }