From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 2 Feb 2015 23:39:01 +0000 (+0100)
Subject: Disallow disabling of files app
X-Git-Tag: v8.0.0RC2~7^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a7eedf014933277ff392824e1a6e62b041da58f8;p=nextcloud-server.git

Disallow disabling of files app
---

diff --git a/core/command/app/disable.php b/core/command/app/disable.php
index dcdee92349e..2e028d183bb 100644
--- a/core/command/app/disable.php
+++ b/core/command/app/disable.php
@@ -28,8 +28,12 @@ class Disable extends Command {
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$appId = $input->getArgument('app-id');
 		if (\OC_App::isEnabled($appId)) {
-			\OC_App::disable($appId);
-			$output->writeln($appId . ' disabled');
+			try {
+				\OC_App::disable($appId);
+				$output->writeln($appId . ' disabled');
+			} catch(\Exception $e) {
+				$output->writeln($e->getMessage());
+			}
 		} else {
 			$output->writeln('No such app enabled: ' . $appId);
 		}
diff --git a/lib/private/app.php b/lib/private/app.php
index 3a1f731d621..aa28e360570 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -321,6 +321,9 @@ class OC_App {
 	 * @param string $app app
 	 */
 	public static function disable($app) {
+		if($app === 'files') {
+			throw new \Exception("App 'files' can't be disabled.");
+		}
 		self::$enabledAppsCache = array(); // flush
 		// check if app is a shipped app or not. if not delete
 		\OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app));
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index 6d9aa0bfe37..7527c93dae9 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -131,8 +131,12 @@ class AppManager implements IAppManager {
 	 * Disable an app for every user
 	 *
 	 * @param string $appId
+	 * @throws \Exception if app can't be disabled
 	 */
 	public function disableApp($appId) {
+		if($appId === 'files') {
+			throw new \Exception("App 'files' can't be disabled.");
+		}
 		$this->appConfig->setValue($appId, 'enabled', 'no');
 	}
 }