From 3bf7b54cd59836165fd9ddb406cf1b56ded84923 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 13 Jun 2014 12:43:37 +0200
Subject: [PATCH] block server-to-server share if files_external is not
activates, can be reverted once we moved to the webdav implementation in core
---
apps/files_sharing/ajax/external.php | 5 ++++-
apps/files_sharing/lib/external/manager.php | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index 5b4d4656d6..da73310c8d 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -12,7 +12,10 @@ OCP\JSON::checkLoggedIn();
$l = OC_L10N::get('files_sharing');
// check if server admin allows to mount public links from other servers
-if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
+// check if files_external is enabled
+// FIXME file_external check no longer needed if we use the webdav implementation from core
+if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false ||
+ \OC_App::isEnabled('files_external') === false) {
\OCP\JSON::error(array('data' => array('message' => $l->t('Server to server sharing is not enabled on this server'))));
exit();
}
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 53e8121b7f..381651f8c6 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -68,6 +68,12 @@ class Manager {
}
public function setup() {
+ // don't setup server-to-server shares if the file_external app is disabled
+ // FIXME no longer needed if we use the webdav implementation from core
+ if (\OC_App::isEnabled('files_external') === false) {
+ return false;
+ }
+
$user = $this->userSession->getUser();
if ($user) {
$query = $this->connection->prepare('SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
--
GitLab