summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-10-15 14:46:31 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-16 13:17:12 +0200
commitca27024fa22d9dde08da9aa77c2769b0f7b39707 (patch)
tree5835e2e62c88b337869ecded18f0229f8015ee09
parent8fa59033acc04a6888d08c68fc3b707d1334d7f2 (diff)
downloadnextcloud-server-ca27024fa22d9dde08da9aa77c2769b0f7b39707.tar.gz
nextcloud-server-ca27024fa22d9dde08da9aa77c2769b0f7b39707.zip
Fix webdav access
* Correct namespace * Pass the EventDispatcher to the webDAV server
-rw-r--r--apps/dav/appinfo/v1/webdav.php3
-rw-r--r--apps/dav/lib/connector/sabre/listenerplugin.php4
-rw-r--r--apps/dav/lib/connector/sabre/lockplugin.php2
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php
index b416ef64793..610230fc816 100644
--- a/apps/dav/appinfo/v1/webdav.php
+++ b/apps/dav/appinfo/v1/webdav.php
@@ -39,7 +39,8 @@ $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserSession(),
\OC::$server->getMountManager(),
- \OC::$server->getTagManager()
+ \OC::$server->getTagManager(),
+ \OC::$server->getEventDispatcher()
);
// Backends
diff --git a/apps/dav/lib/connector/sabre/listenerplugin.php b/apps/dav/lib/connector/sabre/listenerplugin.php
index ec628add28b..d537d0577c6 100644
--- a/apps/dav/lib/connector/sabre/listenerplugin.php
+++ b/apps/dav/lib/connector/sabre/listenerplugin.php
@@ -19,7 +19,7 @@
*
*/
-namespace OC\Connector\Sabre;
+namespace OCA\DAV\Connector\Sabre;
use OCP\AppFramework\Http;
use OCP\SabrePluginEvent;
@@ -57,7 +57,7 @@ class ListenerPlugin extends ServerPlugin {
public function emitListener() {
$event = new SabrePluginEvent();
- $this->dispatcher->dispatch('OC\Connector\Sabre::beforeMethod', $event);
+ $this->dispatcher->dispatch('OCA\DAV\Connector\Sabre::beforeMethod', $event);
if ($event->getStatusCode() !== Http::STATUS_OK) {
throw new SabrePluginException($event->getMessage(), $event->getStatusCode());
diff --git a/apps/dav/lib/connector/sabre/lockplugin.php b/apps/dav/lib/connector/sabre/lockplugin.php
index 47203df905f..c564e066f8e 100644
--- a/apps/dav/lib/connector/sabre/lockplugin.php
+++ b/apps/dav/lib/connector/sabre/lockplugin.php
@@ -19,7 +19,7 @@
*
*/
-namespace OC\Connector\Sabre;
+namespace OCA\DAV\Connector\Sabre;
use OCA\DAV\Connector\Sabre\Exception\FileLocked;
use OCA\DAV\Connector\Sabre\Node;