diff options
| -rw-r--r-- | apps/files_sharing/ajax/external.php | 5 | ||||
| -rw-r--r-- | apps/files_sharing/lib/external/manager.php | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index 5b4d4656d62..da73310c8df 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 53e8121b7f6..381651f8c6a 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` |