nextcloud / server

apps/accessibility/lib/Controller/ConfigController.php

Indentation +116 added lines, -116 removed lines

@@ -34,121 +34,121 @@
 
 class ConfigController extends OCSController {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $userId;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
-
-	/**
-	 * Config constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param AccessibilityProvider $accessibilityProvider
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserSession $userSession,
-								AccessibilityProvider $accessibilityProvider) {
-		parent::__construct($appName, $request);
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId				 = $userSession->getUser()->getUID();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get user accessibility config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 */
-	public function getConfig(): DataResponse {
-		return new DataResponse([
-			'highcontrast' => $this->config->getUserValue($this->userId, $this->appName, 'highcontrast', false),
-			'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Set theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws Exception
-	 */
-	public function setConfig(string $key, $value): DataResponse {
-		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
-			if ($value === false || $value === '') {
-				throw new OCSBadRequestException('Invalid value: ' . $value);
-			}
-
-			$themes = $this->accessibilityProvider->getThemes();
-			$highcontrast = array($this->accessibilityProvider->getHighContrast());
-			$fonts  = $this->accessibilityProvider->getFonts();
-
-			$availableOptions = array_map(function($option) {
-				return $option['id'];
-			}, array_merge($themes, $highcontrast, $fonts));
-
-			if (in_array($value, $availableOptions)) {
-				$this->config->setUserValue($this->userId, $this->appName, $key, $value);
-				return new DataResponse();
-			}
-
-			throw new OCSBadRequestException('Invalid value: ' . $value);
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Unset theme or font config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 * @throws Exception
-	 */
-	public function deleteConfig(string $key): DataResponse {
-		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
-
-			$this->config->deleteUserValue($this->userId, $this->appName, $key);
-			$userValues = $this->config->getUserKeys($this->userId, $this->appName);
-
-			// remove hash if no settings selected
-			if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
-				$this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
-			}
-
-			return new DataResponse();
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
+    /** @var string */
+    protected $appName;
+
+    /** @var string */
+    protected $userId;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var AccessibilityProvider */
+    private $accessibilityProvider;
+
+    /**
+     * Config constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param AccessibilityProvider $accessibilityProvider
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                AccessibilityProvider $accessibilityProvider) {
+        parent::__construct($appName, $request);
+        $this->appName               = $appName;
+        $this->config                = $config;
+        $this->userSession           = $userSession;
+        $this->accessibilityProvider = $accessibilityProvider;
+        $this->userId				 = $userSession->getUser()->getUID();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Get user accessibility config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     */
+    public function getConfig(): DataResponse {
+        return new DataResponse([
+            'highcontrast' => $this->config->getUserValue($this->userId, $this->appName, 'highcontrast', false),
+            'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
+            'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Set theme or font config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     * @throws Exception
+     */
+    public function setConfig(string $key, $value): DataResponse {
+        if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
+
+            if ($value === false || $value === '') {
+                throw new OCSBadRequestException('Invalid value: ' . $value);
+            }
+
+            $themes = $this->accessibilityProvider->getThemes();
+            $highcontrast = array($this->accessibilityProvider->getHighContrast());
+            $fonts  = $this->accessibilityProvider->getFonts();
+
+            $availableOptions = array_map(function($option) {
+                return $option['id'];
+            }, array_merge($themes, $highcontrast, $fonts));
+
+            if (in_array($value, $availableOptions)) {
+                $this->config->setUserValue($this->userId, $this->appName, $key, $value);
+                return new DataResponse();
+            }
+
+            throw new OCSBadRequestException('Invalid value: ' . $value);
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Unset theme or font config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     * @throws Exception
+     */
+    public function deleteConfig(string $key): DataResponse {
+        if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
+
+            $this->config->deleteUserValue($this->userId, $this->appName, $key);
+            $userValues = $this->config->getUserKeys($this->userId, $this->appName);
+
+            // remove hash if no settings selected
+            if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
+                $this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
+            }
+
+            return new DataResponse();
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @copyright Copyright (c) 2019 Janis Köhr <janiskoehr@icloud.com>
@@ -71,7 +71,7 @@ 
 		$this->config                = $config;
 		$this->userSession           = $userSession;
 		$this->accessibilityProvider = $accessibilityProvider;
-		$this->userId				 = $userSession->getUser()->getUID();
+		$this->userId = $userSession->getUser()->getUID();
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 		if ($key === 'theme' || $key === 'font' || $key === 'highcontrast') {
 
 			if ($value === false || $value === '') {
-				throw new OCSBadRequestException('Invalid value: ' . $value);
+				throw new OCSBadRequestException('Invalid value: '.$value);
 			}
 
 			$themes = $this->accessibilityProvider->getThemes();
@@ -119,10 +119,10 @@ 
 				return new DataResponse();
 			}
 
-			throw new OCSBadRequestException('Invalid value: ' . $value);
+			throw new OCSBadRequestException('Invalid value: '.$value);
 		}
 
-		throw new OCSBadRequestException('Invalid key: ' . $key);
+		throw new OCSBadRequestException('Invalid key: '.$key);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 			return new DataResponse();
 		}
 
-		throw new OCSBadRequestException('Invalid key: ' . $key);
+		throw new OCSBadRequestException('Invalid key: '.$key);
 	}
 
 }

apps/accessibility/lib/Settings/Personal.php

Indentation +92 added lines, -92 removed lines

@@ -36,96 +36,96 @@
 
 class Personal implements ISettings {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-
-	/**
-	 * Settings constructor.
-	 *
-	 * @param string $appName
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 * @param AccessibilityProvider $accessibilityProvider
-	 */
-	public function __construct(string $appName,
-								IConfig $config,
-								IUserSession $userSession,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								AccessibilityProvider $accessibilityProvider,
-								IInitialStateService $initialStateService) {
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->l                     = $l;
-		$this->urlGenerator          = $urlGenerator;
-		$this->accessibilityProvider = $accessibilityProvider;
-		$this->initialStateService   = $initialStateService;
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		Util::addScript('accessibility', 'accessibility');
-		Util::addStyle('accessibility', 'style');
-
-		$availableConfig = [
-			'themes' => $this->accessibilityProvider->getThemes(),
-			'fonts'  => $this->accessibilityProvider->getFonts(),
-			'highcontrast' => $this->accessibilityProvider->getHighContrast()
-		];
-
-		$userConfig = [
-			'highcontrast' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false),
-			'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
-		];
-
-		$this->initialStateService->provideInitialState($this->appName, 'available-config', $availableConfig);
-		$this->initialStateService->provideInitialState($this->appName, 'user-config', $userConfig);
-
-		return new TemplateResponse($this->appName, 'settings-personal');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		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() {
-		return 40;
-	}
+    /** @var string */
+    protected $appName;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var AccessibilityProvider */
+    private $accessibilityProvider;
+
+    /** @var IInitialStateService */
+    private $initialStateService;
+
+    /**
+     * Settings constructor.
+     *
+     * @param string $appName
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     * @param AccessibilityProvider $accessibilityProvider
+     */
+    public function __construct(string $appName,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IL10N $l,
+                                IURLGenerator $urlGenerator,
+                                AccessibilityProvider $accessibilityProvider,
+                                IInitialStateService $initialStateService) {
+        $this->appName               = $appName;
+        $this->config                = $config;
+        $this->userSession           = $userSession;
+        $this->l                     = $l;
+        $this->urlGenerator          = $urlGenerator;
+        $this->accessibilityProvider = $accessibilityProvider;
+        $this->initialStateService   = $initialStateService;
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        Util::addScript('accessibility', 'accessibility');
+        Util::addStyle('accessibility', 'style');
+
+        $availableConfig = [
+            'themes' => $this->accessibilityProvider->getThemes(),
+            'fonts'  => $this->accessibilityProvider->getFonts(),
+            'highcontrast' => $this->accessibilityProvider->getHighContrast()
+        ];
+
+        $userConfig = [
+            'highcontrast' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false),
+            'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
+            'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
+        ];
+
+        $this->initialStateService->provideInitialState($this->appName, 'available-config', $availableConfig);
+        $this->initialStateService->provideInitialState($this->appName, 'user-config', $userConfig);
+
+        return new TemplateResponse($this->appName, 'settings-personal');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        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() {
+        return 40;
+    }
 }

apps/accessibility/appinfo/routes.php

Indentation +17 added lines, -17 removed lines

@@ -22,25 +22,25 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
-		['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
+    'routes' => [
+        ['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
+        ['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
     ],
     'ocs' => [
-		[
-			'name' => 'Config#getConfig',
-			'url'  => '/api/v1/config',
-			'verb' => 'GET',
+        [
+            'name' => 'Config#getConfig',
+            'url'  => '/api/v1/config',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Config#setConfig',
+            'url'  => '/api/v1/config/{key}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'Config#deleteConfig',
+            'url'  => '/api/v1/config/{key}',
+            'verb' => 'DELETE',
         ],
-		[
-			'name' => 'Config#setConfig',
-			'url'  => '/api/v1/config/{key}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'Config#deleteConfig',
-			'url'  => '/api/v1/config/{key}',
-			'verb' => 'DELETE',
-		],
     ]
 ];