diff options
Diffstat (limited to 'apps/files/appinfo')
| -rw-r--r-- | apps/files/appinfo/remote.php | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index f9fa792e133..98db95041fe 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -27,14 +27,14 @@ * */ // Backends -$authBackend = new OC_Connector_Sabre_Auth(); -$lockBackend = new OC_Connector_Sabre_Locks(); -$requestBackend = new OC_Connector_Sabre_Request(); +$authBackend = new \OC\Connector\Sabre\Auth(); +$lockBackend = new \OC\Connector\Sabre\Locks(); // Fire up server $objectTree = new \OC\Connector\Sabre\ObjectTree(); -$server = new OC_Connector_Sabre_Server($objectTree); -$server->httpRequest = $requestBackend; +$server = new \OC\Connector\Sabre\Server($objectTree); +// Set URL explicitly due to reverse-proxy situations +$server->httpRequest->setUrl(\OC::$server->getRequest()->getRequestUri()); $server->setBaseUri($baseuri); // Load plugins @@ -42,22 +42,33 @@ $defaults = new OC_Defaults(); $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName())); $server->addPlugin(new \Sabre\DAV\Locks\Plugin($lockBackend)); $server->addPlugin(new \Sabre\DAV\Browser\Plugin(false, false)); // Show something in the Browser, but no upload -$server->addPlugin(new OC_Connector_Sabre_FilesPlugin()); -$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin()); -$server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav')); +$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree)); +$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin()); +$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav')); // wait with registering these until auth is handled and the filesystem is setup -$server->subscribeEvent('beforeMethod', function () use ($server, $objectTree) { +$server->on('beforeMethod', function () use ($server, $objectTree) { $view = \OC\Files\Filesystem::getView(); $rootInfo = $view->getFileInfo(''); // Create ownCloud Dir $mountManager = \OC\Files\Filesystem::getMountManager(); - $rootDir = new OC_Connector_Sabre_Directory($view, $rootInfo); + $rootDir = new \OC\Connector\Sabre\Directory($view, $rootInfo); $objectTree->init($rootDir, $view, $mountManager); $server->addPlugin(new \OC\Connector\Sabre\TagsPlugin($objectTree, \OC::$server->getTagManager())); - $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view)); + $server->addPlugin(new \OC\Connector\Sabre\QuotaPlugin($view)); + + // custom properties plugin must be the last one + $server->addPlugin( + new \Sabre\DAV\PropertyStorage\Plugin( + new \OC\Connector\Sabre\CustomPropertiesBackend( + $objectTree, + \OC::$server->getDatabaseConnection(), + \OC::$server->getUserSession()->getUser() + ) + ) + ); }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request // And off we go! |