nextcloud / server

apps/accessibility/templates/settings-personal.php

Spacing +1 added lines, -1 removed lines

@@ -25,5 +25,5 @@
 style('accessibility', 'style');
 ?>
 
-<span id="serverData" data-server="<?php p(json_encode($_['serverData']));?>"></span>
+<span id="serverData" data-server="<?php p(json_encode($_['serverData'])); ?>"></span>
 <span id="accessibility"></span>
\ No newline at end of file

apps/accessibility/lib/Settings/PersonalSection.php

Indentation +61 added lines, -61 removed lines

@@ -29,72 +29,72 @@
 
 class PersonalSection implements IIconSection {
 
-	/** @var string */
-	protected $appName;
+    /** @var string */
+    protected $appName;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/**
-	 * Personal Section constructor.
-	 *
-	 * @param string $appName
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l
-	 */
-	public function __construct(string $appName,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->appName      = $appName;
-		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
-	}
+    /**
+     * Personal Section constructor.
+     *
+     * @param string $appName
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l
+     */
+    public function __construct(string $appName,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l) {
+        $this->appName      = $appName;
+        $this->urlGenerator = $urlGenerator;
+        $this->l            = $l;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 13.0.0
-	 */
-	public function getIcon() {
-		return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 13.0.0
+     */
+    public function getIcon() {
+        return $this->urlGenerator->imagePath($this->appName, 'app-dark.svg');
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 * @since 9.1
-	 */
-	public function getID() {
-		return $this->appName;
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     * @since 9.1
+     */
+    public function getID() {
+        return $this->appName;
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 * @since 9.1
-	 */
-	public function getName() {
-		return $this->l->t('Accessibility');
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     * @since 9.1
+     */
+    public function getName() {
+        return $this->l->t('Accessibility');
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 15;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 15;
+    }
 }

apps/accessibility/lib/Settings/Personal.php

Indentation +66 added lines, -66 removed lines

@@ -33,81 +33,81 @@
 
 class Personal implements ISettings {
 
-	/** @var string */
-	protected $appName;
+    /** @var string */
+    protected $appName;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var AccessibilityProvider */
-	private $accessibilityProvider;
+    /** @var AccessibilityProvider */
+    private $accessibilityProvider;
 
-	/**
-	 * 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) {
-		$this->appName               = $appName;
-		$this->config                = $config;
-		$this->userSession           = $userSession;
-		$this->l                     = $l;
-		$this->urlGenerator          = $urlGenerator;
-		$this->accessibilityProvider = $accessibilityProvider;
-	}
+    /**
+     * 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) {
+        $this->appName               = $appName;
+        $this->config                = $config;
+        $this->userSession           = $userSession;
+        $this->l                     = $l;
+        $this->urlGenerator          = $urlGenerator;
+        $this->accessibilityProvider = $accessibilityProvider;
+    }
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
 
-		$serverData = [
-			'themes' => $this->accessibilityProvider->getThemes(),
-			'fonts'  => $this->accessibilityProvider->getFonts(),
-			'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
-		];
+        $serverData = [
+            'themes' => $this->accessibilityProvider->getThemes(),
+            'fonts'  => $this->accessibilityProvider->getFonts(),
+            'theme'  => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
+            'font'   => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
+        ];
 
-		return new TemplateResponse($this->appName, 'settings-personal', ['serverData' => $serverData]);
-	}
+        return new TemplateResponse($this->appName, 'settings-personal', ['serverData' => $serverData]);
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return $this->appName;
-	}
+    /**
+     * @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;
-	}
+    /**
+     * @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/lib/Controller/ConfigController.php

Doc Comments -1 removed lines

@@ -74,7 +74,6 @@
 	 *
 	 * Get user accessibility config
 	 *
-	 * @param string $key theme or font
 	 * @return DataResponse
 	 */
 	public function getConfig(): DataResponse {

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 namespace OCA\Accessibility\Controller;
 
 use OCA\Accessibility\AccessibilityProvider;
-use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\AppFramework\OCS\OCSBadRequestException;

Indentation +84 added lines, -84 removed lines

@@ -33,89 +33,89 @@
 
 class ConfigController extends OCSController {
 
-	/** @var string */
-	protected $appName;
-
-	/** @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;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Get user accessibility config
-	 *
-	 * @param string $key theme or font
-	 * @return DataResponse
-	 */
-	public function getConfig(): DataResponse {
-		return new DataResponse([
-			'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $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') {
-			$themes = $this->accessibilityProvider->getThemes();
-			$fonts  = $this->accessibilityProvider->getFonts();
-
-			if ($value === false) {
-				$this->config->deleteUserValue($this->userSession->getUser()->getUID(), $this->appName, $key);
-				return new DataResponse();
-			}
-
-			$availableOptions = array_map(function($option) {
-				return $option['id'];
-			}, array_merge($themes, $fonts));
-
-			if (in_array($value, $availableOptions)) {
-				$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, $key, $value);
-				return new DataResponse();
-			}
-
-			throw new OCSBadRequestException('Invalid value: ' . $value);
-		}
-
-		throw new OCSBadRequestException('Invalid key: ' . $key);
-	}
+    /** @var string */
+    protected $appName;
+
+    /** @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;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Get user accessibility config
+     *
+     * @param string $key theme or font
+     * @return DataResponse
+     */
+    public function getConfig(): DataResponse {
+        return new DataResponse([
+            'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
+            'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $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') {
+            $themes = $this->accessibilityProvider->getThemes();
+            $fonts  = $this->accessibilityProvider->getFonts();
+
+            if ($value === false) {
+                $this->config->deleteUserValue($this->userSession->getUser()->getUID(), $this->appName, $key);
+                return new DataResponse();
+            }
+
+            $availableOptions = array_map(function($option) {
+                return $option['id'];
+            }, array_merge($themes, $fonts));
+
+            if (in_array($value, $availableOptions)) {
+                $this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, $key, $value);
+                return new DataResponse();
+            }
+
+            throw new OCSBadRequestException('Invalid value: ' . $value);
+        }
+
+        throw new OCSBadRequestException('Invalid key: ' . $key);
+    }
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 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>
  *
@@ -112,10 +112,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);
 	}
 
 }
\ No newline at end of file

apps/accessibility/appinfo/routes.php

Indentation +9 added lines, -9 removed lines

@@ -26,15 +26,15 @@
         ['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}.css', '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' => 'POST',
         ],
-		[
-			'name' => 'Config#setConfig',
-			'url'  => '/api/v1/config/{key}',
-			'verb' => 'POST',
-		],
     ]
 ];

apps/accessibility/lib/AppInfo/Application.php

Indentation +30 added lines, -30 removed lines

@@ -30,34 +30,34 @@
 
 class Application extends App {
 
-	/** @var string */
-	protected $appName = 'accessibility';
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct() {
-		parent::__construct($this->appName);
-		$this->config       = \OC::$server->getConfig();
-		$this->userSession  = \OC::$server->getUserSession();
-		$this->urlGenerator = \OC::$server->getURLGenerator();
-	}
-
-	public function injectCss() {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $this->userSession->getUser();
-		if (!is_null($loggedUser)) {
-			$userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
-			if (count($userValues) > 0) {
-				$linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => md5(implode('-', $userValues))]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-		}
-	}
+    /** @var string */
+    protected $appName = 'accessibility';
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    public function __construct() {
+        parent::__construct($this->appName);
+        $this->config       = \OC::$server->getConfig();
+        $this->userSession  = \OC::$server->getUserSession();
+        $this->urlGenerator = \OC::$server->getURLGenerator();
+    }
+
+    public function injectCss() {
+        // Inject the fake css on all pages if enabled and user is logged
+        $loggedUser = $this->userSession->getUser();
+        if (!is_null($loggedUser)) {
+            $userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
+            if (count($userValues) > 0) {
+                $linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => md5(implode('-', $userValues))]);
+                \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
+            }
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		if (!is_null($loggedUser)) {
 			$userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
 			if (count($userValues) > 0) {
-				$linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => md5(implode('-', $userValues))]);
+				$linkToCSS = $this->urlGenerator->linkToRoute($this->appName.'.accessibility.getCss', ['md5' => md5(implode('-', $userValues))]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 		}

apps/accessibility/appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 /**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *

apps/accessibility/lib/Controller/AccessibilityController.php

Indentation +160 added lines, -160 removed lines

@@ -39,164 +39,164 @@
 
 class AccessibilityController extends Controller {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserSession $userSession
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserManager $userManager,
-								ILogger $logger,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->appName      = $appName;
-		$this->config       = $config;
-		$this->userManager  = $userManager;
-		$this->logger       = $logger;
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-		$this->userSession  = $userSession;
-		$this->appManager   = $appManager;
-
-		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot    = $this->appManager->getAppPath($this->appName);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getCss(): DataDisplayResponse {
-		$css        = '';
-		$imports    = '';
-		$userValues = $this->getUserValues();
-
-		foreach ($userValues as $key => $scssFile) {
-			if ($scssFile !== false) {
-				$imports .= '@import "' . $scssFile . '";';
-			}
-		}
-
-		if ($imports !== '') {
-			$scss = new Compiler();
-			$scss->setImportPaths([
-				$this->appRoot . '/css/',
-				$this->serverRoot . '/core/css/'
-			]);
-
-			// Continue after throw
-			$scss->setIgnoreErrors(true);
-			$scss->setFormatter(Crunched::class);
-
-			// Import theme, variables and compile css4 variables
-			try {
-				$css .= $scss->compile(
-					$imports .
-					'@import "variables.scss";' .
-					'@import "css-variables.scss";'
-				);
-			} catch (ParserException $e) {
-				$this->logger->error($e->getMessage(), ['app' => 'core']);
-			}
-		}
-
-		// We don't want to override vars with url since path is different
-		$css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
-
-		// Rebase all urls
-		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css = $this->rebaseUrls($css, $appWebRoot . '/css');
-
-		$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-
-		// Set cache control
-		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-
-		return $response;
-	}
-
-	/**
-	 * Return an array with the user theme & font settings
-	 *
-	 * @return array
-	 */
-	private function getUserValues(): array{
-		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
-
-		return [$userTheme, $userFont];
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $rule regex to match
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function filterOutRule(string $rule, string $css): string {
-		return preg_replace($rule, '', $css);
-	}
-
-	/**
-	 * Add the correct uri prefix to make uri valid again
-	 *
-	 * @param string $css
-	 * @param string $webDir
-	 * @return string
-	 */
-	private function rebaseUrls(string $css, string $webDir): string {
-		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
-
-		return preg_replace($re, $subst, $css);
-	}
+    /** @var string */
+    protected $appName;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * Account constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     * @param IUserSession $userSession
+     * @param IAppManager $appManager
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory,
+                                IUserSession $userSession,
+                                IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->appName      = $appName;
+        $this->config       = $config;
+        $this->userManager  = $userManager;
+        $this->logger       = $logger;
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory  = $timeFactory;
+        $this->userSession  = $userSession;
+        $this->appManager   = $appManager;
+
+        $this->serverRoot = \OC::$SERVERROOT;
+        $this->appRoot    = $this->appManager->getAppPath($this->appName);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @return DataDisplayResponse
+     */
+    public function getCss(): DataDisplayResponse {
+        $css        = '';
+        $imports    = '';
+        $userValues = $this->getUserValues();
+
+        foreach ($userValues as $key => $scssFile) {
+            if ($scssFile !== false) {
+                $imports .= '@import "' . $scssFile . '";';
+            }
+        }
+
+        if ($imports !== '') {
+            $scss = new Compiler();
+            $scss->setImportPaths([
+                $this->appRoot . '/css/',
+                $this->serverRoot . '/core/css/'
+            ]);
+
+            // Continue after throw
+            $scss->setIgnoreErrors(true);
+            $scss->setFormatter(Crunched::class);
+
+            // Import theme, variables and compile css4 variables
+            try {
+                $css .= $scss->compile(
+                    $imports .
+                    '@import "variables.scss";' .
+                    '@import "css-variables.scss";'
+                );
+            } catch (ParserException $e) {
+                $this->logger->error($e->getMessage(), ['app' => 'core']);
+            }
+        }
+
+        // We don't want to override vars with url since path is different
+        $css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
+
+        // Rebase all urls
+        $appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
+        $css = $this->rebaseUrls($css, $appWebRoot . '/css');
+
+        $response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+
+        // Set cache control
+        $ttl = 31536000;
+        $response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT' . $ttl . 'S'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+        $response->addHeader('Pragma', 'cache');
+
+        return $response;
+    }
+
+    /**
+     * Return an array with the user theme & font settings
+     *
+     * @return array
+     */
+    private function getUserValues(): array{
+        $userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
+        $userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
+
+        return [$userTheme, $userFont];
+    }
+
+    /**
+     * Remove all matches from the $rule regex
+     *
+     * @param string $rule regex to match
+     * @param string $css string to parse
+     * @return string
+     */
+    private function filterOutRule(string $rule, string $css): string {
+        return preg_replace($rule, '', $css);
+    }
+
+    /**
+     * Add the correct uri prefix to make uri valid again
+     *
+     * @param string $css
+     * @param string $webDir
+     * @return string
+     */
+    private function rebaseUrls(string $css, string $webDir): string {
+        $re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+        $subst = 'url(\'' . $webDir . '/$1\')';
+
+        return preg_replace($re, $subst, $css);
+    }
 }

Spacing +10 added lines, -10 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>
  *
@@ -115,15 +115,15 @@ 
 
 		foreach ($userValues as $key => $scssFile) {
 			if ($scssFile !== false) {
-				$imports .= '@import "' . $scssFile . '";';
+				$imports .= '@import "'.$scssFile.'";';
 			}
 		}
 
 		if ($imports !== '') {
 			$scss = new Compiler();
 			$scss->setImportPaths([
-				$this->appRoot . '/css/',
-				$this->serverRoot . '/core/css/'
+				$this->appRoot.'/css/',
+				$this->serverRoot.'/core/css/'
 			]);
 
 			// Continue after throw
@@ -133,8 +133,8 @@ 
 			// Import theme, variables and compile css4 variables
 			try {
 				$css .= $scss->compile(
-					$imports .
-					'@import "variables.scss";' .
+					$imports.
+					'@import "variables.scss";'.
 					'@import "css-variables.scss";'
 				);
 			} catch (ParserException $e) {
@@ -147,16 +147,16 @@ 
 
 		// Rebase all urls
 		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css = $this->rebaseUrls($css, $appWebRoot . '/css');
+		$css = $this->rebaseUrls($css, $appWebRoot.'/css');
 
 		$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
 
 		// Set cache control
 		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
+		$response->addHeader('Cache-Control', 'max-age='.$ttl.', immutable');
 		$expires = new \DateTime();
 		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
+		$expires->add(new \DateInterval('PT'.$ttl.'S'));
 		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
 		$response->addHeader('Pragma', 'cache');
 
@@ -195,7 +195,7 @@ 
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
 		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
+		$subst = 'url(\''.$webDir.'/$1\')';
 
 		return preg_replace($re, $subst, $css);
 	}

apps/accessibility/lib/AccessibilityProvider.php

Indentation +45 added lines, -45 removed lines

@@ -29,55 +29,55 @@
 
 class AccessibilityProvider {
 
-	/** @var string */
-	protected $appName;
+    /** @var string */
+    protected $appName;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l
-	 */
-	public function __construct(string $appName,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->appName      = $appName;
-		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
-	}
+    /**
+     * Account constructor.
+     *
+     * @param string $appName
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l
+     */
+    public function __construct(string $appName,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l) {
+        $this->appName      = $appName;
+        $this->urlGenerator = $urlGenerator;
+        $this->l            = $l;
+    }
 
-	public function getThemes() {
-		return array(
-			[
-				'id'    => 'themehighcontrast',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-highcontrast.jpg'),
-				'title' => $this->l->t('High Contrast theme'),
-				'text'  => $this->l->t('A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased.')
-			], [
-				'id'    => 'themedark',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
-				'title' => $this->l->t('Dark theme'),
-				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness of your navigation. This is suitable for people who use computes a lot or in low luminosity spaces.')
-			]
-		);
-	}
+    public function getThemes() {
+        return array(
+            [
+                'id'    => 'themehighcontrast',
+                'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-highcontrast.jpg'),
+                'title' => $this->l->t('High Contrast theme'),
+                'text'  => $this->l->t('A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased.')
+            ], [
+                'id'    => 'themedark',
+                'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
+                'title' => $this->l->t('Dark theme'),
+                'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness of your navigation. This is suitable for people who use computes a lot or in low luminosity spaces.')
+            ]
+        );
+    }
 
-	public function getFonts() {
-		return array(
-			[
-				'id'    => 'fontdyslexic',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
-				'title' => $this->l->t('Dyslexia font'),
-				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia. The typeface was created by Abelardo Gonzalez, who released it through an open-source license.')
-			]
-		);
-	}
+    public function getFonts() {
+        return array(
+            [
+                'id'    => 'fontdyslexic',
+                'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
+                'title' => $this->l->t('Dyslexia font'),
+                'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia. The typeface was created by Abelardo Gonzalez, who released it through an open-source license.')
+            ]
+        );
+    }
 
 }
\ No newline at end of file