diff options
author | Robin Appelman <robin@icewind.nl> | 2016-10-19 15:11:58 +0200 |
---|---|---|
committer | Robin Appelman <robin@icewind.nl> | 2016-11-16 15:24:28 +0100 |
commit | c5df58ec69af0f8ee48543df66f61e3090bdfb17 (patch) | |
tree | eb8638327afcc235fad5555963a59a2858770b5b /lib/private | |
parent | 7e9e5db4963b2ce8e34b6b70347d9cc2dff3f88a (diff) | |
download | nextcloud-server-c5df58ec69af0f8ee48543df66f61e3090bdfb17.tar.gz nextcloud-server-c5df58ec69af0f8ee48543df66f61e3090bdfb17.zip |
phpdoc
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/App/AppManager.php | 5 | ||||
-rw-r--r-- | lib/private/Authentication/Token/DefaultToken.php | 3 | ||||
-rw-r--r-- | lib/private/Lockdown/LockdownManager.php | 12 | ||||
-rw-r--r-- | lib/private/legacy/app.php | 2 |
4 files changed, 2 insertions, 20 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 354f891828b..55fd575e129 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -112,11 +112,6 @@ class AppManager implements IAppManager { return $value !== 'no'; }); ksort($this->installedAppsCache); - foreach ($this->installedAppsCache as $appId => $value) { - if (!\OC::$server->getLockdownManager()->canAccessApp($appId)) { - unset($this->installedAppsCache[$appId]); - } - } } return $this->installedAppsCache; } diff --git a/lib/private/Authentication/Token/DefaultToken.php b/lib/private/Authentication/Token/DefaultToken.php index ea2414e6e15..8e6774a0a22 100644 --- a/lib/private/Authentication/Token/DefaultToken.php +++ b/lib/private/Authentication/Token/DefaultToken.php @@ -154,8 +154,7 @@ class DefaultToken extends Entity implements IToken { $scope = json_decode($this->getScope(), true); if (!$scope) { return [ - 'filesystem'=> true, - 'apps' => [] + 'filesystem'=> true ]; } return $scope; diff --git a/lib/private/Lockdown/LockdownManager.php b/lib/private/Lockdown/LockdownManager.php index c34f7e01b65..5ce52a03683 100644 --- a/lib/private/Lockdown/LockdownManager.php +++ b/lib/private/Lockdown/LockdownManager.php @@ -43,16 +43,4 @@ class LockdownManager implements ILockdownManager { } return !$this->scope || $this->scope['filesystem']; } - - public function canAccessApp($app) { - if (!$this->enabled) { - return true; - } - if ($this->scope && $this->scope['apps']) { - return in_array($app, $this->scope['apps']); - } else { - // no limit - return true; - } - } } diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 5503b8b525c..c2ff9a5be3c 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -140,7 +140,7 @@ class OC_App { public static function loadApp($app, $checkUpgrade = true) { self::$loadedApps[] = $app; $appPath = self::getAppPath($app); - if($appPath === false || !\OC::$server->getLockdownManager()->canAccessApp($app)) { + if($appPath === false) { return; } |