nextcloud / server

apps/settings/lib/Sections/Admin/Users.php

Indentation +20 added lines, -20 removed lines

@@ -13,24 +13,24 @@
 use OCP\Settings\IIconSection;
 
 class Users implements IIconSection {
-	public function __construct(
-		private IL10N $l,
-	) {
-	}
-
-	public function getID(): string {
-		return 'usersdelegation';
-	}
-
-	public function getName(): string {
-		return $this->l->t('Users');
-	}
-
-	public function getPriority(): int {
-		return 55;
-	}
-
-	public function getIcon(): string {
-		return '';
-	}
+    public function __construct(
+        private IL10N $l,
+    ) {
+    }
+
+    public function getID(): string {
+        return 'usersdelegation';
+    }
+
+    public function getName(): string {
+        return $this->l->t('Users');
+    }
+
+    public function getPriority(): int {
+        return 55;
+    }
+
+    public function getIcon(): string {
+        return '';
+    }
 }

apps/settings/lib/Settings/Admin/Delegation.php

Indentation +77 added lines, -77 removed lines

@@ -17,91 +17,91 @@
 use OCP\Settings\ISettings;
 
 class Delegation implements ISettings {
-	public function __construct(
-		private IManager $settingManager,
-		private IInitialState $initialStateService,
-		private IGroupManager $groupManager,
-		private AuthorizedGroupService $authorizedGroupService,
-		private IURLGenerator $urlGenerator,
-	) {
-	}
+    public function __construct(
+        private IManager $settingManager,
+        private IInitialState $initialStateService,
+        private IGroupManager $groupManager,
+        private AuthorizedGroupService $authorizedGroupService,
+        private IURLGenerator $urlGenerator,
+    ) {
+    }
 
-	/**
-	 * Filter out the ISettings that are not IDelegatedSettings from $innerSection
-	 * and add them to $settings.
-	 *
-	 * @param IDelegatedSettings[] $settings
-	 * @param ISettings[] $innerSection
-	 * @return IDelegatedSettings[]
-	 */
-	private function getDelegatedSettings(array $settings, array $innerSection): array {
-		foreach ($innerSection as $setting) {
-			if ($setting instanceof IDelegatedSettings) {
-				$settings[] = $setting;
-			}
-		}
-		return $settings;
-	}
+    /**
+     * Filter out the ISettings that are not IDelegatedSettings from $innerSection
+     * and add them to $settings.
+     *
+     * @param IDelegatedSettings[] $settings
+     * @param ISettings[] $innerSection
+     * @return IDelegatedSettings[]
+     */
+    private function getDelegatedSettings(array $settings, array $innerSection): array {
+        foreach ($innerSection as $setting) {
+            if ($setting instanceof IDelegatedSettings) {
+                $settings[] = $setting;
+            }
+        }
+        return $settings;
+    }
 
-	private function initSettingState(): void {
-		// Available settings page initialization
-		$delegatedSettings = $this->settingManager->getAdminDelegatedSettings();
-		$settings = [];
-		foreach ($delegatedSettings as ['section' => $section, 'settings' => $sectionSettings]) {
-			foreach ($sectionSettings as $setting) {
-				$sectionName = $section->getName() . ($setting->getName() !== null ? ' - ' . $setting->getName() : '');
-				$settings[] = [
-					'class' => get_class($setting),
-					'sectionName' => $sectionName,
-					'id' => mb_strtolower(str_replace(' ', '-', $sectionName)),
-					'priority' => $section->getPriority(),
-				];
-			}
-		}
-		$this->initialStateService->provideInitialState('available-settings', $settings);
-	}
+    private function initSettingState(): void {
+        // Available settings page initialization
+        $delegatedSettings = $this->settingManager->getAdminDelegatedSettings();
+        $settings = [];
+        foreach ($delegatedSettings as ['section' => $section, 'settings' => $sectionSettings]) {
+            foreach ($sectionSettings as $setting) {
+                $sectionName = $section->getName() . ($setting->getName() !== null ? ' - ' . $setting->getName() : '');
+                $settings[] = [
+                    'class' => get_class($setting),
+                    'sectionName' => $sectionName,
+                    'id' => mb_strtolower(str_replace(' ', '-', $sectionName)),
+                    'priority' => $section->getPriority(),
+                ];
+            }
+        }
+        $this->initialStateService->provideInitialState('available-settings', $settings);
+    }
 
-	public function initAvailableGroupState(): void {
-		// Available groups initialization
-		$groups = [];
-		$groupsClass = $this->groupManager->search('');
-		foreach ($groupsClass as $group) {
-			if ($group->getGID() === 'admin') {
-				continue; // Admin already have access to everything
-			}
-			$groups[] = [
-				'displayName' => $group->getDisplayName(),
-				'gid' => $group->getGID(),
-			];
-		}
-		$this->initialStateService->provideInitialState('available-groups', $groups);
-	}
+    public function initAvailableGroupState(): void {
+        // Available groups initialization
+        $groups = [];
+        $groupsClass = $this->groupManager->search('');
+        foreach ($groupsClass as $group) {
+            if ($group->getGID() === 'admin') {
+                continue; // Admin already have access to everything
+            }
+            $groups[] = [
+                'displayName' => $group->getDisplayName(),
+                'gid' => $group->getGID(),
+            ];
+        }
+        $this->initialStateService->provideInitialState('available-groups', $groups);
+    }
 
-	public function initAuthorizedGroupState(): void {
-		// Already set authorized groups
-		$this->initialStateService->provideInitialState('authorized-groups', $this->authorizedGroupService->findAll());
-	}
+    public function initAuthorizedGroupState(): void {
+        // Already set authorized groups
+        $this->initialStateService->provideInitialState('authorized-groups', $this->authorizedGroupService->findAll());
+    }
 
-	public function getForm(): TemplateResponse {
-		$this->initSettingState();
-		$this->initAvailableGroupState();
-		$this->initAuthorizedGroupState();
-		$this->initialStateService->provideInitialState('authorized-settings-doc-link', $this->urlGenerator->linkToDocs('admin-delegation'));
+    public function getForm(): TemplateResponse {
+        $this->initSettingState();
+        $this->initAvailableGroupState();
+        $this->initAuthorizedGroupState();
+        $this->initialStateService->provideInitialState('authorized-settings-doc-link', $this->urlGenerator->linkToDocs('admin-delegation'));
 
-		return new TemplateResponse(Application::APP_ID, 'settings/admin/delegation', [], '');
-	}
+        return new TemplateResponse(Application::APP_ID, 'settings/admin/delegation', [], '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'admindelegation';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'admindelegation';
+    }
 
-	/*
+    /*
 	 * @inheritdoc
 	 */
-	public function getPriority() {
-		return 75;
-	}
+    public function getPriority() {
+        return 75;
+    }
 }

apps/settings/lib/Settings/Admin/Users.php

Indentation +20 added lines, -20 removed lines

@@ -16,24 +16,24 @@
  * Empty settings class, used only for admin delegation.
  */
 class Users implements IDelegatedSettings {
-	public function getForm(): TemplateResponse {
-		throw new \Exception('Admin delegation settings should never be rendered');
-	}
-
-	public function getSection(): ?string {
-		return 'usersdelegation';
-	}
-
-	public function getPriority(): int {
-		return 0;
-	}
-
-	public function getName(): ?string {
-		/* Use section name alone */
-		return null;
-	}
-
-	public function getAuthorizedAppConfig(): array {
-		return [];
-	}
+    public function getForm(): TemplateResponse {
+        throw new \Exception('Admin delegation settings should never be rendered');
+    }
+
+    public function getSection(): ?string {
+        return 'usersdelegation';
+    }
+
+    public function getPriority(): int {
+        return 0;
+    }
+
+    public function getName(): ?string {
+        /* Use section name alone */
+        return null;
+    }
+
+    public function getAuthorizedAppConfig(): array {
+        return [];
+    }
 }

apps/webhook_listeners/lib/Settings/Admin.php

Indentation +23 added lines, -23 removed lines

@@ -17,27 +17,27 @@
  * Empty settings class, used only for admin delegation for now as there is no UI
  */
 class Admin implements IDelegatedSettings {
-	/**
-	 * Empty template response
-	 */
-	public function getForm(): TemplateResponse {
-		throw new \Exception('Admin delegation settings should never be rendered');
-	}
-
-	public function getSection(): string {
-		return Application::APP_ID . '-admin';
-	}
-
-	public function getPriority(): int {
-		return 0;
-	}
-
-	public function getName(): ?string {
-		/* Use section name alone */
-		return null;
-	}
-
-	public function getAuthorizedAppConfig(): array {
-		return [];
-	}
+    /**
+     * Empty template response
+     */
+    public function getForm(): TemplateResponse {
+        throw new \Exception('Admin delegation settings should never be rendered');
+    }
+
+    public function getSection(): string {
+        return Application::APP_ID . '-admin';
+    }
+
+    public function getPriority(): int {
+        return 0;
+    }
+
+    public function getName(): ?string {
+        /* Use section name alone */
+        return null;
+    }
+
+    public function getAuthorizedAppConfig(): array {
+        return [];
+    }
 }

apps/webhook_listeners/lib/Settings/AdminSection.php

Indentation +20 added lines, -20 removed lines

@@ -14,24 +14,24 @@
 use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection {
-	public function __construct(
-		private IL10N $l,
-	) {
-	}
-
-	public function getID(): string {
-		return Application::APP_ID . '-admin';
-	}
-
-	public function getName(): string {
-		return $this->l->t('Webhooks');
-	}
-
-	public function getPriority(): int {
-		return 56;
-	}
-
-	public function getIcon(): string {
-		return '';
-	}
+    public function __construct(
+        private IL10N $l,
+    ) {
+    }
+
+    public function getID(): string {
+        return Application::APP_ID . '-admin';
+    }
+
+    public function getName(): string {
+        return $this->l->t('Webhooks');
+    }
+
+    public function getPriority(): int {
+        return 56;
+    }
+
+    public function getIcon(): string {
+        return '';
+    }
 }

lib/private/App/AppManager.php

Indentation +1086 added lines, -1086 removed lines

@@ -38,1090 +38,1090 @@
 use Psr\Log\LoggerInterface;
 
 class AppManager implements IAppManager {
-	/**
-	 * Apps with these types can not be enabled for certain groups only
-	 * @var string[]
-	 */
-	protected $protectedAppTypes = [
-		'filesystem',
-		'prelogin',
-		'authentication',
-		'logging',
-		'prevent_group_restriction',
-	];
-
-	/** @var string[] $appId => $enabled */
-	private array $enabledAppsCache = [];
-
-	/** @var string[]|null */
-	private ?array $shippedApps = null;
-
-	private array $alwaysEnabled = [];
-	private array $defaultEnabled = [];
-
-	/** @var array */
-	private array $appInfos = [];
-
-	/** @var array */
-	private array $appVersions = [];
-
-	/** @var array */
-	private array $autoDisabledApps = [];
-	private array $appTypes = [];
-
-	/** @var array<string, true> */
-	private array $loadedApps = [];
-
-	private ?AppConfig $appConfig = null;
-	private ?IURLGenerator $urlGenerator = null;
-	private ?INavigationManager $navigationManager = null;
-
-	/**
-	 * Be extremely careful when injecting classes here. The AppManager is used by the installer,
-	 * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
-	 */
-	public function __construct(
-		private IUserSession $userSession,
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private ICacheFactory $memCacheFactory,
-		private IEventDispatcher $dispatcher,
-		private LoggerInterface $logger,
-		private ServerVersion $serverVersion,
-		private ConfigManager $configManager,
-		private DependencyAnalyzer $dependencyAnalyzer,
-	) {
-	}
-
-	private function getNavigationManager(): INavigationManager {
-		if ($this->navigationManager === null) {
-			$this->navigationManager = Server::get(INavigationManager::class);
-		}
-		return $this->navigationManager;
-	}
-
-	public function getAppIcon(string $appId, bool $dark = false): ?string {
-		$possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg'];
-		$icon = null;
-		foreach ($possibleIcons as $iconName) {
-			try {
-				$icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
-				break;
-			} catch (\RuntimeException $e) {
-				// ignore
-			}
-		}
-		return $icon;
-	}
-
-	private function getAppConfig(): AppConfig {
-		if ($this->appConfig !== null) {
-			return $this->appConfig;
-		}
-		if (!$this->config->getSystemValueBool('installed', false)) {
-			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
-		}
-		$this->appConfig = Server::get(AppConfig::class);
-		return $this->appConfig;
-	}
-
-	private function getUrlGenerator(): IURLGenerator {
-		if ($this->urlGenerator !== null) {
-			return $this->urlGenerator;
-		}
-		if (!$this->config->getSystemValueBool('installed', false)) {
-			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
-		}
-		$this->urlGenerator = Server::get(IURLGenerator::class);
-		return $this->urlGenerator;
-	}
-
-	/**
-	 * For all enabled apps, return the value of their 'enabled' config key.
-	 *
-	 * @return array<string,string> appId => enabled (may be 'yes', or a json encoded list of group ids)
-	 */
-	private function getEnabledAppsValues(): array {
-		if (!$this->enabledAppsCache) {
-			/** @var array<string,string> */
-			$values = $this->getAppConfig()->searchValues('enabled', false, IAppConfig::VALUE_STRING);
-
-			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
-			foreach ($alwaysEnabledApps as $appId) {
-				$values[$appId] = 'yes';
-			}
-
-			$this->enabledAppsCache = array_filter($values, function ($value) {
-				return $value !== 'no';
-			});
-			ksort($this->enabledAppsCache);
-		}
-		return $this->enabledAppsCache;
-	}
-
-	/**
-	 * Deprecated alias
-	 *
-	 * @return string[]
-	 */
-	public function getInstalledApps() {
-		return $this->getEnabledApps();
-	}
-
-	/**
-	 * List all enabled apps, either for everyone or for some groups
-	 *
-	 * @return list<string>
-	 */
-	public function getEnabledApps(): array {
-		return array_keys($this->getEnabledAppsValues());
-	}
-
-	/**
-	 * Get a list of all apps in the apps folder
-	 *
-	 * @return list<string> an array of app names (string IDs)
-	 */
-	public function getAllAppsInAppsFolders(): array {
-		$apps = [];
-
-		foreach (\OC::$APPSROOTS as $apps_dir) {
-			if (!is_readable($apps_dir['path'])) {
-				$this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
-				continue;
-			}
-			$dh = opendir($apps_dir['path']);
-
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if (
-						$file[0] != '.'
-						&& is_dir($apps_dir['path'] . '/' . $file)
-						&& is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')
-					) {
-						$apps[] = $file;
-					}
-				}
-			}
-		}
-
-		return array_values(array_unique($apps));
-	}
-
-	/**
-	 * List all apps enabled for a user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return list<string>
-	 */
-	public function getEnabledAppsForUser(IUser $user) {
-		$apps = $this->getEnabledAppsValues();
-		$appsForUser = array_filter($apps, function ($enabled) use ($user) {
-			return $this->checkAppForUser($enabled, $user);
-		});
-		return array_keys($appsForUser);
-	}
-
-	public function getEnabledAppsForGroup(IGroup $group): array {
-		$apps = $this->getEnabledAppsValues();
-		$appsForGroups = array_filter($apps, function ($enabled) use ($group) {
-			return $this->checkAppForGroups($enabled, $group);
-		});
-		return array_keys($appsForGroups);
-	}
-
-	/**
-	 * Loads all apps
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 *
-	 * This function walks through the Nextcloud directory and loads all apps
-	 * it can find. A directory contains an app if the file /appinfo/info.xml
-	 * exists.
-	 *
-	 * if $types is set to non-empty array, only apps of those types will be loaded
-	 */
-	public function loadApps(array $types = []): bool {
-		if ($this->config->getSystemValueBool('maintenance', false)) {
-			return false;
-		}
-		// Load the enabled apps here
-		$apps = \OC_App::getEnabledApps();
-
-		// Add each apps' folder as allowed class path
-		foreach ($apps as $app) {
-			// If the app is already loaded then autoloading it makes no sense
-			if (!$this->isAppLoaded($app)) {
-				try {
-					$path = $this->getAppPath($app);
-					\OC_App::registerAutoloading($app, $path);
-				} catch (AppPathNotFoundException $e) {
-					$this->logger->info('Error during app loading: ' . $e->getMessage(), [
-						'exception' => $e,
-						'app' => $app,
-					]);
-				}
-			}
-		}
-
-		// prevent app loading from printing output
-		ob_start();
-		foreach ($apps as $app) {
-			if (!$this->isAppLoaded($app) && ($types === [] || $this->isType($app, $types))) {
-				try {
-					$this->loadApp($app);
-				} catch (\Throwable $e) {
-					$this->logger->emergency('Error during app loading: ' . $e->getMessage(), [
-						'exception' => $e,
-						'app' => $app,
-					]);
-				}
-			}
-		}
-		ob_end_clean();
-
-		return true;
-	}
-
-	/**
-	 * check if an app is of a specific type
-	 *
-	 * @param string $app
-	 * @param array $types
-	 * @return bool
-	 */
-	public function isType(string $app, array $types): bool {
-		$appTypes = $this->getAppTypes($app);
-		foreach ($types as $type) {
-			if (in_array($type, $appTypes, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * get the types of an app
-	 *
-	 * @param string $app
-	 * @return string[]
-	 */
-	private function getAppTypes(string $app): array {
-		//load the cache
-		if (count($this->appTypes) === 0) {
-			$this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];
-		}
-
-		if (isset($this->appTypes[$app])) {
-			return explode(',', $this->appTypes[$app]);
-		}
-
-		return [];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAutoDisabledApps(): array {
-		return $this->autoDisabledApps;
-	}
-
-	public function getAppRestriction(string $appId): array {
-		$values = $this->getEnabledAppsValues();
-
-		if (!isset($values[$appId])) {
-			return [];
-		}
-
-		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
-			return [];
-		}
-		return json_decode($values[$appId], true);
-	}
-
-	/**
-	 * Check if an app is enabled for user
-	 *
-	 * @param string $appId
-	 * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used
-	 * @return bool
-	 */
-	public function isEnabledForUser($appId, $user = null) {
-		if ($this->isAlwaysEnabled($appId)) {
-			return true;
-		}
-		if ($user === null) {
-			$user = $this->userSession->getUser();
-		}
-		$enabledAppsValues = $this->getEnabledAppsValues();
-		if (isset($enabledAppsValues[$appId])) {
-			return $this->checkAppForUser($enabledAppsValues[$appId], $user);
-		} else {
-			return false;
-		}
-	}
-
-	private function checkAppForUser(string $enabled, ?IUser $user): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} elseif ($user === null) {
-			return false;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$jsonErrorMsg = json_last_error_msg();
-				// this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
-				$this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
-				return false;
-			}
-
-			$userGroups = $this->groupManager->getUserGroupIds($user);
-			foreach ($userGroups as $groupId) {
-				if (in_array($groupId, $groupIds, true)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	private function checkAppForGroups(string $enabled, IGroup $group): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$jsonErrorMsg = json_last_error_msg();
-				// this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
-				$this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
-				return false;
-			}
-
-			return in_array($group->getGID(), $groupIds);
-		}
-	}
-
-	/**
-	 * Check if an app is enabled in the instance
-	 *
-	 * Notice: This actually checks if the app is enabled and not only if it is installed.
-	 *
-	 * @param string $appId
-	 */
-	public function isInstalled($appId): bool {
-		return $this->isEnabledForAnyone($appId);
-	}
-
-	public function isEnabledForAnyone(string $appId): bool {
-		$enabledAppsValues = $this->getEnabledAppsValues();
-		return isset($enabledAppsValues[$appId]);
-	}
-
-	/**
-	 * Overwrite the `max-version` requirement for this app.
-	 */
-	public function overwriteNextcloudRequirement(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		if (!in_array($appId, $ignoreMaxApps, true)) {
-			$ignoreMaxApps[] = $appId;
-		}
-		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-	}
-
-	/**
-	 * Remove the `max-version` overwrite for this app.
-	 * This means this app now again can not be enabled if the `max-version` is smaller than the current Nextcloud version.
-	 */
-	public function removeOverwriteNextcloudRequirement(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
-		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-	}
-
-	public function loadApp(string $app): void {
-		if (isset($this->loadedApps[$app])) {
-			return;
-		}
-		$this->loadedApps[$app] = true;
-		try {
-			$appPath = $this->getAppPath($app);
-		} catch (AppPathNotFoundException $e) {
-			$this->logger->info('Error during app loading: ' . $e->getMessage(), [
-				'exception' => $e,
-				'app' => $app,
-			]);
-			return;
-		}
-		$eventLogger = \OC::$server->get(IEventLogger::class);
-		$eventLogger->start("bootstrap:load_app:$app", "Load app: $app");
-
-		// in case someone calls loadApp() directly
-		\OC_App::registerAutoloading($app, $appPath);
-
-		if (is_file($appPath . '/appinfo/app.php')) {
-			$this->logger->error('/appinfo/app.php is not supported anymore, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
-				'app' => $app,
-			]);
-		}
-
-		$coordinator = Server::get(Coordinator::class);
-		$coordinator->bootApp($app);
-
-		$eventLogger->start("bootstrap:load_app:$app:info", "Load info.xml for $app and register any services defined in it");
-		$info = $this->getAppInfo($app);
-		if (!empty($info['activity'])) {
-			$activityManager = \OC::$server->get(IActivityManager::class);
-			if (!empty($info['activity']['filters'])) {
-				foreach ($info['activity']['filters'] as $filter) {
-					$activityManager->registerFilter($filter);
-				}
-			}
-			if (!empty($info['activity']['settings'])) {
-				foreach ($info['activity']['settings'] as $setting) {
-					$activityManager->registerSetting($setting);
-				}
-			}
-			if (!empty($info['activity']['providers'])) {
-				foreach ($info['activity']['providers'] as $provider) {
-					$activityManager->registerProvider($provider);
-				}
-			}
-		}
-
-		if (!empty($info['settings'])) {
-			$settingsManager = \OCP\Server::get(ISettingsManager::class);
-			if (!empty($info['settings']['admin'])) {
-				foreach ($info['settings']['admin'] as $setting) {
-					$settingsManager->registerSetting('admin', $setting);
-				}
-			}
-			if (!empty($info['settings']['admin-section'])) {
-				foreach ($info['settings']['admin-section'] as $section) {
-					$settingsManager->registerSection('admin', $section);
-				}
-			}
-			if (!empty($info['settings']['personal'])) {
-				foreach ($info['settings']['personal'] as $setting) {
-					$settingsManager->registerSetting('personal', $setting);
-				}
-			}
-			if (!empty($info['settings']['personal-section'])) {
-				foreach ($info['settings']['personal-section'] as $section) {
-					$settingsManager->registerSection('personal', $section);
-				}
-			}
-			if (!empty($info['settings']['admin-delegation'])) {
-				foreach ($info['settings']['admin-delegation'] as $setting) {
-					$settingsManager->registerSetting(ISettingsManager::SETTINGS_DELEGATION, $setting);
-				}
-			}
-			if (!empty($info['settings']['admin-delegation-section'])) {
-				foreach ($info['settings']['admin-delegation-section'] as $section) {
-					$settingsManager->registerSection(ISettingsManager::SETTINGS_DELEGATION, $section);
-				}
-			}
-		}
-
-		if (!empty($info['collaboration']['plugins'])) {
-			// deal with one or many plugin entries
-			$plugins = isset($info['collaboration']['plugins']['plugin']['@value'])
-				? [$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
-			$collaboratorSearch = null;
-			$autoCompleteManager = null;
-			foreach ($plugins as $plugin) {
-				if ($plugin['@attributes']['type'] === 'collaborator-search') {
-					$pluginInfo = [
-						'shareType' => $plugin['@attributes']['share-type'],
-						'class' => $plugin['@value'],
-					];
-					$collaboratorSearch ??= \OC::$server->get(ICollaboratorSearch::class);
-					$collaboratorSearch->registerPlugin($pluginInfo);
-				} elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
-					$autoCompleteManager ??= \OC::$server->get(IAutoCompleteManager::class);
-					$autoCompleteManager->registerSorter($plugin['@value']);
-				}
-			}
-		}
-		$eventLogger->end("bootstrap:load_app:$app:info");
-
-		$eventLogger->end("bootstrap:load_app:$app");
-	}
-
-	/**
-	 * Check if an app is loaded
-	 * @param string $app app id
-	 * @since 26.0.0
-	 */
-	public function isAppLoaded(string $app): bool {
-		return isset($this->loadedApps[$app]);
-	}
-
-	/**
-	 * Enable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $forceEnable
-	 * @throws AppPathNotFoundException
-	 * @throws \InvalidArgumentException if the application is not installed yet
-	 */
-	public function enableApp(string $appId, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
-			throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
-		}
-
-		if ($forceEnable) {
-			$this->overwriteNextcloudRequirement($appId);
-		}
-
-		$this->enabledAppsCache[$appId] = 'yes';
-		$this->getAppConfig()->setValue($appId, 'enabled', 'yes');
-		$this->dispatcher->dispatchTyped(new AppEnableEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE, $appId
-		));
-		$this->clearAppsCache();
-
-		$this->configManager->migrateConfigLexiconKeys($appId);
-	}
-
-	/**
-	 * Whether a list of types contains a protected app type
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 */
-	public function hasProtectedAppType($types) {
-		if (empty($types)) {
-			return false;
-		}
-
-		$protectedTypes = array_intersect($this->protectedAppTypes, $types);
-		return !empty($protectedTypes);
-	}
-
-	/**
-	 * Enable an app only for specific groups
-	 *
-	 * @param string $appId
-	 * @param IGroup[] $groups
-	 * @param bool $forceEnable
-	 * @throws \InvalidArgumentException if app can't be enabled for groups
-	 * @throws AppPathNotFoundException
-	 */
-	public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		$info = $this->getAppInfo($appId);
-		if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
-			throw new \InvalidArgumentException("$appId can't be enabled for groups.");
-		}
-
-		if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
-			throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
-		}
-
-		if ($forceEnable) {
-			$this->overwriteNextcloudRequirement($appId);
-		}
-
-		/** @var string[] $groupIds */
-		$groupIds = array_map(function ($group) {
-			/** @var IGroup $group */
-			return ($group instanceof IGroup)
-				? $group->getGID()
-				: $group;
-		}, $groups);
-
-		$this->enabledAppsCache[$appId] = json_encode($groupIds);
-		$this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));
-		$this->dispatcher->dispatchTyped(new AppEnableEvent($appId, $groupIds));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
-		));
-		$this->clearAppsCache();
-
-		$this->configManager->migrateConfigLexiconKeys($appId);
-	}
-
-	/**
-	 * Disable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $automaticDisabled
-	 * @throws \Exception if app can't be disabled
-	 */
-	public function disableApp($appId, $automaticDisabled = false): void {
-		if ($this->isAlwaysEnabled($appId)) {
-			throw new \Exception("$appId can't be disabled.");
-		}
-
-		if ($automaticDisabled) {
-			$previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');
-			if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
-				$previousSetting = json_decode($previousSetting, true);
-			}
-			$this->autoDisabledApps[$appId] = $previousSetting;
-		}
-
-		unset($this->enabledAppsCache[$appId]);
-		$this->getAppConfig()->setValue($appId, 'enabled', 'no');
-
-		// run uninstall steps
-		$appData = $this->getAppInfo($appId);
-		if (!is_null($appData)) {
-			\OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
-		}
-
-		$this->dispatcher->dispatchTyped(new AppDisableEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_DISABLE, $appId
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Get the directory for the given app.
-	 *
-	 * @psalm-taint-specialize
-	 *
-	 * @throws AppPathNotFoundException if app folder can't be found
-	 */
-	public function getAppPath(string $appId, bool $ignoreCache = false): string {
-		$appId = $this->cleanAppId($appId);
-		if ($appId === '') {
-			throw new AppPathNotFoundException('App id is empty');
-		} elseif ($appId === 'core') {
-			return __DIR__ . '/../../../core';
-		}
-
-		if (($dir = $this->findAppInDirectories($appId, $ignoreCache)) != false) {
-			return $dir['path'] . '/' . $appId;
-		}
-		throw new AppPathNotFoundException('Could not find path for ' . $appId);
-	}
-
-	/**
-	 * Get the web path for the given app.
-	 *
-	 * @throws AppPathNotFoundException if app path can't be found
-	 */
-	public function getAppWebPath(string $appId): string {
-		if (($dir = $this->findAppInDirectories($appId)) != false) {
-			return \OC::$WEBROOT . $dir['url'] . '/' . $appId;
-		}
-		throw new AppPathNotFoundException('Could not find web path for ' . $appId);
-	}
-
-	/**
-	 * Find the apps root for an app id.
-	 *
-	 * If multiple copies are found, the apps root the latest version is returned.
-	 *
-	 * @param bool $ignoreCache ignore cache and rebuild it
-	 * @return false|array{path: string, url: string} the apps root shape
-	 */
-	public function findAppInDirectories(string $appId, bool $ignoreCache = false) {
-		$sanitizedAppId = $this->cleanAppId($appId);
-		if ($sanitizedAppId !== $appId) {
-			return false;
-		}
-		// FIXME replace by a property or a cache
-		static $app_dir = [];
-
-		if (isset($app_dir[$appId]) && !$ignoreCache) {
-			return $app_dir[$appId];
-		}
-
-		$possibleApps = [];
-		foreach (\OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
-				$possibleApps[] = $dir;
-			}
-		}
-
-		if (empty($possibleApps)) {
-			return false;
-		} elseif (count($possibleApps) === 1) {
-			$dir = array_shift($possibleApps);
-			$app_dir[$appId] = $dir;
-			return $dir;
-		} else {
-			$versionToLoad = [];
-			foreach ($possibleApps as $possibleApp) {
-				$appData = $this->getAppInfoByPath($possibleApp['path'] . '/' . $appId . '/appinfo/info.xml');
-				$version = $appData['version'] ?? '';
-				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
-					$versionToLoad = [
-						'dir' => $possibleApp,
-						'version' => $version,
-					];
-				}
-			}
-			if (!isset($versionToLoad['dir'])) {
-				return false;
-			}
-			$app_dir[$appId] = $versionToLoad['dir'];
-			return $versionToLoad['dir'];
-		}
-	}
-
-	/**
-	 * Clear the cached list of apps when enabling/disabling an app
-	 */
-	public function clearAppsCache(): void {
-		$this->appInfos = [];
-	}
-
-	/**
-	 * Returns a list of apps that need upgrade
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 * @return array list of app info from apps that need an upgrade
-	 *
-	 * @internal
-	 */
-	public function getAppsNeedingUpgrade($version) {
-		$appsToUpgrade = [];
-		$apps = $this->getEnabledApps();
-		foreach ($apps as $appId) {
-			$appInfo = $this->getAppInfo($appId);
-			$appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');
-			if ($appDbVersion
-				&& isset($appInfo['version'])
-				&& version_compare($appInfo['version'], $appDbVersion, '>')
-				&& $this->isAppCompatible($version, $appInfo)
-			) {
-				$appsToUpgrade[] = $appInfo;
-			}
-		}
-
-		return $appsToUpgrade;
-	}
-
-	/**
-	 * Returns the app information from "appinfo/info.xml".
-	 *
-	 * @param string|null $lang
-	 * @return array|null app info
-	 */
-	public function getAppInfo(string $appId, bool $path = false, $lang = null) {
-		if ($path) {
-			throw new \InvalidArgumentException('Calling IAppManager::getAppInfo() with a path is no longer supported. Please call IAppManager::getAppInfoByPath() instead and verify that the path is good before calling.');
-		}
-		if ($lang === null && isset($this->appInfos[$appId])) {
-			return $this->appInfos[$appId];
-		}
-		try {
-			$appPath = $this->getAppPath($appId);
-		} catch (AppPathNotFoundException) {
-			return null;
-		}
-		$file = $appPath . '/appinfo/info.xml';
-
-		$data = $this->getAppInfoByPath($file, $lang);
-
-		if ($lang === null) {
-			$this->appInfos[$appId] = $data;
-		}
-
-		return $data;
-	}
-
-	public function getAppInfoByPath(string $path, ?string $lang = null): ?array {
-		if (!str_ends_with($path, '/appinfo/info.xml')) {
-			return null;
-		}
-
-		$parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
-		$data = $parser->parse($path);
-
-		if (is_array($data)) {
-			$data = $parser->applyL10N($data, $lang);
-		}
-
-		return $data;
-	}
-
-	public function getAppVersion(string $appId, bool $useCache = true): string {
-		if (!$useCache || !isset($this->appVersions[$appId])) {
-			if ($appId === 'core') {
-				$this->appVersions[$appId] = $this->serverVersion->getVersionString();
-			} else {
-				$appInfo = $this->getAppInfo($appId);
-				$this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
-			}
-		}
-		return $this->appVersions[$appId];
-	}
-
-	/**
-	 * Returns the installed versions of all apps
-	 *
-	 * @return array<string, string>
-	 */
-	public function getAppInstalledVersions(bool $onlyEnabled = false): array {
-		return $this->getAppConfig()->getAppInstalledVersions($onlyEnabled);
-	}
-
-	/**
-	 * Returns a list of apps incompatible with the given version
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 *
-	 * @return array list of app info from incompatible apps
-	 *
-	 * @internal
-	 */
-	public function getIncompatibleApps(string $version): array {
-		$apps = $this->getEnabledApps();
-		$incompatibleApps = [];
-		foreach ($apps as $appId) {
-			$info = $this->getAppInfo($appId);
-			if ($info === null) {
-				$incompatibleApps[] = ['id' => $appId, 'name' => $appId];
-			} elseif (!$this->isAppCompatible($version, $info)) {
-				$incompatibleApps[] = $info;
-			}
-		}
-		return $incompatibleApps;
-	}
-
-	/**
-	 * @inheritdoc
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
-	 */
-	public function isShipped($appId) {
-		$this->loadShippedJson();
-		return in_array($appId, $this->shippedApps, true);
-	}
-
-	private function isAlwaysEnabled(string $appId): bool {
-		if ($appId === 'core') {
-			return true;
-		}
-
-		$alwaysEnabled = $this->getAlwaysEnabledApps();
-		return in_array($appId, $alwaysEnabled, true);
-	}
-
-	/**
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
-	 * @throws \Exception
-	 */
-	private function loadShippedJson(): void {
-		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
-			if (!file_exists($shippedJson)) {
-				throw new \Exception("File not found: $shippedJson");
-			}
-			$content = json_decode(file_get_contents($shippedJson), true);
-			$this->shippedApps = $content['shippedApps'];
-			$this->alwaysEnabled = $content['alwaysEnabled'];
-			$this->defaultEnabled = $content['defaultEnabled'];
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAlwaysEnabledApps() {
-		$this->loadShippedJson();
-		return $this->alwaysEnabled;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function isDefaultEnabled(string $appId): bool {
-		return (in_array($appId, $this->getDefaultEnabledApps()));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultEnabledApps(): array {
-		$this->loadShippedJson();
-
-		return $this->defaultEnabled;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string {
-		$id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks);
-		$entry = $this->getNavigationManager()->get($id);
-		return (string)$entry['app'];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultApps(): array {
-		$ids = $this->getNavigationManager()->getDefaultEntryIds();
-
-		return array_values(array_unique(array_map(function (string $id) {
-			$entry = $this->getNavigationManager()->get($id);
-			return (string)$entry['app'];
-		}, $ids)));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setDefaultApps(array $defaultApps): void {
-		$entries = $this->getNavigationManager()->getAll();
-		$ids = [];
-		foreach ($defaultApps as $defaultApp) {
-			foreach ($entries as $entry) {
-				if ((string)$entry['app'] === $defaultApp) {
-					$ids[] = (string)$entry['id'];
-					break;
-				}
-			}
-		}
-		$this->getNavigationManager()->setDefaultEntryIds($ids);
-	}
-
-	public function isBackendRequired(string $backend): bool {
-		foreach ($this->appInfos as $appInfo) {
-			if (
-				isset($appInfo['dependencies']['backend'])
-				&& is_array($appInfo['dependencies']['backend'])
-				&& in_array($backend, $appInfo['dependencies']['backend'], true)
-			) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Clean the appId from forbidden characters
-	 *
-	 * @psalm-taint-escape callable
-	 * @psalm-taint-escape cookie
-	 * @psalm-taint-escape file
-	 * @psalm-taint-escape has_quotes
-	 * @psalm-taint-escape header
-	 * @psalm-taint-escape html
-	 * @psalm-taint-escape include
-	 * @psalm-taint-escape ldap
-	 * @psalm-taint-escape shell
-	 * @psalm-taint-escape sql
-	 * @psalm-taint-escape unserialize
-	 */
-	public function cleanAppId(string $app): string {
-		/* Only lowercase alphanumeric is allowed */
-		return preg_replace('/(^[0-9_-]+|[^a-z0-9_-]+|[_-]+$)/', '', $app);
-	}
-
-	/**
-	 * Run upgrade tasks for an app after the code has already been updated
-	 *
-	 * @throws AppPathNotFoundException if app folder can't be found
-	 */
-	public function upgradeApp(string $appId): bool {
-		// for apps distributed with core, we refresh app path in case the downloaded version
-		// have been installed in custom apps and not in the default path
-		$appPath = $this->getAppPath($appId, true);
-
-		$this->clearAppsCache();
-		$l = \OC::$server->getL10N('core');
-		$appData = $this->getAppInfo($appId, false, $l->getLanguageCode());
-		if ($appData === null) {
-			throw new AppPathNotFoundException('Could not find ' . $appId);
-		}
-
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMax = in_array($appId, $ignoreMaxApps, true);
-		\OC_App::checkAppDependencies(
-			$this->config,
-			$l,
-			$appData,
-			$ignoreMax
-		);
-
-		\OC_App::registerAutoloading($appId, $appPath, true);
-		\OC_App::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
-
-		$ms = new MigrationService($appId, Server::get(\OC\DB\Connection::class));
-		$ms->migrate();
-
-		\OC_App::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
-		$queue = Server::get(IJobList::class);
-		foreach ($appData['repair-steps']['live-migration'] as $step) {
-			$queue->add(\OC\Migration\BackgroundRepair::class, [
-				'app' => $appId,
-				'step' => $step]);
-		}
-
-		// update appversion in app manager
-		$this->clearAppsCache();
-		$this->getAppVersion($appId, false);
-
-		// Setup background jobs
-		foreach ($appData['background-jobs'] as $job) {
-			$queue->add($job);
-		}
-
-		//set remote/public handlers
-		foreach ($appData['remote'] as $name => $path) {
-			$this->config->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
-		}
-		foreach ($appData['public'] as $name => $path) {
-			$this->config->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
-		}
-
-		\OC_App::setAppTypes($appId);
-
-		$version = $this->getAppVersion($appId);
-		$this->config->setAppValue($appId, 'installed_version', $version);
-
-		// migrate eventual new config keys in the process
-		/** @psalm-suppress InternalMethod */
-		$this->configManager->migrateConfigLexiconKeys($appId);
-		$this->configManager->updateLexiconEntries($appId);
-
-		$this->dispatcher->dispatchTyped(new AppUpdateEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_UPDATE, $appId
-		));
-
-		return true;
-	}
-
-	public function isUpgradeRequired(string $appId): bool {
-		$versions = $this->getAppInstalledVersions();
-		$currentVersion = $this->getAppVersion($appId);
-		if ($currentVersion && isset($versions[$appId])) {
-			$installedVersion = $versions[$appId];
-			if (!version_compare($currentVersion, $installedVersion, '=')) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isAppCompatible(string $serverVersion, array $appInfo, bool $ignoreMax = false): bool {
-		return count($this->dependencyAnalyzer->analyzeServerVersion($serverVersion, $appInfo, $ignoreMax)) === 0;
-	}
+    /**
+     * Apps with these types can not be enabled for certain groups only
+     * @var string[]
+     */
+    protected $protectedAppTypes = [
+        'filesystem',
+        'prelogin',
+        'authentication',
+        'logging',
+        'prevent_group_restriction',
+    ];
+
+    /** @var string[] $appId => $enabled */
+    private array $enabledAppsCache = [];
+
+    /** @var string[]|null */
+    private ?array $shippedApps = null;
+
+    private array $alwaysEnabled = [];
+    private array $defaultEnabled = [];
+
+    /** @var array */
+    private array $appInfos = [];
+
+    /** @var array */
+    private array $appVersions = [];
+
+    /** @var array */
+    private array $autoDisabledApps = [];
+    private array $appTypes = [];
+
+    /** @var array<string, true> */
+    private array $loadedApps = [];
+
+    private ?AppConfig $appConfig = null;
+    private ?IURLGenerator $urlGenerator = null;
+    private ?INavigationManager $navigationManager = null;
+
+    /**
+     * Be extremely careful when injecting classes here. The AppManager is used by the installer,
+     * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
+     */
+    public function __construct(
+        private IUserSession $userSession,
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private ICacheFactory $memCacheFactory,
+        private IEventDispatcher $dispatcher,
+        private LoggerInterface $logger,
+        private ServerVersion $serverVersion,
+        private ConfigManager $configManager,
+        private DependencyAnalyzer $dependencyAnalyzer,
+    ) {
+    }
+
+    private function getNavigationManager(): INavigationManager {
+        if ($this->navigationManager === null) {
+            $this->navigationManager = Server::get(INavigationManager::class);
+        }
+        return $this->navigationManager;
+    }
+
+    public function getAppIcon(string $appId, bool $dark = false): ?string {
+        $possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg'];
+        $icon = null;
+        foreach ($possibleIcons as $iconName) {
+            try {
+                $icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
+                break;
+            } catch (\RuntimeException $e) {
+                // ignore
+            }
+        }
+        return $icon;
+    }
+
+    private function getAppConfig(): AppConfig {
+        if ($this->appConfig !== null) {
+            return $this->appConfig;
+        }
+        if (!$this->config->getSystemValueBool('installed', false)) {
+            throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+        }
+        $this->appConfig = Server::get(AppConfig::class);
+        return $this->appConfig;
+    }
+
+    private function getUrlGenerator(): IURLGenerator {
+        if ($this->urlGenerator !== null) {
+            return $this->urlGenerator;
+        }
+        if (!$this->config->getSystemValueBool('installed', false)) {
+            throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+        }
+        $this->urlGenerator = Server::get(IURLGenerator::class);
+        return $this->urlGenerator;
+    }
+
+    /**
+     * For all enabled apps, return the value of their 'enabled' config key.
+     *
+     * @return array<string,string> appId => enabled (may be 'yes', or a json encoded list of group ids)
+     */
+    private function getEnabledAppsValues(): array {
+        if (!$this->enabledAppsCache) {
+            /** @var array<string,string> */
+            $values = $this->getAppConfig()->searchValues('enabled', false, IAppConfig::VALUE_STRING);
+
+            $alwaysEnabledApps = $this->getAlwaysEnabledApps();
+            foreach ($alwaysEnabledApps as $appId) {
+                $values[$appId] = 'yes';
+            }
+
+            $this->enabledAppsCache = array_filter($values, function ($value) {
+                return $value !== 'no';
+            });
+            ksort($this->enabledAppsCache);
+        }
+        return $this->enabledAppsCache;
+    }
+
+    /**
+     * Deprecated alias
+     *
+     * @return string[]
+     */
+    public function getInstalledApps() {
+        return $this->getEnabledApps();
+    }
+
+    /**
+     * List all enabled apps, either for everyone or for some groups
+     *
+     * @return list<string>
+     */
+    public function getEnabledApps(): array {
+        return array_keys($this->getEnabledAppsValues());
+    }
+
+    /**
+     * Get a list of all apps in the apps folder
+     *
+     * @return list<string> an array of app names (string IDs)
+     */
+    public function getAllAppsInAppsFolders(): array {
+        $apps = [];
+
+        foreach (\OC::$APPSROOTS as $apps_dir) {
+            if (!is_readable($apps_dir['path'])) {
+                $this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
+                continue;
+            }
+            $dh = opendir($apps_dir['path']);
+
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if (
+                        $file[0] != '.'
+                        && is_dir($apps_dir['path'] . '/' . $file)
+                        && is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')
+                    ) {
+                        $apps[] = $file;
+                    }
+                }
+            }
+        }
+
+        return array_values(array_unique($apps));
+    }
+
+    /**
+     * List all apps enabled for a user
+     *
+     * @param \OCP\IUser $user
+     * @return list<string>
+     */
+    public function getEnabledAppsForUser(IUser $user) {
+        $apps = $this->getEnabledAppsValues();
+        $appsForUser = array_filter($apps, function ($enabled) use ($user) {
+            return $this->checkAppForUser($enabled, $user);
+        });
+        return array_keys($appsForUser);
+    }
+
+    public function getEnabledAppsForGroup(IGroup $group): array {
+        $apps = $this->getEnabledAppsValues();
+        $appsForGroups = array_filter($apps, function ($enabled) use ($group) {
+            return $this->checkAppForGroups($enabled, $group);
+        });
+        return array_keys($appsForGroups);
+    }
+
+    /**
+     * Loads all apps
+     *
+     * @param string[] $types
+     * @return bool
+     *
+     * This function walks through the Nextcloud directory and loads all apps
+     * it can find. A directory contains an app if the file /appinfo/info.xml
+     * exists.
+     *
+     * if $types is set to non-empty array, only apps of those types will be loaded
+     */
+    public function loadApps(array $types = []): bool {
+        if ($this->config->getSystemValueBool('maintenance', false)) {
+            return false;
+        }
+        // Load the enabled apps here
+        $apps = \OC_App::getEnabledApps();
+
+        // Add each apps' folder as allowed class path
+        foreach ($apps as $app) {
+            // If the app is already loaded then autoloading it makes no sense
+            if (!$this->isAppLoaded($app)) {
+                try {
+                    $path = $this->getAppPath($app);
+                    \OC_App::registerAutoloading($app, $path);
+                } catch (AppPathNotFoundException $e) {
+                    $this->logger->info('Error during app loading: ' . $e->getMessage(), [
+                        'exception' => $e,
+                        'app' => $app,
+                    ]);
+                }
+            }
+        }
+
+        // prevent app loading from printing output
+        ob_start();
+        foreach ($apps as $app) {
+            if (!$this->isAppLoaded($app) && ($types === [] || $this->isType($app, $types))) {
+                try {
+                    $this->loadApp($app);
+                } catch (\Throwable $e) {
+                    $this->logger->emergency('Error during app loading: ' . $e->getMessage(), [
+                        'exception' => $e,
+                        'app' => $app,
+                    ]);
+                }
+            }
+        }
+        ob_end_clean();
+
+        return true;
+    }
+
+    /**
+     * check if an app is of a specific type
+     *
+     * @param string $app
+     * @param array $types
+     * @return bool
+     */
+    public function isType(string $app, array $types): bool {
+        $appTypes = $this->getAppTypes($app);
+        foreach ($types as $type) {
+            if (in_array($type, $appTypes, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * get the types of an app
+     *
+     * @param string $app
+     * @return string[]
+     */
+    private function getAppTypes(string $app): array {
+        //load the cache
+        if (count($this->appTypes) === 0) {
+            $this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];
+        }
+
+        if (isset($this->appTypes[$app])) {
+            return explode(',', $this->appTypes[$app]);
+        }
+
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    public function getAutoDisabledApps(): array {
+        return $this->autoDisabledApps;
+    }
+
+    public function getAppRestriction(string $appId): array {
+        $values = $this->getEnabledAppsValues();
+
+        if (!isset($values[$appId])) {
+            return [];
+        }
+
+        if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
+            return [];
+        }
+        return json_decode($values[$appId], true);
+    }
+
+    /**
+     * Check if an app is enabled for user
+     *
+     * @param string $appId
+     * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used
+     * @return bool
+     */
+    public function isEnabledForUser($appId, $user = null) {
+        if ($this->isAlwaysEnabled($appId)) {
+            return true;
+        }
+        if ($user === null) {
+            $user = $this->userSession->getUser();
+        }
+        $enabledAppsValues = $this->getEnabledAppsValues();
+        if (isset($enabledAppsValues[$appId])) {
+            return $this->checkAppForUser($enabledAppsValues[$appId], $user);
+        } else {
+            return false;
+        }
+    }
+
+    private function checkAppForUser(string $enabled, ?IUser $user): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } elseif ($user === null) {
+            return false;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $jsonErrorMsg = json_last_error_msg();
+                // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
+                $this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
+                return false;
+            }
+
+            $userGroups = $this->groupManager->getUserGroupIds($user);
+            foreach ($userGroups as $groupId) {
+                if (in_array($groupId, $groupIds, true)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private function checkAppForGroups(string $enabled, IGroup $group): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $jsonErrorMsg = json_last_error_msg();
+                // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
+                $this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
+                return false;
+            }
+
+            return in_array($group->getGID(), $groupIds);
+        }
+    }
+
+    /**
+     * Check if an app is enabled in the instance
+     *
+     * Notice: This actually checks if the app is enabled and not only if it is installed.
+     *
+     * @param string $appId
+     */
+    public function isInstalled($appId): bool {
+        return $this->isEnabledForAnyone($appId);
+    }
+
+    public function isEnabledForAnyone(string $appId): bool {
+        $enabledAppsValues = $this->getEnabledAppsValues();
+        return isset($enabledAppsValues[$appId]);
+    }
+
+    /**
+     * Overwrite the `max-version` requirement for this app.
+     */
+    public function overwriteNextcloudRequirement(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        if (!in_array($appId, $ignoreMaxApps, true)) {
+            $ignoreMaxApps[] = $appId;
+        }
+        $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+    }
+
+    /**
+     * Remove the `max-version` overwrite for this app.
+     * This means this app now again can not be enabled if the `max-version` is smaller than the current Nextcloud version.
+     */
+    public function removeOverwriteNextcloudRequirement(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
+        $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+    }
+
+    public function loadApp(string $app): void {
+        if (isset($this->loadedApps[$app])) {
+            return;
+        }
+        $this->loadedApps[$app] = true;
+        try {
+            $appPath = $this->getAppPath($app);
+        } catch (AppPathNotFoundException $e) {
+            $this->logger->info('Error during app loading: ' . $e->getMessage(), [
+                'exception' => $e,
+                'app' => $app,
+            ]);
+            return;
+        }
+        $eventLogger = \OC::$server->get(IEventLogger::class);
+        $eventLogger->start("bootstrap:load_app:$app", "Load app: $app");
+
+        // in case someone calls loadApp() directly
+        \OC_App::registerAutoloading($app, $appPath);
+
+        if (is_file($appPath . '/appinfo/app.php')) {
+            $this->logger->error('/appinfo/app.php is not supported anymore, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
+                'app' => $app,
+            ]);
+        }
+
+        $coordinator = Server::get(Coordinator::class);
+        $coordinator->bootApp($app);
+
+        $eventLogger->start("bootstrap:load_app:$app:info", "Load info.xml for $app and register any services defined in it");
+        $info = $this->getAppInfo($app);
+        if (!empty($info['activity'])) {
+            $activityManager = \OC::$server->get(IActivityManager::class);
+            if (!empty($info['activity']['filters'])) {
+                foreach ($info['activity']['filters'] as $filter) {
+                    $activityManager->registerFilter($filter);
+                }
+            }
+            if (!empty($info['activity']['settings'])) {
+                foreach ($info['activity']['settings'] as $setting) {
+                    $activityManager->registerSetting($setting);
+                }
+            }
+            if (!empty($info['activity']['providers'])) {
+                foreach ($info['activity']['providers'] as $provider) {
+                    $activityManager->registerProvider($provider);
+                }
+            }
+        }
+
+        if (!empty($info['settings'])) {
+            $settingsManager = \OCP\Server::get(ISettingsManager::class);
+            if (!empty($info['settings']['admin'])) {
+                foreach ($info['settings']['admin'] as $setting) {
+                    $settingsManager->registerSetting('admin', $setting);
+                }
+            }
+            if (!empty($info['settings']['admin-section'])) {
+                foreach ($info['settings']['admin-section'] as $section) {
+                    $settingsManager->registerSection('admin', $section);
+                }
+            }
+            if (!empty($info['settings']['personal'])) {
+                foreach ($info['settings']['personal'] as $setting) {
+                    $settingsManager->registerSetting('personal', $setting);
+                }
+            }
+            if (!empty($info['settings']['personal-section'])) {
+                foreach ($info['settings']['personal-section'] as $section) {
+                    $settingsManager->registerSection('personal', $section);
+                }
+            }
+            if (!empty($info['settings']['admin-delegation'])) {
+                foreach ($info['settings']['admin-delegation'] as $setting) {
+                    $settingsManager->registerSetting(ISettingsManager::SETTINGS_DELEGATION, $setting);
+                }
+            }
+            if (!empty($info['settings']['admin-delegation-section'])) {
+                foreach ($info['settings']['admin-delegation-section'] as $section) {
+                    $settingsManager->registerSection(ISettingsManager::SETTINGS_DELEGATION, $section);
+                }
+            }
+        }
+
+        if (!empty($info['collaboration']['plugins'])) {
+            // deal with one or many plugin entries
+            $plugins = isset($info['collaboration']['plugins']['plugin']['@value'])
+                ? [$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
+            $collaboratorSearch = null;
+            $autoCompleteManager = null;
+            foreach ($plugins as $plugin) {
+                if ($plugin['@attributes']['type'] === 'collaborator-search') {
+                    $pluginInfo = [
+                        'shareType' => $plugin['@attributes']['share-type'],
+                        'class' => $plugin['@value'],
+                    ];
+                    $collaboratorSearch ??= \OC::$server->get(ICollaboratorSearch::class);
+                    $collaboratorSearch->registerPlugin($pluginInfo);
+                } elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
+                    $autoCompleteManager ??= \OC::$server->get(IAutoCompleteManager::class);
+                    $autoCompleteManager->registerSorter($plugin['@value']);
+                }
+            }
+        }
+        $eventLogger->end("bootstrap:load_app:$app:info");
+
+        $eventLogger->end("bootstrap:load_app:$app");
+    }
+
+    /**
+     * Check if an app is loaded
+     * @param string $app app id
+     * @since 26.0.0
+     */
+    public function isAppLoaded(string $app): bool {
+        return isset($this->loadedApps[$app]);
+    }
+
+    /**
+     * Enable an app for every user
+     *
+     * @param string $appId
+     * @param bool $forceEnable
+     * @throws AppPathNotFoundException
+     * @throws \InvalidArgumentException if the application is not installed yet
+     */
+    public function enableApp(string $appId, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
+            throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
+        }
+
+        if ($forceEnable) {
+            $this->overwriteNextcloudRequirement($appId);
+        }
+
+        $this->enabledAppsCache[$appId] = 'yes';
+        $this->getAppConfig()->setValue($appId, 'enabled', 'yes');
+        $this->dispatcher->dispatchTyped(new AppEnableEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE, $appId
+        ));
+        $this->clearAppsCache();
+
+        $this->configManager->migrateConfigLexiconKeys($appId);
+    }
+
+    /**
+     * Whether a list of types contains a protected app type
+     *
+     * @param string[] $types
+     * @return bool
+     */
+    public function hasProtectedAppType($types) {
+        if (empty($types)) {
+            return false;
+        }
+
+        $protectedTypes = array_intersect($this->protectedAppTypes, $types);
+        return !empty($protectedTypes);
+    }
+
+    /**
+     * Enable an app only for specific groups
+     *
+     * @param string $appId
+     * @param IGroup[] $groups
+     * @param bool $forceEnable
+     * @throws \InvalidArgumentException if app can't be enabled for groups
+     * @throws AppPathNotFoundException
+     */
+    public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        $info = $this->getAppInfo($appId);
+        if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
+            throw new \InvalidArgumentException("$appId can't be enabled for groups.");
+        }
+
+        if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
+            throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
+        }
+
+        if ($forceEnable) {
+            $this->overwriteNextcloudRequirement($appId);
+        }
+
+        /** @var string[] $groupIds */
+        $groupIds = array_map(function ($group) {
+            /** @var IGroup $group */
+            return ($group instanceof IGroup)
+                ? $group->getGID()
+                : $group;
+        }, $groups);
+
+        $this->enabledAppsCache[$appId] = json_encode($groupIds);
+        $this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));
+        $this->dispatcher->dispatchTyped(new AppEnableEvent($appId, $groupIds));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
+        ));
+        $this->clearAppsCache();
+
+        $this->configManager->migrateConfigLexiconKeys($appId);
+    }
+
+    /**
+     * Disable an app for every user
+     *
+     * @param string $appId
+     * @param bool $automaticDisabled
+     * @throws \Exception if app can't be disabled
+     */
+    public function disableApp($appId, $automaticDisabled = false): void {
+        if ($this->isAlwaysEnabled($appId)) {
+            throw new \Exception("$appId can't be disabled.");
+        }
+
+        if ($automaticDisabled) {
+            $previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');
+            if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
+                $previousSetting = json_decode($previousSetting, true);
+            }
+            $this->autoDisabledApps[$appId] = $previousSetting;
+        }
+
+        unset($this->enabledAppsCache[$appId]);
+        $this->getAppConfig()->setValue($appId, 'enabled', 'no');
+
+        // run uninstall steps
+        $appData = $this->getAppInfo($appId);
+        if (!is_null($appData)) {
+            \OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
+        }
+
+        $this->dispatcher->dispatchTyped(new AppDisableEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_DISABLE, $appId
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Get the directory for the given app.
+     *
+     * @psalm-taint-specialize
+     *
+     * @throws AppPathNotFoundException if app folder can't be found
+     */
+    public function getAppPath(string $appId, bool $ignoreCache = false): string {
+        $appId = $this->cleanAppId($appId);
+        if ($appId === '') {
+            throw new AppPathNotFoundException('App id is empty');
+        } elseif ($appId === 'core') {
+            return __DIR__ . '/../../../core';
+        }
+
+        if (($dir = $this->findAppInDirectories($appId, $ignoreCache)) != false) {
+            return $dir['path'] . '/' . $appId;
+        }
+        throw new AppPathNotFoundException('Could not find path for ' . $appId);
+    }
+
+    /**
+     * Get the web path for the given app.
+     *
+     * @throws AppPathNotFoundException if app path can't be found
+     */
+    public function getAppWebPath(string $appId): string {
+        if (($dir = $this->findAppInDirectories($appId)) != false) {
+            return \OC::$WEBROOT . $dir['url'] . '/' . $appId;
+        }
+        throw new AppPathNotFoundException('Could not find web path for ' . $appId);
+    }
+
+    /**
+     * Find the apps root for an app id.
+     *
+     * If multiple copies are found, the apps root the latest version is returned.
+     *
+     * @param bool $ignoreCache ignore cache and rebuild it
+     * @return false|array{path: string, url: string} the apps root shape
+     */
+    public function findAppInDirectories(string $appId, bool $ignoreCache = false) {
+        $sanitizedAppId = $this->cleanAppId($appId);
+        if ($sanitizedAppId !== $appId) {
+            return false;
+        }
+        // FIXME replace by a property or a cache
+        static $app_dir = [];
+
+        if (isset($app_dir[$appId]) && !$ignoreCache) {
+            return $app_dir[$appId];
+        }
+
+        $possibleApps = [];
+        foreach (\OC::$APPSROOTS as $dir) {
+            if (file_exists($dir['path'] . '/' . $appId)) {
+                $possibleApps[] = $dir;
+            }
+        }
+
+        if (empty($possibleApps)) {
+            return false;
+        } elseif (count($possibleApps) === 1) {
+            $dir = array_shift($possibleApps);
+            $app_dir[$appId] = $dir;
+            return $dir;
+        } else {
+            $versionToLoad = [];
+            foreach ($possibleApps as $possibleApp) {
+                $appData = $this->getAppInfoByPath($possibleApp['path'] . '/' . $appId . '/appinfo/info.xml');
+                $version = $appData['version'] ?? '';
+                if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
+                    $versionToLoad = [
+                        'dir' => $possibleApp,
+                        'version' => $version,
+                    ];
+                }
+            }
+            if (!isset($versionToLoad['dir'])) {
+                return false;
+            }
+            $app_dir[$appId] = $versionToLoad['dir'];
+            return $versionToLoad['dir'];
+        }
+    }
+
+    /**
+     * Clear the cached list of apps when enabling/disabling an app
+     */
+    public function clearAppsCache(): void {
+        $this->appInfos = [];
+    }
+
+    /**
+     * Returns a list of apps that need upgrade
+     *
+     * @param string $version Nextcloud version as array of version components
+     * @return array list of app info from apps that need an upgrade
+     *
+     * @internal
+     */
+    public function getAppsNeedingUpgrade($version) {
+        $appsToUpgrade = [];
+        $apps = $this->getEnabledApps();
+        foreach ($apps as $appId) {
+            $appInfo = $this->getAppInfo($appId);
+            $appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');
+            if ($appDbVersion
+                && isset($appInfo['version'])
+                && version_compare($appInfo['version'], $appDbVersion, '>')
+                && $this->isAppCompatible($version, $appInfo)
+            ) {
+                $appsToUpgrade[] = $appInfo;
+            }
+        }
+
+        return $appsToUpgrade;
+    }
+
+    /**
+     * Returns the app information from "appinfo/info.xml".
+     *
+     * @param string|null $lang
+     * @return array|null app info
+     */
+    public function getAppInfo(string $appId, bool $path = false, $lang = null) {
+        if ($path) {
+            throw new \InvalidArgumentException('Calling IAppManager::getAppInfo() with a path is no longer supported. Please call IAppManager::getAppInfoByPath() instead and verify that the path is good before calling.');
+        }
+        if ($lang === null && isset($this->appInfos[$appId])) {
+            return $this->appInfos[$appId];
+        }
+        try {
+            $appPath = $this->getAppPath($appId);
+        } catch (AppPathNotFoundException) {
+            return null;
+        }
+        $file = $appPath . '/appinfo/info.xml';
+
+        $data = $this->getAppInfoByPath($file, $lang);
+
+        if ($lang === null) {
+            $this->appInfos[$appId] = $data;
+        }
+
+        return $data;
+    }
+
+    public function getAppInfoByPath(string $path, ?string $lang = null): ?array {
+        if (!str_ends_with($path, '/appinfo/info.xml')) {
+            return null;
+        }
+
+        $parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
+        $data = $parser->parse($path);
+
+        if (is_array($data)) {
+            $data = $parser->applyL10N($data, $lang);
+        }
+
+        return $data;
+    }
+
+    public function getAppVersion(string $appId, bool $useCache = true): string {
+        if (!$useCache || !isset($this->appVersions[$appId])) {
+            if ($appId === 'core') {
+                $this->appVersions[$appId] = $this->serverVersion->getVersionString();
+            } else {
+                $appInfo = $this->getAppInfo($appId);
+                $this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
+            }
+        }
+        return $this->appVersions[$appId];
+    }
+
+    /**
+     * Returns the installed versions of all apps
+     *
+     * @return array<string, string>
+     */
+    public function getAppInstalledVersions(bool $onlyEnabled = false): array {
+        return $this->getAppConfig()->getAppInstalledVersions($onlyEnabled);
+    }
+
+    /**
+     * Returns a list of apps incompatible with the given version
+     *
+     * @param string $version Nextcloud version as array of version components
+     *
+     * @return array list of app info from incompatible apps
+     *
+     * @internal
+     */
+    public function getIncompatibleApps(string $version): array {
+        $apps = $this->getEnabledApps();
+        $incompatibleApps = [];
+        foreach ($apps as $appId) {
+            $info = $this->getAppInfo($appId);
+            if ($info === null) {
+                $incompatibleApps[] = ['id' => $appId, 'name' => $appId];
+            } elseif (!$this->isAppCompatible($version, $info)) {
+                $incompatibleApps[] = $info;
+            }
+        }
+        return $incompatibleApps;
+    }
+
+    /**
+     * @inheritdoc
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
+     */
+    public function isShipped($appId) {
+        $this->loadShippedJson();
+        return in_array($appId, $this->shippedApps, true);
+    }
+
+    private function isAlwaysEnabled(string $appId): bool {
+        if ($appId === 'core') {
+            return true;
+        }
+
+        $alwaysEnabled = $this->getAlwaysEnabledApps();
+        return in_array($appId, $alwaysEnabled, true);
+    }
+
+    /**
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
+     * @throws \Exception
+     */
+    private function loadShippedJson(): void {
+        if ($this->shippedApps === null) {
+            $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+            if (!file_exists($shippedJson)) {
+                throw new \Exception("File not found: $shippedJson");
+            }
+            $content = json_decode(file_get_contents($shippedJson), true);
+            $this->shippedApps = $content['shippedApps'];
+            $this->alwaysEnabled = $content['alwaysEnabled'];
+            $this->defaultEnabled = $content['defaultEnabled'];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAlwaysEnabledApps() {
+        $this->loadShippedJson();
+        return $this->alwaysEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isDefaultEnabled(string $appId): bool {
+        return (in_array($appId, $this->getDefaultEnabledApps()));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultEnabledApps(): array {
+        $this->loadShippedJson();
+
+        return $this->defaultEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string {
+        $id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks);
+        $entry = $this->getNavigationManager()->get($id);
+        return (string)$entry['app'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultApps(): array {
+        $ids = $this->getNavigationManager()->getDefaultEntryIds();
+
+        return array_values(array_unique(array_map(function (string $id) {
+            $entry = $this->getNavigationManager()->get($id);
+            return (string)$entry['app'];
+        }, $ids)));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setDefaultApps(array $defaultApps): void {
+        $entries = $this->getNavigationManager()->getAll();
+        $ids = [];
+        foreach ($defaultApps as $defaultApp) {
+            foreach ($entries as $entry) {
+                if ((string)$entry['app'] === $defaultApp) {
+                    $ids[] = (string)$entry['id'];
+                    break;
+                }
+            }
+        }
+        $this->getNavigationManager()->setDefaultEntryIds($ids);
+    }
+
+    public function isBackendRequired(string $backend): bool {
+        foreach ($this->appInfos as $appInfo) {
+            if (
+                isset($appInfo['dependencies']['backend'])
+                && is_array($appInfo['dependencies']['backend'])
+                && in_array($backend, $appInfo['dependencies']['backend'], true)
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Clean the appId from forbidden characters
+     *
+     * @psalm-taint-escape callable
+     * @psalm-taint-escape cookie
+     * @psalm-taint-escape file
+     * @psalm-taint-escape has_quotes
+     * @psalm-taint-escape header
+     * @psalm-taint-escape html
+     * @psalm-taint-escape include
+     * @psalm-taint-escape ldap
+     * @psalm-taint-escape shell
+     * @psalm-taint-escape sql
+     * @psalm-taint-escape unserialize
+     */
+    public function cleanAppId(string $app): string {
+        /* Only lowercase alphanumeric is allowed */
+        return preg_replace('/(^[0-9_-]+|[^a-z0-9_-]+|[_-]+$)/', '', $app);
+    }
+
+    /**
+     * Run upgrade tasks for an app after the code has already been updated
+     *
+     * @throws AppPathNotFoundException if app folder can't be found
+     */
+    public function upgradeApp(string $appId): bool {
+        // for apps distributed with core, we refresh app path in case the downloaded version
+        // have been installed in custom apps and not in the default path
+        $appPath = $this->getAppPath($appId, true);
+
+        $this->clearAppsCache();
+        $l = \OC::$server->getL10N('core');
+        $appData = $this->getAppInfo($appId, false, $l->getLanguageCode());
+        if ($appData === null) {
+            throw new AppPathNotFoundException('Could not find ' . $appId);
+        }
+
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMax = in_array($appId, $ignoreMaxApps, true);
+        \OC_App::checkAppDependencies(
+            $this->config,
+            $l,
+            $appData,
+            $ignoreMax
+        );
+
+        \OC_App::registerAutoloading($appId, $appPath, true);
+        \OC_App::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
+
+        $ms = new MigrationService($appId, Server::get(\OC\DB\Connection::class));
+        $ms->migrate();
+
+        \OC_App::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
+        $queue = Server::get(IJobList::class);
+        foreach ($appData['repair-steps']['live-migration'] as $step) {
+            $queue->add(\OC\Migration\BackgroundRepair::class, [
+                'app' => $appId,
+                'step' => $step]);
+        }
+
+        // update appversion in app manager
+        $this->clearAppsCache();
+        $this->getAppVersion($appId, false);
+
+        // Setup background jobs
+        foreach ($appData['background-jobs'] as $job) {
+            $queue->add($job);
+        }
+
+        //set remote/public handlers
+        foreach ($appData['remote'] as $name => $path) {
+            $this->config->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+        }
+        foreach ($appData['public'] as $name => $path) {
+            $this->config->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+        }
+
+        \OC_App::setAppTypes($appId);
+
+        $version = $this->getAppVersion($appId);
+        $this->config->setAppValue($appId, 'installed_version', $version);
+
+        // migrate eventual new config keys in the process
+        /** @psalm-suppress InternalMethod */
+        $this->configManager->migrateConfigLexiconKeys($appId);
+        $this->configManager->updateLexiconEntries($appId);
+
+        $this->dispatcher->dispatchTyped(new AppUpdateEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_UPDATE, $appId
+        ));
+
+        return true;
+    }
+
+    public function isUpgradeRequired(string $appId): bool {
+        $versions = $this->getAppInstalledVersions();
+        $currentVersion = $this->getAppVersion($appId);
+        if ($currentVersion && isset($versions[$appId])) {
+            $installedVersion = $versions[$appId];
+            if (!version_compare($currentVersion, $installedVersion, '=')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function isAppCompatible(string $serverVersion, array $appInfo, bool $ignoreMax = false): bool {
+        return count($this->dependencyAnalyzer->analyzeServerVersion($serverVersion, $appInfo, $ignoreMax)) === 0;
+    }
 }

lib/private/App/InfoParser.php

Indentation +315 added lines, -315 removed lines

@@ -11,344 +11,344 @@
 use function simplexml_load_string;
 
 class InfoParser {
-	/**
-	 * @param ICache|null $cache
-	 */
-	public function __construct(
-		private ?ICache $cache = null,
-	) {
-	}
+    /**
+     * @param ICache|null $cache
+     */
+    public function __construct(
+        private ?ICache $cache = null,
+    ) {
+    }
 
-	/**
-	 * @param string $file the xml file to be loaded
-	 * @return null|array where null is an indicator for an error
-	 */
-	public function parse(string $file): ?array {
-		if (!file_exists($file)) {
-			return null;
-		}
+    /**
+     * @param string $file the xml file to be loaded
+     * @return null|array where null is an indicator for an error
+     */
+    public function parse(string $file): ?array {
+        if (!file_exists($file)) {
+            return null;
+        }
 
-		if ($this->cache !== null) {
-			$fileCacheKey = $file . filemtime($file);
-			if ($cachedValue = $this->cache->get($fileCacheKey)) {
-				return json_decode($cachedValue, true);
-			}
-		}
+        if ($this->cache !== null) {
+            $fileCacheKey = $file . filemtime($file);
+            if ($cachedValue = $this->cache->get($fileCacheKey)) {
+                return json_decode($cachedValue, true);
+            }
+        }
 
-		libxml_use_internal_errors(true);
-		$xml = simplexml_load_string(file_get_contents($file));
+        libxml_use_internal_errors(true);
+        $xml = simplexml_load_string(file_get_contents($file));
 
-		if ($xml === false) {
-			libxml_clear_errors();
-			return null;
-		}
-		$array = $this->xmlToArray($xml);
+        if ($xml === false) {
+            libxml_clear_errors();
+            return null;
+        }
+        $array = $this->xmlToArray($xml);
 
-		if (is_string($array)) {
-			return null;
-		}
+        if (is_string($array)) {
+            return null;
+        }
 
-		if (!array_key_exists('info', $array)) {
-			$array['info'] = [];
-		}
-		if (!array_key_exists('remote', $array)) {
-			$array['remote'] = [];
-		}
-		if (!array_key_exists('public', $array)) {
-			$array['public'] = [];
-		}
-		if (!array_key_exists('types', $array)) {
-			$array['types'] = [];
-		}
-		if (!array_key_exists('repair-steps', $array)) {
-			$array['repair-steps'] = [];
-		}
-		if (!array_key_exists('install', $array['repair-steps'])) {
-			$array['repair-steps']['install'] = [];
-		}
-		if (!array_key_exists('pre-migration', $array['repair-steps'])) {
-			$array['repair-steps']['pre-migration'] = [];
-		}
-		if (!array_key_exists('post-migration', $array['repair-steps'])) {
-			$array['repair-steps']['post-migration'] = [];
-		}
-		if (!array_key_exists('live-migration', $array['repair-steps'])) {
-			$array['repair-steps']['live-migration'] = [];
-		}
-		if (!array_key_exists('uninstall', $array['repair-steps'])) {
-			$array['repair-steps']['uninstall'] = [];
-		}
-		if (!array_key_exists('background-jobs', $array)) {
-			$array['background-jobs'] = [];
-		}
-		if (!array_key_exists('two-factor-providers', $array)) {
-			$array['two-factor-providers'] = [];
-		}
-		if (!array_key_exists('commands', $array)) {
-			$array['commands'] = [];
-		}
-		if (!array_key_exists('activity', $array)) {
-			$array['activity'] = [];
-		}
-		if (!array_key_exists('filters', $array['activity'])) {
-			$array['activity']['filters'] = [];
-		}
-		if (!array_key_exists('settings', $array['activity'])) {
-			$array['activity']['settings'] = [];
-		}
-		if (!array_key_exists('providers', $array['activity'])) {
-			$array['activity']['providers'] = [];
-		}
-		if (!array_key_exists('settings', $array)) {
-			$array['settings'] = [];
-		}
-		if (!array_key_exists('admin', $array['settings'])) {
-			$array['settings']['admin'] = [];
-		}
-		if (!array_key_exists('admin-section', $array['settings'])) {
-			$array['settings']['admin-section'] = [];
-		}
-		if (!array_key_exists('personal', $array['settings'])) {
-			$array['settings']['personal'] = [];
-		}
-		if (!array_key_exists('personal-section', $array['settings'])) {
-			$array['settings']['personal-section'] = [];
-		}
-		if (!array_key_exists('dependencies', $array)) {
-			$array['dependencies'] = [];
-		}
-		if (!array_key_exists('backend', $array['dependencies'])) {
-			$array['dependencies']['backend'] = [];
-		}
+        if (!array_key_exists('info', $array)) {
+            $array['info'] = [];
+        }
+        if (!array_key_exists('remote', $array)) {
+            $array['remote'] = [];
+        }
+        if (!array_key_exists('public', $array)) {
+            $array['public'] = [];
+        }
+        if (!array_key_exists('types', $array)) {
+            $array['types'] = [];
+        }
+        if (!array_key_exists('repair-steps', $array)) {
+            $array['repair-steps'] = [];
+        }
+        if (!array_key_exists('install', $array['repair-steps'])) {
+            $array['repair-steps']['install'] = [];
+        }
+        if (!array_key_exists('pre-migration', $array['repair-steps'])) {
+            $array['repair-steps']['pre-migration'] = [];
+        }
+        if (!array_key_exists('post-migration', $array['repair-steps'])) {
+            $array['repair-steps']['post-migration'] = [];
+        }
+        if (!array_key_exists('live-migration', $array['repair-steps'])) {
+            $array['repair-steps']['live-migration'] = [];
+        }
+        if (!array_key_exists('uninstall', $array['repair-steps'])) {
+            $array['repair-steps']['uninstall'] = [];
+        }
+        if (!array_key_exists('background-jobs', $array)) {
+            $array['background-jobs'] = [];
+        }
+        if (!array_key_exists('two-factor-providers', $array)) {
+            $array['two-factor-providers'] = [];
+        }
+        if (!array_key_exists('commands', $array)) {
+            $array['commands'] = [];
+        }
+        if (!array_key_exists('activity', $array)) {
+            $array['activity'] = [];
+        }
+        if (!array_key_exists('filters', $array['activity'])) {
+            $array['activity']['filters'] = [];
+        }
+        if (!array_key_exists('settings', $array['activity'])) {
+            $array['activity']['settings'] = [];
+        }
+        if (!array_key_exists('providers', $array['activity'])) {
+            $array['activity']['providers'] = [];
+        }
+        if (!array_key_exists('settings', $array)) {
+            $array['settings'] = [];
+        }
+        if (!array_key_exists('admin', $array['settings'])) {
+            $array['settings']['admin'] = [];
+        }
+        if (!array_key_exists('admin-section', $array['settings'])) {
+            $array['settings']['admin-section'] = [];
+        }
+        if (!array_key_exists('personal', $array['settings'])) {
+            $array['settings']['personal'] = [];
+        }
+        if (!array_key_exists('personal-section', $array['settings'])) {
+            $array['settings']['personal-section'] = [];
+        }
+        if (!array_key_exists('dependencies', $array)) {
+            $array['dependencies'] = [];
+        }
+        if (!array_key_exists('backend', $array['dependencies'])) {
+            $array['dependencies']['backend'] = [];
+        }
 
-		if (array_key_exists('types', $array)) {
-			if (is_array($array['types'])) {
-				foreach ($array['types'] as $type => $v) {
-					unset($array['types'][$type]);
-					if (is_string($type)) {
-						$array['types'][] = $type;
-					}
-				}
-			} else {
-				$array['types'] = [];
-			}
-		}
-		if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
-			$array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
-		}
-		if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
-			$array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
-		}
-		if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
-			$array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
-		}
-		if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
-			$array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
-		}
-		if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
-			$array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
-		}
-		if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
-			$array['background-jobs'] = $array['background-jobs']['job'];
-		}
-		if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
-			$array['commands'] = $array['commands']['command'];
-		}
-		if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
-			$array['two-factor-providers'] = $array['two-factor-providers']['provider'];
-		}
-		if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
-			$array['activity']['filters'] = $array['activity']['filters']['filter'];
-		}
-		if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
-			$array['activity']['settings'] = $array['activity']['settings']['setting'];
-		}
-		if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
-			$array['activity']['providers'] = $array['activity']['providers']['provider'];
-		}
-		if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
-		) {
-			$array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
-		}
-		if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
-			$array['settings']['admin'] = [$array['settings']['admin']];
-		}
-		if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
-			$array['settings']['admin-section'] = [$array['settings']['admin-section']];
-		}
-		if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
-			$array['settings']['personal'] = [$array['settings']['personal']];
-		}
-		if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
-			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
-		}
-		if (isset($array['settings']['admin-delegation']) && !is_array($array['settings']['admin-delegation'])) {
-			$array['settings']['admin-delegation'] = [$array['settings']['admin-delegation']];
-		}
-		if (isset($array['settings']['admin-delegation-section']) && !is_array($array['settings']['admin-delegation-section'])) {
-			$array['settings']['admin-delegation-section'] = [$array['settings']['admin-delegation-section']];
-		}
-		if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
-			$array['navigations']['navigation'] = [$array['navigations']['navigation']];
-		}
-		if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) {
-			$array['dependencies']['backend'] = [$array['dependencies']['backend']];
-		}
+        if (array_key_exists('types', $array)) {
+            if (is_array($array['types'])) {
+                foreach ($array['types'] as $type => $v) {
+                    unset($array['types'][$type]);
+                    if (is_string($type)) {
+                        $array['types'][] = $type;
+                    }
+                }
+            } else {
+                $array['types'] = [];
+            }
+        }
+        if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
+            $array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
+        }
+        if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
+            $array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
+        }
+        if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
+            $array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
+        }
+        if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
+            $array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
+        }
+        if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
+            $array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
+        }
+        if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
+            $array['background-jobs'] = $array['background-jobs']['job'];
+        }
+        if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
+            $array['commands'] = $array['commands']['command'];
+        }
+        if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
+            $array['two-factor-providers'] = $array['two-factor-providers']['provider'];
+        }
+        if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
+            $array['activity']['filters'] = $array['activity']['filters']['filter'];
+        }
+        if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
+            $array['activity']['settings'] = $array['activity']['settings']['setting'];
+        }
+        if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
+            $array['activity']['providers'] = $array['activity']['providers']['provider'];
+        }
+        if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
+        ) {
+            $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
+        }
+        if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
+            $array['settings']['admin'] = [$array['settings']['admin']];
+        }
+        if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
+            $array['settings']['admin-section'] = [$array['settings']['admin-section']];
+        }
+        if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
+            $array['settings']['personal'] = [$array['settings']['personal']];
+        }
+        if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
+            $array['settings']['personal-section'] = [$array['settings']['personal-section']];
+        }
+        if (isset($array['settings']['admin-delegation']) && !is_array($array['settings']['admin-delegation'])) {
+            $array['settings']['admin-delegation'] = [$array['settings']['admin-delegation']];
+        }
+        if (isset($array['settings']['admin-delegation-section']) && !is_array($array['settings']['admin-delegation-section'])) {
+            $array['settings']['admin-delegation-section'] = [$array['settings']['admin-delegation-section']];
+        }
+        if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
+            $array['navigations']['navigation'] = [$array['navigations']['navigation']];
+        }
+        if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) {
+            $array['dependencies']['backend'] = [$array['dependencies']['backend']];
+        }
 
-		// Ensure some fields are always arrays
-		if (isset($array['screenshot']) && !is_array($array['screenshot'])) {
-			$array['screenshot'] = [$array['screenshot']];
-		}
-		if (isset($array['author']) && !is_array($array['author'])) {
-			$array['author'] = [$array['author']];
-		}
-		if (isset($array['category']) && !is_array($array['category'])) {
-			$array['category'] = [$array['category']];
-		}
+        // Ensure some fields are always arrays
+        if (isset($array['screenshot']) && !is_array($array['screenshot'])) {
+            $array['screenshot'] = [$array['screenshot']];
+        }
+        if (isset($array['author']) && !is_array($array['author'])) {
+            $array['author'] = [$array['author']];
+        }
+        if (isset($array['category']) && !is_array($array['category'])) {
+            $array['category'] = [$array['category']];
+        }
 
-		if ($this->cache !== null) {
-			$this->cache->set($fileCacheKey, json_encode($array));
-		}
-		return $array;
-	}
+        if ($this->cache !== null) {
+            $this->cache->set($fileCacheKey, json_encode($array));
+        }
+        return $array;
+    }
 
-	private function isNavigationItem(array $data): bool {
-		// Allow settings navigation items with no route entry
-		$type = $data['type'] ?? 'link';
-		if ($type === 'settings') {
-			return isset($data['name']);
-		}
-		return isset($data['name'], $data['route']);
-	}
+    private function isNavigationItem(array $data): bool {
+        // Allow settings navigation items with no route entry
+        $type = $data['type'] ?? 'link';
+        if ($type === 'settings') {
+            return isset($data['name']);
+        }
+        return isset($data['name'], $data['route']);
+    }
 
-	public function xmlToArray(\SimpleXMLElement $xml): array|string {
-		$children = $xml->children();
-		if ($children === null || count($children) === 0) {
-			return (string)$xml;
-		}
+    public function xmlToArray(\SimpleXMLElement $xml): array|string {
+        $children = $xml->children();
+        if ($children === null || count($children) === 0) {
+            return (string)$xml;
+        }
 
-		$array = [];
-		foreach ($children as $element => $node) {
-			if ($element === null) {
-				throw new \InvalidArgumentException('xml contains a null element');
-			}
-			$totalElement = count($xml->{$element});
+        $array = [];
+        foreach ($children as $element => $node) {
+            if ($element === null) {
+                throw new \InvalidArgumentException('xml contains a null element');
+            }
+            $totalElement = count($xml->{$element});
 
-			if (!isset($array[$element])) {
-				$array[$element] = $totalElement > 1 ? [] : '';
-			}
-			/** @var \SimpleXMLElement $node */
-			// Has attributes
-			if ($attributes = $node->attributes()) {
-				$data = [
-					'@attributes' => [],
-				];
-				$converted = $this->xmlToArray($node);
-				if (is_string($converted)) {
-					if (!empty($converted)) {
-						$data['@value'] = $converted;
-					}
-				} else {
-					$data = array_merge($data, $converted);
-				}
-				foreach ($attributes as $attr => $value) {
-					if ($attr === null) {
-						throw new \InvalidArgumentException('xml contains a null element');
-					}
-					$data['@attributes'][$attr] = (string)$value;
-				}
+            if (!isset($array[$element])) {
+                $array[$element] = $totalElement > 1 ? [] : '';
+            }
+            /** @var \SimpleXMLElement $node */
+            // Has attributes
+            if ($attributes = $node->attributes()) {
+                $data = [
+                    '@attributes' => [],
+                ];
+                $converted = $this->xmlToArray($node);
+                if (is_string($converted)) {
+                    if (!empty($converted)) {
+                        $data['@value'] = $converted;
+                    }
+                } else {
+                    $data = array_merge($data, $converted);
+                }
+                foreach ($attributes as $attr => $value) {
+                    if ($attr === null) {
+                        throw new \InvalidArgumentException('xml contains a null element');
+                    }
+                    $data['@attributes'][$attr] = (string)$value;
+                }
 
-				if ($totalElement > 1) {
-					$array[$element][] = $data;
-				} else {
-					$array[$element] = $data;
-				}
-				// Just a value
-			} else {
-				if ($totalElement > 1) {
-					$array[$element][] = $this->xmlToArray($node);
-				} else {
-					$array[$element] = $this->xmlToArray($node);
-				}
-			}
-		}
+                if ($totalElement > 1) {
+                    $array[$element][] = $data;
+                } else {
+                    $array[$element] = $data;
+                }
+                // Just a value
+            } else {
+                if ($totalElement > 1) {
+                    $array[$element][] = $this->xmlToArray($node);
+                } else {
+                    $array[$element] = $this->xmlToArray($node);
+                }
+            }
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	/**
-	 * Select the appropriate l10n version for fields name, summary and description
-	 */
-	public function applyL10N(array $data, ?string $lang = null): array {
-		if ($lang !== '' && $lang !== null) {
-			if (isset($data['name']) && is_array($data['name'])) {
-				$data['name'] = $this->findBestL10NOption($data['name'], $lang);
-			}
-			if (isset($data['summary']) && is_array($data['summary'])) {
-				$data['summary'] = $this->findBestL10NOption($data['summary'], $lang);
-			}
-			if (isset($data['description']) && is_array($data['description'])) {
-				$data['description'] = trim($this->findBestL10NOption($data['description'], $lang));
-			}
-		} elseif (isset($data['description']) && is_string($data['description'])) {
-			$data['description'] = trim($data['description']);
-		} else {
-			$data['description'] = '';
-		}
+    /**
+     * Select the appropriate l10n version for fields name, summary and description
+     */
+    public function applyL10N(array $data, ?string $lang = null): array {
+        if ($lang !== '' && $lang !== null) {
+            if (isset($data['name']) && is_array($data['name'])) {
+                $data['name'] = $this->findBestL10NOption($data['name'], $lang);
+            }
+            if (isset($data['summary']) && is_array($data['summary'])) {
+                $data['summary'] = $this->findBestL10NOption($data['summary'], $lang);
+            }
+            if (isset($data['description']) && is_array($data['description'])) {
+                $data['description'] = trim($this->findBestL10NOption($data['description'], $lang));
+            }
+        } elseif (isset($data['description']) && is_string($data['description'])) {
+            $data['description'] = trim($data['description']);
+        } else {
+            $data['description'] = '';
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
-	protected function findBestL10NOption(array $options, string $lang): string {
-		// only a single option
-		if (isset($options['@value'])) {
-			return $options['@value'];
-		}
+    protected function findBestL10NOption(array $options, string $lang): string {
+        // only a single option
+        if (isset($options['@value'])) {
+            return $options['@value'];
+        }
 
-		$fallback = $similarLangFallback = $englishFallback = false;
+        $fallback = $similarLangFallback = $englishFallback = false;
 
-		$lang = strtolower($lang);
-		$similarLang = $lang;
-		$pos = strpos($similarLang, '_');
-		if ($pos !== false && $pos > 0) {
-			// For "de_DE" we want to find "de" and the other way around
-			$similarLang = substr($lang, 0, $pos);
-		}
+        $lang = strtolower($lang);
+        $similarLang = $lang;
+        $pos = strpos($similarLang, '_');
+        if ($pos !== false && $pos > 0) {
+            // For "de_DE" we want to find "de" and the other way around
+            $similarLang = substr($lang, 0, $pos);
+        }
 
-		foreach ($options as $option) {
-			if (is_array($option)) {
-				if ($fallback === false) {
-					$fallback = $option['@value'];
-				}
+        foreach ($options as $option) {
+            if (is_array($option)) {
+                if ($fallback === false) {
+                    $fallback = $option['@value'];
+                }
 
-				if (!isset($option['@attributes']['lang'])) {
-					continue;
-				}
+                if (!isset($option['@attributes']['lang'])) {
+                    continue;
+                }
 
-				$attributeLang = strtolower($option['@attributes']['lang']);
-				if ($attributeLang === $lang) {
-					return $option['@value'];
-				}
+                $attributeLang = strtolower($option['@attributes']['lang']);
+                if ($attributeLang === $lang) {
+                    return $option['@value'];
+                }
 
-				if ($attributeLang === $similarLang) {
-					$similarLangFallback = $option['@value'];
-				} elseif (str_starts_with($attributeLang, $similarLang . '_')) {
-					if ($similarLangFallback === false) {
-						$similarLangFallback = $option['@value'];
-					}
-				}
-			} else {
-				$englishFallback = $option;
-			}
-		}
+                if ($attributeLang === $similarLang) {
+                    $similarLangFallback = $option['@value'];
+                } elseif (str_starts_with($attributeLang, $similarLang . '_')) {
+                    if ($similarLangFallback === false) {
+                        $similarLangFallback = $option['@value'];
+                    }
+                }
+            } else {
+                $englishFallback = $option;
+            }
+        }
 
-		if ($similarLangFallback !== false) {
-			return $similarLangFallback;
-		} elseif ($englishFallback !== false) {
-			return $englishFallback;
-		}
-		return (string)$fallback;
-	}
+        if ($similarLangFallback !== false) {
+            return $similarLangFallback;
+        } elseif ($englishFallback !== false) {
+            return $englishFallback;
+        }
+        return (string)$fallback;
+    }
 }

lib/private/Settings/Manager.php

Indentation +325 added lines, -325 removed lines

@@ -24,329 +24,329 @@
 use Psr\Log\LoggerInterface;
 
 class Manager implements IManager {
-	private ?IL10N $l = null;
-
-	/** @var array<self::SETTINGS_*, list<class-string<IIconSection>>> */
-	protected array $sectionClasses = [];
-
-	/** @var array<self::SETTINGS_*, array<string, IIconSection>> */
-	protected array $sections = [];
-
-	/** @var array<class-string<ISettings>, self::SETTINGS_*> */
-	protected array $settingClasses = [];
-
-	/** @var array<self::SETTINGS_*, array<string, list<ISettings>>> */
-	protected array $settings = [];
-
-	public function __construct(
-		private LoggerInterface $log,
-		private IFactory $l10nFactory,
-		private IURLGenerator $url,
-		private IServerContainer $container,
-		private AuthorizedGroupMapper $mapper,
-		private IGroupManager $groupManager,
-		private ISubAdmin $subAdmin,
-	) {
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function registerSection(string $type, string $section) {
-		if (!isset($this->sectionClasses[$type])) {
-			$this->sectionClasses[$type] = [];
-		}
-
-		$this->sectionClasses[$type][] = $section;
-	}
-
-	/**
-	 * @psalm-param self::SETTINGS_* $type
-	 *
-	 * @return IIconSection[]
-	 */
-	protected function getSections(string $type): array {
-		if (!isset($this->sections[$type])) {
-			$this->sections[$type] = [];
-		}
-
-		if (!isset($this->sectionClasses[$type])) {
-			return $this->sections[$type];
-		}
-
-		foreach (array_unique($this->sectionClasses[$type]) as $index => $class) {
-			try {
-				/** @var IIconSection $section */
-				$section = $this->container->get($class);
-			} catch (QueryException $e) {
-				$this->log->info($e->getMessage(), ['exception' => $e]);
-				continue;
-			}
-
-			$sectionID = $section->getID();
-
-			if (!$this->isKnownDuplicateSectionId($sectionID) && isset($this->sections[$type][$sectionID])) {
-				$e = new \InvalidArgumentException('Section with the same ID already registered: ' . $sectionID . ', class: ' . $class);
-				$this->log->info($e->getMessage(), ['exception' => $e]);
-				continue;
-			}
-
-			$this->sections[$type][$sectionID] = $section;
-
-			unset($this->sectionClasses[$type][$index]);
-		}
-
-		return $this->sections[$type];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSection(string $type, string $sectionId): ?IIconSection {
-		if (isset($this->sections[$type]) && isset($this->sections[$type][$sectionId])) {
-			return $this->sections[$type][$sectionId];
-		}
-		return null;
-	}
-
-	protected function isKnownDuplicateSectionId(string $sectionID): bool {
-		return in_array($sectionID, [
-			'connected-accounts',
-			'notifications',
-		], true);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function registerSetting(string $type, string $setting) {
-		$this->settingClasses[$setting] = $type;
-	}
-
-	/**
-	 * @psalm-param self::SETTINGS_* $type The type of the setting.
-	 * @param string $section
-	 * @param ?Closure $filter optional filter to apply on all loaded ISettings
-	 *
-	 * @return ISettings[]
-	 */
-	protected function getSettings(string $type, string $section, ?Closure $filter = null): array {
-		if (!isset($this->settings[$type])) {
-			$this->settings[$type] = [];
-		}
-		if (!isset($this->settings[$type][$section])) {
-			$this->settings[$type][$section] = [];
-
-			foreach ($this->settingClasses as $class => $settingsType) {
-				if ($type !== $settingsType) {
-					continue;
-				}
-
-				try {
-					/** @var ISettings $setting */
-					$setting = $this->container->get($class);
-				} catch (QueryException $e) {
-					$this->log->info($e->getMessage(), ['exception' => $e]);
-					continue;
-				}
-
-				if (!$setting instanceof ISettings) {
-					$e = new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')');
-					$this->log->info($e->getMessage(), ['exception' => $e]);
-					continue;
-				}
-				$settingSection = $setting->getSection();
-				if ($settingSection === null) {
-					continue;
-				}
-
-				if (!isset($this->settings[$settingsType][$settingSection])) {
-					$this->settings[$settingsType][$settingSection] = [];
-				}
-				$this->settings[$settingsType][$settingSection][] = $setting;
-
-				unset($this->settingClasses[$class]);
-			}
-		}
-
-		if ($filter !== null) {
-			return array_values(array_filter($this->settings[$type][$section], $filter));
-		}
-
-		return $this->settings[$type][$section];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSections(): array {
-		// built-in sections
-		$sections = [];
-
-		$appSections = $this->getSections('admin');
-
-		foreach ($appSections as $section) {
-			/** @var IIconSection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSettings(string $section, bool $subAdminOnly = false): array {
-		if ($subAdminOnly) {
-			$subAdminSettingsFilter = function (ISettings $settings) {
-				return $settings instanceof ISubAdminSettings;
-			};
-			$appSettings = $this->getSettings('admin', $section, $subAdminSettingsFilter);
-		} else {
-			$appSettings = $this->getSettings('admin', $section);
-		}
-
-		$settings = [];
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSections(): array {
-		if ($this->l === null) {
-			$this->l = $this->l10nFactory->get('lib');
-		}
-
-		$sections = [];
-
-		if (count($this->getPersonalSettings('additional')) > 1) {
-			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
-		}
-
-		$appSections = $this->getSections('personal');
-
-		foreach ($appSections as $section) {
-			/** @var IIconSection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSettings(string $section): array {
-		$settings = [];
-		$appSettings = $this->getSettings('personal', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAllowedAdminSettings(string $section, IUser $user): array {
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		if ($isAdmin) {
-			$appSettings = $this->getSettings('admin', $section);
-		} else {
-			$authorizedSettingsClasses = $this->mapper->findAllClassesForUser($user);
-			if ($this->subAdmin->isSubAdmin($user)) {
-				$authorizedGroupFilter = function (ISettings $settings) use ($authorizedSettingsClasses) {
-					return $settings instanceof ISubAdminSettings
-						|| in_array(get_class($settings), $authorizedSettingsClasses) === true;
-				};
-			} else {
-				$authorizedGroupFilter = function (ISettings $settings) use ($authorizedSettingsClasses) {
-					return in_array(get_class($settings), $authorizedSettingsClasses) === true;
-				};
-			}
-			$appSettings = $this->getSettings('admin', $section, $authorizedGroupFilter);
-		}
-
-		$settings = [];
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAllAllowedAdminSettings(IUser $user): array {
-		$this->getSettings('admin', ''); // Make sure all the settings are loaded
-		$settings = [];
-		$authorizedSettingsClasses = $this->mapper->findAllClassesForUser($user);
-		foreach ($this->settings['admin'] as $section) {
-			foreach ($section as $setting) {
-				if (in_array(get_class($setting), $authorizedSettingsClasses) === true) {
-					$settings[] = $setting;
-				}
-			}
-		}
-		return $settings;
-	}
-
-	/**
-	 * @return array<string, array{section:IIconSection,settings:list<IDelegatedSettings>}>
-	 */
-	public function getAdminDelegatedSettings(): array {
-		$sections = $this->getAdminSections();
-		$settings = [];
-		foreach ($sections as $sectionPriority) {
-			foreach ($sectionPriority as $section) {
-				/** @var IDelegatedSettings[] */
-				$sectionSettings = array_merge(
-					$this->getSettings(self::SETTINGS_ADMIN, $section->getID(), fn (ISettings $settings): bool => $settings instanceof IDelegatedSettings),
-					$this->getSettings(self::SETTINGS_DELEGATION, $section->getID(), fn (ISettings $settings): bool => $settings instanceof IDelegatedSettings),
-				);
-				usort(
-					$sectionSettings,
-					fn (ISettings $s1, ISettings $s2) => $s1->getPriority() <=> $s2->getPriority()
-				);
-				$settings[$section->getID()] = [
-					'section' => $section,
-					'settings' => $sectionSettings,
-				];
-			}
-		}
-		uasort($settings, fn (array $a, array $b) => $a['section']->getPriority() <=> $b['section']->getPriority());
-		return $settings;
-	}
+    private ?IL10N $l = null;
+
+    /** @var array<self::SETTINGS_*, list<class-string<IIconSection>>> */
+    protected array $sectionClasses = [];
+
+    /** @var array<self::SETTINGS_*, array<string, IIconSection>> */
+    protected array $sections = [];
+
+    /** @var array<class-string<ISettings>, self::SETTINGS_*> */
+    protected array $settingClasses = [];
+
+    /** @var array<self::SETTINGS_*, array<string, list<ISettings>>> */
+    protected array $settings = [];
+
+    public function __construct(
+        private LoggerInterface $log,
+        private IFactory $l10nFactory,
+        private IURLGenerator $url,
+        private IServerContainer $container,
+        private AuthorizedGroupMapper $mapper,
+        private IGroupManager $groupManager,
+        private ISubAdmin $subAdmin,
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function registerSection(string $type, string $section) {
+        if (!isset($this->sectionClasses[$type])) {
+            $this->sectionClasses[$type] = [];
+        }
+
+        $this->sectionClasses[$type][] = $section;
+    }
+
+    /**
+     * @psalm-param self::SETTINGS_* $type
+     *
+     * @return IIconSection[]
+     */
+    protected function getSections(string $type): array {
+        if (!isset($this->sections[$type])) {
+            $this->sections[$type] = [];
+        }
+
+        if (!isset($this->sectionClasses[$type])) {
+            return $this->sections[$type];
+        }
+
+        foreach (array_unique($this->sectionClasses[$type]) as $index => $class) {
+            try {
+                /** @var IIconSection $section */
+                $section = $this->container->get($class);
+            } catch (QueryException $e) {
+                $this->log->info($e->getMessage(), ['exception' => $e]);
+                continue;
+            }
+
+            $sectionID = $section->getID();
+
+            if (!$this->isKnownDuplicateSectionId($sectionID) && isset($this->sections[$type][$sectionID])) {
+                $e = new \InvalidArgumentException('Section with the same ID already registered: ' . $sectionID . ', class: ' . $class);
+                $this->log->info($e->getMessage(), ['exception' => $e]);
+                continue;
+            }
+
+            $this->sections[$type][$sectionID] = $section;
+
+            unset($this->sectionClasses[$type][$index]);
+        }
+
+        return $this->sections[$type];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSection(string $type, string $sectionId): ?IIconSection {
+        if (isset($this->sections[$type]) && isset($this->sections[$type][$sectionId])) {
+            return $this->sections[$type][$sectionId];
+        }
+        return null;
+    }
+
+    protected function isKnownDuplicateSectionId(string $sectionID): bool {
+        return in_array($sectionID, [
+            'connected-accounts',
+            'notifications',
+        ], true);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function registerSetting(string $type, string $setting) {
+        $this->settingClasses[$setting] = $type;
+    }
+
+    /**
+     * @psalm-param self::SETTINGS_* $type The type of the setting.
+     * @param string $section
+     * @param ?Closure $filter optional filter to apply on all loaded ISettings
+     *
+     * @return ISettings[]
+     */
+    protected function getSettings(string $type, string $section, ?Closure $filter = null): array {
+        if (!isset($this->settings[$type])) {
+            $this->settings[$type] = [];
+        }
+        if (!isset($this->settings[$type][$section])) {
+            $this->settings[$type][$section] = [];
+
+            foreach ($this->settingClasses as $class => $settingsType) {
+                if ($type !== $settingsType) {
+                    continue;
+                }
+
+                try {
+                    /** @var ISettings $setting */
+                    $setting = $this->container->get($class);
+                } catch (QueryException $e) {
+                    $this->log->info($e->getMessage(), ['exception' => $e]);
+                    continue;
+                }
+
+                if (!$setting instanceof ISettings) {
+                    $e = new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')');
+                    $this->log->info($e->getMessage(), ['exception' => $e]);
+                    continue;
+                }
+                $settingSection = $setting->getSection();
+                if ($settingSection === null) {
+                    continue;
+                }
+
+                if (!isset($this->settings[$settingsType][$settingSection])) {
+                    $this->settings[$settingsType][$settingSection] = [];
+                }
+                $this->settings[$settingsType][$settingSection][] = $setting;
+
+                unset($this->settingClasses[$class]);
+            }
+        }
+
+        if ($filter !== null) {
+            return array_values(array_filter($this->settings[$type][$section], $filter));
+        }
+
+        return $this->settings[$type][$section];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSections(): array {
+        // built-in sections
+        $sections = [];
+
+        $appSections = $this->getSections('admin');
+
+        foreach ($appSections as $section) {
+            /** @var IIconSection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSettings(string $section, bool $subAdminOnly = false): array {
+        if ($subAdminOnly) {
+            $subAdminSettingsFilter = function (ISettings $settings) {
+                return $settings instanceof ISubAdminSettings;
+            };
+            $appSettings = $this->getSettings('admin', $section, $subAdminSettingsFilter);
+        } else {
+            $appSettings = $this->getSettings('admin', $section);
+        }
+
+        $settings = [];
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSections(): array {
+        if ($this->l === null) {
+            $this->l = $this->l10nFactory->get('lib');
+        }
+
+        $sections = [];
+
+        if (count($this->getPersonalSettings('additional')) > 1) {
+            $sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
+        }
+
+        $appSections = $this->getSections('personal');
+
+        foreach ($appSections as $section) {
+            /** @var IIconSection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSettings(string $section): array {
+        $settings = [];
+        $appSettings = $this->getSettings('personal', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAllowedAdminSettings(string $section, IUser $user): array {
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        if ($isAdmin) {
+            $appSettings = $this->getSettings('admin', $section);
+        } else {
+            $authorizedSettingsClasses = $this->mapper->findAllClassesForUser($user);
+            if ($this->subAdmin->isSubAdmin($user)) {
+                $authorizedGroupFilter = function (ISettings $settings) use ($authorizedSettingsClasses) {
+                    return $settings instanceof ISubAdminSettings
+                        || in_array(get_class($settings), $authorizedSettingsClasses) === true;
+                };
+            } else {
+                $authorizedGroupFilter = function (ISettings $settings) use ($authorizedSettingsClasses) {
+                    return in_array(get_class($settings), $authorizedSettingsClasses) === true;
+                };
+            }
+            $appSettings = $this->getSettings('admin', $section, $authorizedGroupFilter);
+        }
+
+        $settings = [];
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAllAllowedAdminSettings(IUser $user): array {
+        $this->getSettings('admin', ''); // Make sure all the settings are loaded
+        $settings = [];
+        $authorizedSettingsClasses = $this->mapper->findAllClassesForUser($user);
+        foreach ($this->settings['admin'] as $section) {
+            foreach ($section as $setting) {
+                if (in_array(get_class($setting), $authorizedSettingsClasses) === true) {
+                    $settings[] = $setting;
+                }
+            }
+        }
+        return $settings;
+    }
+
+    /**
+     * @return array<string, array{section:IIconSection,settings:list<IDelegatedSettings>}>
+     */
+    public function getAdminDelegatedSettings(): array {
+        $sections = $this->getAdminSections();
+        $settings = [];
+        foreach ($sections as $sectionPriority) {
+            foreach ($sectionPriority as $section) {
+                /** @var IDelegatedSettings[] */
+                $sectionSettings = array_merge(
+                    $this->getSettings(self::SETTINGS_ADMIN, $section->getID(), fn (ISettings $settings): bool => $settings instanceof IDelegatedSettings),
+                    $this->getSettings(self::SETTINGS_DELEGATION, $section->getID(), fn (ISettings $settings): bool => $settings instanceof IDelegatedSettings),
+                );
+                usort(
+                    $sectionSettings,
+                    fn (ISettings $s1, ISettings $s2) => $s1->getPriority() <=> $s2->getPriority()
+                );
+                $settings[$section->getID()] = [
+                    'section' => $section,
+                    'settings' => $sectionSettings,
+                ];
+            }
+        }
+        uasort($settings, fn (array $a, array $b) => $a['section']->getPriority() <=> $b['section']->getPriority());
+        return $settings;
+    }
 }

lib/public/Settings/IManager.php

Indentation +118 added lines, -118 removed lines

@@ -13,122 +13,122 @@
  * @since 9.1
  */
 interface IManager {
-	/**
-	 * @since 9.1.0
-	 * @deprecated 29.0.0 Use {@see self::SETTINGS_ADMIN} instead
-	 */
-	public const KEY_ADMIN_SETTINGS = 'admin';
-
-	/**
-	 * @since 9.1.0
-	 * @deprecated 29.0.0 Use {@see self::SETTINGS_ADMIN} instead
-	 */
-	public const KEY_ADMIN_SECTION = 'admin-section';
-
-	/**
-	 * @since 13.0.0
-	 * @deprecated 29.0.0 Use {@see self::SETTINGS_PERSONAL} instead
-	 */
-	public const KEY_PERSONAL_SETTINGS = 'personal';
-
-	/**
-	 * @since 13.0.0
-	 * @deprecated 29.0.0 Use {@see self::SETTINGS_PERSONAL} instead
-	 */
-	public const KEY_PERSONAL_SECTION = 'personal-section';
-
-	/**
-	 * @since 29.0.0
-	 */
-	public const SETTINGS_ADMIN = 'admin';
-
-	/**
-	 * @since 29.0.0
-	 */
-	public const SETTINGS_PERSONAL = 'personal';
-
-	/**
-	 * @since 33.0.0
-	 * For settings only used for delegation but not appearing in settings menu
-	 */
-	public const SETTINGS_DELEGATION = 'delegation';
-
-	/**
-	 * @psalm-param self::SETTINGS_* $type
-	 * @param class-string<IIconSection> $section
-	 * @since 14.0.0
-	 */
-	public function registerSection(string $type, string $section);
-
-	/**
-	 * @psalm-param self::SETTINGS_* $type
-	 * @param class-string<ISettings> $setting
-	 * @since 14.0.0
-	 */
-	public function registerSetting(string $type, string $setting);
-
-	/**
-	 * returns a list of the admin sections
-	 *
-	 * @return array<int, list<IIconSection>> list of sections with priority as key
-	 * @since 9.1.0
-	 */
-	public function getAdminSections(): array;
-
-	/**
-	 * returns a list of the personal sections
-	 *
-	 * @return array<int, list<IIconSection>> list of sections with priority as key
-	 * @since 13.0.0
-	 */
-	public function getPersonalSections(): array;
-
-	/**
-	 * returns a list of the admin settings
-	 *
-	 * @param string $section the section id for which to load the settings
-	 * @param bool $subAdminOnly only return settings sub admins are supposed to see (since 17.0.0)
-	 * @return array<int, list<ISettings>> list of settings with priority as key
-	 * @since 9.1.0
-	 */
-	public function getAdminSettings(string $section, bool $subAdminOnly = false): array;
-
-	/**
-	 * Returns a list of admin settings that the given user can use for the give section
-	 *
-	 * @return array<int, list<ISettings>> List of admin-settings the user has access to, with priority as key.
-	 * @since 23.0.0
-	 */
-	public function getAllowedAdminSettings(string $section, IUser $user): array;
-
-	/**
-	 * Returns a list of admin settings that the given user can use.
-	 *
-	 * @return list<ISettings> The array of admin settings there admin delegation is allowed.
-	 * @since 23.0.0
-	 */
-	public function getAllAllowedAdminSettings(IUser $user): array;
-
-	/**
-	 * returns a list of the personal  settings
-	 *
-	 * @param string $section the section id for which to load the settings
-	 * @return array<int, list<ISettings>> list of settings with priority as key
-	 * @since 13.0.0
-	 */
-	public function getPersonalSettings(string $section): array;
-
-	/**
-	 * Get a specific section by type and id
-	 * @psalm-param self::SETTINGS_* $type
-	 * @since 25.0.0
-	 */
-	public function getSection(string $type, string $sectionId): ?IIconSection;
-
-	/**
-	 * Return admin delegated settings, sorted by priority and grouped by section
-	 * @return array<string, array{section:IIconSection,settings:list<IDelegatedSettings>}>
-	 * @since 33.0.0
-	 */
-	public function getAdminDelegatedSettings(): array;
+    /**
+     * @since 9.1.0
+     * @deprecated 29.0.0 Use {@see self::SETTINGS_ADMIN} instead
+     */
+    public const KEY_ADMIN_SETTINGS = 'admin';
+
+    /**
+     * @since 9.1.0
+     * @deprecated 29.0.0 Use {@see self::SETTINGS_ADMIN} instead
+     */
+    public const KEY_ADMIN_SECTION = 'admin-section';
+
+    /**
+     * @since 13.0.0
+     * @deprecated 29.0.0 Use {@see self::SETTINGS_PERSONAL} instead
+     */
+    public const KEY_PERSONAL_SETTINGS = 'personal';
+
+    /**
+     * @since 13.0.0
+     * @deprecated 29.0.0 Use {@see self::SETTINGS_PERSONAL} instead
+     */
+    public const KEY_PERSONAL_SECTION = 'personal-section';
+
+    /**
+     * @since 29.0.0
+     */
+    public const SETTINGS_ADMIN = 'admin';
+
+    /**
+     * @since 29.0.0
+     */
+    public const SETTINGS_PERSONAL = 'personal';
+
+    /**
+     * @since 33.0.0
+     * For settings only used for delegation but not appearing in settings menu
+     */
+    public const SETTINGS_DELEGATION = 'delegation';
+
+    /**
+     * @psalm-param self::SETTINGS_* $type
+     * @param class-string<IIconSection> $section
+     * @since 14.0.0
+     */
+    public function registerSection(string $type, string $section);
+
+    /**
+     * @psalm-param self::SETTINGS_* $type
+     * @param class-string<ISettings> $setting
+     * @since 14.0.0
+     */
+    public function registerSetting(string $type, string $setting);
+
+    /**
+     * returns a list of the admin sections
+     *
+     * @return array<int, list<IIconSection>> list of sections with priority as key
+     * @since 9.1.0
+     */
+    public function getAdminSections(): array;
+
+    /**
+     * returns a list of the personal sections
+     *
+     * @return array<int, list<IIconSection>> list of sections with priority as key
+     * @since 13.0.0
+     */
+    public function getPersonalSections(): array;
+
+    /**
+     * returns a list of the admin settings
+     *
+     * @param string $section the section id for which to load the settings
+     * @param bool $subAdminOnly only return settings sub admins are supposed to see (since 17.0.0)
+     * @return array<int, list<ISettings>> list of settings with priority as key
+     * @since 9.1.0
+     */
+    public function getAdminSettings(string $section, bool $subAdminOnly = false): array;
+
+    /**
+     * Returns a list of admin settings that the given user can use for the give section
+     *
+     * @return array<int, list<ISettings>> List of admin-settings the user has access to, with priority as key.
+     * @since 23.0.0
+     */
+    public function getAllowedAdminSettings(string $section, IUser $user): array;
+
+    /**
+     * Returns a list of admin settings that the given user can use.
+     *
+     * @return list<ISettings> The array of admin settings there admin delegation is allowed.
+     * @since 23.0.0
+     */
+    public function getAllAllowedAdminSettings(IUser $user): array;
+
+    /**
+     * returns a list of the personal  settings
+     *
+     * @param string $section the section id for which to load the settings
+     * @return array<int, list<ISettings>> list of settings with priority as key
+     * @since 13.0.0
+     */
+    public function getPersonalSettings(string $section): array;
+
+    /**
+     * Get a specific section by type and id
+     * @psalm-param self::SETTINGS_* $type
+     * @since 25.0.0
+     */
+    public function getSection(string $type, string $sectionId): ?IIconSection;
+
+    /**
+     * Return admin delegated settings, sorted by priority and grouped by section
+     * @return array<string, array{section:IIconSection,settings:list<IDelegatedSettings>}>
+     * @since 33.0.0
+     */
+    public function getAdminDelegatedSettings(): array;
 }