summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-08-30 19:13:01 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-16 13:17:12 +0200
commitf2889dc6e4aa701f36081b314f38f620cbb1fc88 (patch)
tree8969d61c3dc2a71cd8eb1b745d88fc10782e1d75 /apps/files
parent4b9ec49285081137195c5852682b127a37ea8bfe (diff)
downloadnextcloud-server-f2889dc6e4aa701f36081b314f38f620cbb1fc88.tar.gz
nextcloud-server-f2889dc6e4aa701f36081b314f38f620cbb1fc88.zip
Consolidate webdav code - move all to one app
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/appinfo/info.xml4
-rw-r--r--apps/files/appinfo/remote.php4
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 8586c6794f2..9ec6a9c43e7 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -12,10 +12,6 @@
<types>
<filesystem/>
</types>
- <remote>
- <files>appinfo/remote.php</files>
- <webdav>appinfo/remote.php</webdav>
- </remote>
<documentation>
<user>user-files</user>
</documentation>
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 02f7f3c027f..d6a745d028e 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -32,7 +32,7 @@ set_time_limit(0);
// Turn off output buffering to prevent memory problems
\OC_Util::obEnd();
-$serverFactory = new \OC\Connector\Sabre\ServerFactory(
+$serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
\OC::$server->getConfig(),
\OC::$server->getLogger(),
\OC::$server->getDatabaseConnection(),
@@ -43,7 +43,7 @@ $serverFactory = new \OC\Connector\Sabre\ServerFactory(
);
// Backends
-$authBackend = new \OC\Connector\Sabre\Auth();
+$authBackend = new \OCA\DAV\Connector\Sabre\Auth();
$requestUri = \OC::$server->getRequest()->getRequestUri();
$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function() {