nextcloud / server

apps/theming/lib/Settings/Personal.php

Indentation +56 added lines, -56 removed lines

@@ -36,68 +36,68 @@
 
 class Personal implements ISettings {
 
-	protected string $appName;
-	private IConfig $config;
-	private IUserSession $userSession;
-	private ThemesService $themesService;
-	private IInitialState $initialStateService;
+    protected string $appName;
+    private IConfig $config;
+    private IUserSession $userSession;
+    private ThemesService $themesService;
+    private IInitialState $initialStateService;
 
-	public function __construct(string $appName,
-								IConfig $config,
-								IUserSession $userSession,
-								ThemesService $themesService,
-								IInitialState $initialStateService) {
-		$this->appName = $appName;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->themesService = $themesService;
-		$this->initialStateService = $initialStateService;
-	}
+    public function __construct(string $appName,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                ThemesService $themesService,
+                                IInitialState $initialStateService) {
+        $this->appName = $appName;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->themesService = $themesService;
+        $this->initialStateService = $initialStateService;
+    }
 
-	public function getForm(): TemplateResponse {
-		$enforcedTheme = $this->config->getSystemValueString('enforce_theme', '');
+    public function getForm(): TemplateResponse {
+        $enforcedTheme = $this->config->getSystemValueString('enforce_theme', '');
 
-		$themes = array_map(function($theme) {
-			return [
-				'id' => $theme->getId(),
-				'type' => $theme->getType(),
-				'title' => $theme->getTitle(),
-				'enableLabel' => $theme->getEnableLabel(),
-				'description' => $theme->getDescription(),
-				'enabled' => $this->themesService->isEnabled($theme),
-			];
-		}, $this->themesService->getThemes());
+        $themes = array_map(function($theme) {
+            return [
+                'id' => $theme->getId(),
+                'type' => $theme->getType(),
+                'title' => $theme->getTitle(),
+                'enableLabel' => $theme->getEnableLabel(),
+                'description' => $theme->getDescription(),
+                'enabled' => $this->themesService->isEnabled($theme),
+            ];
+        }, $this->themesService->getThemes());
 
-		if ($enforcedTheme !== '') {
-			$themes = array_filter($themes, function($theme) use ($enforcedTheme) {
-				return $theme['type'] !== ITheme::TYPE_THEME || $theme['id'] === $enforcedTheme;
-			});
-		}
+        if ($enforcedTheme !== '') {
+            $themes = array_filter($themes, function($theme) use ($enforcedTheme) {
+                return $theme['type'] !== ITheme::TYPE_THEME || $theme['id'] === $enforcedTheme;
+            });
+        }
 
-		$this->initialStateService->provideInitialState('themes', array_values($themes));
-		$this->initialStateService->provideInitialState('enforceTheme', $enforcedTheme);
-		Util::addScript($this->appName, 'theming-settings');
+        $this->initialStateService->provideInitialState('themes', array_values($themes));
+        $this->initialStateService->provideInitialState('enforceTheme', $enforcedTheme);
+        Util::addScript($this->appName, 'theming-settings');
 
-		return new TemplateResponse($this->appName, 'settings-personal');
-	}
+        return new TemplateResponse($this->appName, 'settings-personal');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection(): string {
-		return $this->appName;
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection(): string {
+        return $this->appName;
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority(): int {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority(): int {
+        return 40;
+    }
 }

apps/theming/lib/Controller/UserThemeController.php

Indentation +72 added lines, -72 removed lines

@@ -43,85 +43,85 @@
 
 class UserThemeController extends OCSController {
 
-	protected string $userId;
-	private IConfig $config;
-	private IUserSession $userSession;
-	private ThemesService $themesService;
+    protected string $userId;
+    private IConfig $config;
+    private IUserSession $userSession;
+    private ThemesService $themesService;
 
-	/**
-	 * Config constructor.
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserSession $userSession,
-								ThemesService $themesService) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->themesService = $themesService;
-		$this->userId = $userSession->getUser()->getUID();
-	}
+    /**
+     * Config constructor.
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                ThemesService $themesService) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->themesService = $themesService;
+        $this->userId = $userSession->getUser()->getUID();
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Enable theme
-	 *
-	 * @param string $themeId the theme ID
-	 * @return DataResponse
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	public function enableTheme(string $themeId): DataResponse {
-		$theme = $this->validateTheme($themeId);
+    /**
+     * @NoAdminRequired
+     *
+     * Enable theme
+     *
+     * @param string $themeId the theme ID
+     * @return DataResponse
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    public function enableTheme(string $themeId): DataResponse {
+        $theme = $this->validateTheme($themeId);
 
-		// Enable selected theme
-		$this->themesService->enableTheme($theme);
-		return new DataResponse();
-	}
+        // Enable selected theme
+        $this->themesService->enableTheme($theme);
+        return new DataResponse();
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Disable theme
-	 *
-	 * @param string $themeId the theme ID
-	 * @return DataResponse
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	public function disableTheme(string $themeId): DataResponse {
-		$theme = $this->validateTheme($themeId);
+    /**
+     * @NoAdminRequired
+     *
+     * Disable theme
+     *
+     * @param string $themeId the theme ID
+     * @return DataResponse
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    public function disableTheme(string $themeId): DataResponse {
+        $theme = $this->validateTheme($themeId);
 		
-		// Enable selected theme
-		$this->themesService->disableTheme($theme);
-		return new DataResponse();
-	}
+        // Enable selected theme
+        $this->themesService->disableTheme($theme);
+        return new DataResponse();
+    }
 
-	/**
-	 * Validate and return the matching ITheme
-	 *
-	 * Disable theme
-	 *
-	 * @param string $themeId the theme ID
-	 * @return ITheme
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	private function validateTheme(string $themeId): ITheme {
-		if ($themeId === '' || !$themeId) {
-			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
-		}
+    /**
+     * Validate and return the matching ITheme
+     *
+     * Disable theme
+     *
+     * @param string $themeId the theme ID
+     * @return ITheme
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    private function validateTheme(string $themeId): ITheme {
+        if ($themeId === '' || !$themeId) {
+            throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+        }
 
-		$themes = $this->themesService->getThemes();
-		if (!isset($themes[$themeId])) {
-			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
-		}
+        $themes = $this->themesService->getThemes();
+        if (!isset($themes[$themeId])) {
+            throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+        }
 
-		// If trying to toggle another theme but this is enforced
-		if ($this->config->getSystemValueString('enforce_theme', '') !== ''
-			&& $themes[$themeId]->getType() === ITheme::TYPE_THEME) {
-			throw new OCSForbiddenException('Theme switching is disabled');
-		}
+        // If trying to toggle another theme but this is enforced
+        if ($this->config->getSystemValueString('enforce_theme', '') !== ''
+            && $themes[$themeId]->getType() === ITheme::TYPE_THEME) {
+            throw new OCSForbiddenException('Theme switching is disabled');
+        }
 
-		return $themes[$themeId];
-	}
+        return $themes[$themeId];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -108,12 +108,12 @@
 	 */
 	private function validateTheme(string $themeId): ITheme {
 		if ($themeId === '' || !$themeId) {
-			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+			throw new OCSBadRequestException('Invalid theme id: '.$themeId);
 		}
 
 		$themes = $this->themesService->getThemes();
 		if (!isset($themes[$themeId])) {
-			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+			throw new OCSBadRequestException('Invalid theme id: '.$themeId);
 		}
 
 		// If trying to toggle another theme but this is enforced

apps/theming/lib/Service/ThemesService.php

Indentation +142 added lines, -142 removed lines

@@ -35,147 +35,147 @@
 use OCP\IUserSession;
 
 class ThemesService {
-	private IUserSession $userSession;
-	private IConfig $config;
-
-	/** @var ITheme[] */
-	private array $themesProviders;
-
-	public function __construct(IUserSession $userSession,
-								IConfig $config,
-								DefaultTheme $defaultTheme,
-								LightTheme $lightTheme,
-								DarkTheme $darkTheme,
-								HighContrastTheme $highContrastTheme,
-								DarkHighContrastTheme $darkHighContrastTheme,
-								DyslexiaFont $dyslexiaFont) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-
-		// Register themes
-		$this->themesProviders = [
-			$defaultTheme->getId()			=> $defaultTheme,
-			$lightTheme->getId()			=> $lightTheme,
-			$darkTheme->getId()				=> $darkTheme,
-			$highContrastTheme->getId()		=> $highContrastTheme,
-			$darkHighContrastTheme->getId()	=> $darkHighContrastTheme,
-			$dyslexiaFont->getId()			=> $dyslexiaFont,
-		];
-	}
-
-	/**
-	 * Get the list of all registered themes
-	 * 
-	 * @return ITheme[]
-	 */
-	public function getThemes(): array {
-		return $this->themesProviders;
-	}
-
-	/**
-	 * Enable a theme for the logged-in user
-	 * 
-	 * @param ITheme $theme the theme to enable
-	 * @return string[] the enabled themes
-	 */
-	public function enableTheme(ITheme $theme): array {
-		$themesIds = $this->getEnabledThemes();
-
-		// If already enabled, ignore
-		if (in_array($theme->getId(), $themesIds)) {
-			return $themesIds;
-		}
-
-		/** @var ITheme[] */
-		$themes = array_map(function($themeId) {
-			return $this->getThemes()[$themeId];
-		}, $themesIds);
-
-		// Filtering all themes with the same type
-		$filteredThemes = array_filter($themes, function(ITheme $t) use ($theme) {
-			return $theme->getType() === $t->getType();
-		});
-
-		// Retrieve IDs only
-		/** @var string[] */
-		$filteredThemesIds = array_map(function(ITheme $t) {
-			return $t->getId();
-		}, array_values($filteredThemes));
-
-		$enabledThemes = array_merge(array_diff($themesIds, $filteredThemesIds), [$theme->getId()]);
-		$this->setEnabledThemes($enabledThemes);
-
-		return $enabledThemes;
-	}
-
-	/**
-	 * Disable a theme for the logged-in user
-	 * 
-	 * @param ITheme $theme the theme to disable
-	 * @return string[] the enabled themes
-	 */
-	public function disableTheme(ITheme $theme): array {
-		$themesIds = $this->getEnabledThemes();
-
-		// If enabled, removing it
-		if (in_array($theme->getId(), $themesIds)) {
-			$enabledThemes = array_diff($themesIds, [$theme->getId()]);
-			$this->setEnabledThemes($enabledThemes);
-			return $enabledThemes;
-		}
+    private IUserSession $userSession;
+    private IConfig $config;
+
+    /** @var ITheme[] */
+    private array $themesProviders;
+
+    public function __construct(IUserSession $userSession,
+                                IConfig $config,
+                                DefaultTheme $defaultTheme,
+                                LightTheme $lightTheme,
+                                DarkTheme $darkTheme,
+                                HighContrastTheme $highContrastTheme,
+                                DarkHighContrastTheme $darkHighContrastTheme,
+                                DyslexiaFont $dyslexiaFont) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+
+        // Register themes
+        $this->themesProviders = [
+            $defaultTheme->getId()			=> $defaultTheme,
+            $lightTheme->getId()			=> $lightTheme,
+            $darkTheme->getId()				=> $darkTheme,
+            $highContrastTheme->getId()		=> $highContrastTheme,
+            $darkHighContrastTheme->getId()	=> $darkHighContrastTheme,
+            $dyslexiaFont->getId()			=> $dyslexiaFont,
+        ];
+    }
+
+    /**
+     * Get the list of all registered themes
+     * 
+     * @return ITheme[]
+     */
+    public function getThemes(): array {
+        return $this->themesProviders;
+    }
+
+    /**
+     * Enable a theme for the logged-in user
+     * 
+     * @param ITheme $theme the theme to enable
+     * @return string[] the enabled themes
+     */
+    public function enableTheme(ITheme $theme): array {
+        $themesIds = $this->getEnabledThemes();
+
+        // If already enabled, ignore
+        if (in_array($theme->getId(), $themesIds)) {
+            return $themesIds;
+        }
+
+        /** @var ITheme[] */
+        $themes = array_map(function($themeId) {
+            return $this->getThemes()[$themeId];
+        }, $themesIds);
+
+        // Filtering all themes with the same type
+        $filteredThemes = array_filter($themes, function(ITheme $t) use ($theme) {
+            return $theme->getType() === $t->getType();
+        });
+
+        // Retrieve IDs only
+        /** @var string[] */
+        $filteredThemesIds = array_map(function(ITheme $t) {
+            return $t->getId();
+        }, array_values($filteredThemes));
+
+        $enabledThemes = array_merge(array_diff($themesIds, $filteredThemesIds), [$theme->getId()]);
+        $this->setEnabledThemes($enabledThemes);
+
+        return $enabledThemes;
+    }
+
+    /**
+     * Disable a theme for the logged-in user
+     * 
+     * @param ITheme $theme the theme to disable
+     * @return string[] the enabled themes
+     */
+    public function disableTheme(ITheme $theme): array {
+        $themesIds = $this->getEnabledThemes();
+
+        // If enabled, removing it
+        if (in_array($theme->getId(), $themesIds)) {
+            $enabledThemes = array_diff($themesIds, [$theme->getId()]);
+            $this->setEnabledThemes($enabledThemes);
+            return $enabledThemes;
+        }
 		
-		return $themesIds;
-	}
-
-	/**
-	 * Check whether a theme is enabled or not
-	 * for the logged-in user
-	 * 
-	 * @return bool
-	 */
-	public function isEnabled(ITheme $theme): bool {
-		$user = $this->userSession->getUser();
-		if ($user instanceof IUser) {
-			// Using keys as it's faster
-			$themes = $this->getEnabledThemes();
-			return in_array($theme->getId(), $themes);
-		}
-		return false;
-	}
-
-	/**
-	 * Get the list of all enabled themes IDs
-	 * for the logged-in user
-	 * 
-	 * @return string[]
-	 */
-	public function getEnabledThemes(): array {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return [];
-		}
-
-		$enforcedTheme = $this->config->getSystemValueString('enforce_theme', '');
-		$enabledThemes = json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
-		if ($enforcedTheme !== '') {
-			return array_merge([$enforcedTheme], $enabledThemes);
-		}
-
-		try {
-			return $enabledThemes;
-		} catch (\Exception $e) {
-			return [];
-		}
-	}
-
-	/**
-	 * Set the list of enabled themes 
-	 * for the logged-in user
-	 * 
-	 * @param string[] $themes the list of enabled themes IDs
-	 */
-	private function setEnabledThemes(array $themes): void {
-		$user = $this->userSession->getUser();
-		$this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_values(array_unique($themes))));
-	}
+        return $themesIds;
+    }
+
+    /**
+     * Check whether a theme is enabled or not
+     * for the logged-in user
+     * 
+     * @return bool
+     */
+    public function isEnabled(ITheme $theme): bool {
+        $user = $this->userSession->getUser();
+        if ($user instanceof IUser) {
+            // Using keys as it's faster
+            $themes = $this->getEnabledThemes();
+            return in_array($theme->getId(), $themes);
+        }
+        return false;
+    }
+
+    /**
+     * Get the list of all enabled themes IDs
+     * for the logged-in user
+     * 
+     * @return string[]
+     */
+    public function getEnabledThemes(): array {
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return [];
+        }
+
+        $enforcedTheme = $this->config->getSystemValueString('enforce_theme', '');
+        $enabledThemes = json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
+        if ($enforcedTheme !== '') {
+            return array_merge([$enforcedTheme], $enabledThemes);
+        }
+
+        try {
+            return $enabledThemes;
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    /**
+     * Set the list of enabled themes 
+     * for the logged-in user
+     * 
+     * @param string[] $themes the list of enabled themes IDs
+     */
+    private function setEnabledThemes(array $themes): void {
+        $user = $this->userSession->getUser();
+        $this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_values(array_unique($themes))));
+    }
 }