nextcloud / server

apps/accessibility/appinfo/routes.php

Indentation +20 added lines, -20 removed lines

@@ -25,24 +25,24 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
-	],
-	'ocs' => [
-		[
-			'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',
-		],
-	]
+    'routes' => [
+        ['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
+    ],
+    'ocs' => [
+        [
+            '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',
+        ],
+    ]
 ];

apps/accessibility/composer/composer/autoload_classmap.php

Spacing +8 added lines, -8 removed lines

@@ -6,12 +6,12 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Accessibility\\AccessibilityProvider' => $baseDir . '/../lib/AccessibilityProvider.php',
-    'OCA\\Accessibility\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Accessibility\\Controller\\AccessibilityController' => $baseDir . '/../lib/Controller/AccessibilityController.php',
-    'OCA\\Accessibility\\Controller\\ConfigController' => $baseDir . '/../lib/Controller/ConfigController.php',
-    'OCA\\Accessibility\\Migration\\RepairUserConfig' => $baseDir . '/../lib/Migration/RepairUserConfig.php',
-    'OCA\\Accessibility\\Service\\JSDataService' => $baseDir . '/../lib/Service/JSDataService.php',
-    'OCA\\Accessibility\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\Accessibility\\Settings\\PersonalSection' => $baseDir . '/../lib/Settings/PersonalSection.php',
+    'OCA\\Accessibility\\AccessibilityProvider' => $baseDir.'/../lib/AccessibilityProvider.php',
+    'OCA\\Accessibility\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Accessibility\\Controller\\AccessibilityController' => $baseDir.'/../lib/Controller/AccessibilityController.php',
+    'OCA\\Accessibility\\Controller\\ConfigController' => $baseDir.'/../lib/Controller/ConfigController.php',
+    'OCA\\Accessibility\\Migration\\RepairUserConfig' => $baseDir.'/../lib/Migration/RepairUserConfig.php',
+    'OCA\\Accessibility\\Service\\JSDataService' => $baseDir.'/../lib/Service/JSDataService.php',
+    'OCA\\Accessibility\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
+    'OCA\\Accessibility\\Settings\\PersonalSection' => $baseDir.'/../lib/Settings/PersonalSection.php',
 );

apps/accessibility/composer/composer/autoload_static.php

Spacing +15 added lines, -15 removed lines

@@ -6,34 +6,34 @@
 
 class ComposerStaticInitAccessibility
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Accessibility\\' => 18,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Accessibility\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Accessibility\\AccessibilityProvider' => __DIR__ . '/..' . '/../lib/AccessibilityProvider.php',
-        'OCA\\Accessibility\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Accessibility\\Controller\\AccessibilityController' => __DIR__ . '/..' . '/../lib/Controller/AccessibilityController.php',
-        'OCA\\Accessibility\\Controller\\ConfigController' => __DIR__ . '/..' . '/../lib/Controller/ConfigController.php',
-        'OCA\\Accessibility\\Migration\\RepairUserConfig' => __DIR__ . '/..' . '/../lib/Migration/RepairUserConfig.php',
-        'OCA\\Accessibility\\Service\\JSDataService' => __DIR__ . '/..' . '/../lib/Service/JSDataService.php',
-        'OCA\\Accessibility\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\Accessibility\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
+    public static $classMap = array(
+        'OCA\\Accessibility\\AccessibilityProvider' => __DIR__.'/..'.'/../lib/AccessibilityProvider.php',
+        'OCA\\Accessibility\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Accessibility\\Controller\\AccessibilityController' => __DIR__.'/..'.'/../lib/Controller/AccessibilityController.php',
+        'OCA\\Accessibility\\Controller\\ConfigController' => __DIR__.'/..'.'/../lib/Controller/ConfigController.php',
+        'OCA\\Accessibility\\Migration\\RepairUserConfig' => __DIR__.'/..'.'/../lib/Migration/RepairUserConfig.php',
+        'OCA\\Accessibility\\Service\\JSDataService' => __DIR__.'/..'.'/../lib/Service/JSDataService.php',
+        'OCA\\Accessibility\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\Accessibility\\Settings\\PersonalSection' => __DIR__.'/..'.'/../lib/Settings/PersonalSection.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitAccessibility::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitAccessibility::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitAccessibility::$classMap;

apps/accessibility/lib/Service/JSDataService.php

Indentation +29 added lines, -29 removed lines

@@ -30,33 +30,33 @@
 use OCP\IUserSession;
 
 class JSDataService implements \JsonSerializable {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(
-		IUserSession $userSession,
-		IConfig $config
-	) {
-		$this->userSession = $userSession;
-		$this->config = $config;
-	}
-
-	public function jsonSerialize() {
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			$theme = false;
-			$highcontrast = false;
-		} else {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
-			$highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
-		}
-
-		return [
-			'theme' => $theme,
-			'highcontrast' => $highcontrast,
-		];
-	}
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IConfig */
+    private $config;
+
+    public function __construct(
+        IUserSession $userSession,
+        IConfig $config
+    ) {
+        $this->userSession = $userSession;
+        $this->config = $config;
+    }
+
+    public function jsonSerialize() {
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            $theme = false;
+            $highcontrast = false;
+        } else {
+            $theme = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'theme', false);
+            $highcontrast = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'highcontrast', false) !== false;
+        }
+
+        return [
+            'theme' => $theme,
+            'highcontrast' => $highcontrast,
+        ];
+    }
 }

apps/accessibility/lib/AppInfo/Application.php

Indentation +39 added lines, -39 removed lines

@@ -45,50 +45,50 @@
 
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'accessibility';
+    /** @var string */
+    public const APP_ID = 'accessibility';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		$this->injectCss(
-			$context->getAppContainer()->query(IUserSession::class),
-			$context->getAppContainer()->query(IConfig::class),
-			$context->getAppContainer()->query(IURLGenerator::class)
-		);
+    public function boot(IBootContext $context): void {
+        $this->injectCss(
+            $context->getAppContainer()->query(IUserSession::class),
+            $context->getAppContainer()->query(IConfig::class),
+            $context->getAppContainer()->query(IURLGenerator::class)
+        );
 
-		$this->registerInitialState($context->getAppContainer());
-	}
+        $this->registerInitialState($context->getAppContainer());
+    }
 
-	private function injectCss(IUserSession $userSession,
-							   IConfig $config,
-							   IURLGenerator $urlGenerator) {
-		// Inject the fake css on all pages if enabled and user is logged
-		$loggedUser = $userSession->getUser();
-		if ($loggedUser !== null) {
-			$userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
-			// we want to check if any theme or font is enabled.
-			if (count($userValues) > 0) {
-				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
-				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
-			}
-		}
-	}
+    private function injectCss(IUserSession $userSession,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator) {
+        // Inject the fake css on all pages if enabled and user is logged
+        $loggedUser = $userSession->getUser();
+        if ($loggedUser !== null) {
+            $userValues = $config->getUserKeys($loggedUser->getUID(), self::APP_ID);
+            // we want to check if any theme or font is enabled.
+            if (count($userValues) > 0) {
+                $hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
+                $linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+                \OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
+            }
+        }
+    }
 
-	private function registerInitialState(IAppContainer $container) {
-		/** @var IInitialStateService $initialState */
-		$initialState = $container->query(IInitialStateService::class);
+    private function registerInitialState(IAppContainer $container) {
+        /** @var IInitialStateService $initialState */
+        $initialState = $container->query(IInitialStateService::class);
 
-		$initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
-			/** @var JSDataService $data */
-			$data = $container->query(JSDataService::class);
-			return $data;
-		});
-	}
+        $initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
+            /** @var JSDataService $data */
+            $data = $container->query(JSDataService::class);
+            return $data;
+        });
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
 				$hash = $config->getUserValue($loggedUser->getUID(), self::APP_ID, 'icons-css', md5(implode('-', $userValues)));
-				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID . '.accessibility.getCss', ['md5' => $hash]);
+				$linkToCSS = $urlGenerator->linkToRoute(self::APP_ID.'.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 		}
@@ -85,7 +85,7 @@ 
 		/** @var IInitialStateService $initialState */
 		$initialState = $container->query(IInitialStateService::class);
 
-		$initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) {
+		$initialState->provideLazyInitialState(self::APP_ID, 'data', function() use ($container) {
 			/** @var JSDataService $data */
 			$data = $container->query(JSDataService::class);
 			return $data;

apps/accessibility/lib/Controller/AccessibilityController.php

Indentation +229 added lines, -229 removed lines

@@ -52,233 +52,233 @@
 
 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;
-
-	/** @var IconsCacher */
-	protected $iconsCacher;
-
-	/** @var \OC_Defaults */
-	private $defaults;
-
-	/** @var null|string */
-	private $injectedVariables;
-
-	/**
-	 * 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
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserManager $userManager,
-								ILogger $logger,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								IconsCacher $iconsCacher,
-								\OC_Defaults $defaults) {
-		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->iconsCacher  = $iconsCacher;
-		$this->defaults     = $defaults;
-
-		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot    = $this->appManager->getAppPath($this->appName);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getCss(): DataDisplayResponse {
-		$css        = '';
-		$imports    = '';
-		$userValues = $this->getUserValues();
-
-		foreach ($userValues as $key => $scssFile) {
-			if ($scssFile !== false) {
-				if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
-					$scssFile .= 'dark';
-				}
-				$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 .
-					$this->getInjectedVariables() .
-					'@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');
-
-		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
-			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
-			$css = $css . $iconsCss;
-		}
-
-		$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');
-
-		// store current cache hash
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
-
-		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);
-		$userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
-
-		return [$userTheme, $userHighContrast, $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);
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function invertSvgIconsColor(string $css) {
-		return str_replace(
-			['color=000&', 'color=fff&', 'color=***&'],
-			['color=***&', 'color=000&', 'color=fff&'],
-			str_replace(
-				['color=000000&', 'color=ffffff&', 'color=******&'],
-				['color=******&', 'color=000000&', 'color=ffffff&'],
-				$css
-			)
-		);
-	}
-
-	/**
-	 * @return string SCSS code for variables from OC_Defaults
-	 */
-	private function getInjectedVariables(): string {
-		if ($this->injectedVariables !== null) {
-			return $this->injectedVariables;
-		}
-		$variables = '';
-		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
-		}
-
-		// check for valid variables / otherwise fall back to defaults
-		try {
-			$scss = new Compiler();
-			$scss->compile($variables);
-			$this->injectedVariables = $variables;
-		} catch (ParserException $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-		}
-		return $variables;
-	}
+    /** @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;
+
+    /** @var IconsCacher */
+    protected $iconsCacher;
+
+    /** @var \OC_Defaults */
+    private $defaults;
+
+    /** @var null|string */
+    private $injectedVariables;
+
+    /**
+     * 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
+     * @param \OC_Defaults $defaults
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory,
+                                IUserSession $userSession,
+                                IAppManager $appManager,
+                                IconsCacher $iconsCacher,
+                                \OC_Defaults $defaults) {
+        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->iconsCacher  = $iconsCacher;
+        $this->defaults     = $defaults;
+
+        $this->serverRoot = \OC::$SERVERROOT;
+        $this->appRoot    = $this->appManager->getAppPath($this->appName);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * @return DataDisplayResponse
+     */
+    public function getCss(): DataDisplayResponse {
+        $css        = '';
+        $imports    = '';
+        $userValues = $this->getUserValues();
+
+        foreach ($userValues as $key => $scssFile) {
+            if ($scssFile !== false) {
+                if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
+                    $scssFile .= 'dark';
+                }
+                $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 .
+                    $this->getInjectedVariables() .
+                    '@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');
+
+        if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
+            $iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
+            $css = $css . $iconsCss;
+        }
+
+        $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');
+
+        // store current cache hash
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
+
+        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);
+        $userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
+
+        return [$userTheme, $userHighContrast, $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);
+    }
+
+    /**
+     * Remove all matches from the $rule regex
+     *
+     * @param string $css string to parse
+     * @return string
+     */
+    private function invertSvgIconsColor(string $css) {
+        return str_replace(
+            ['color=000&', 'color=fff&', 'color=***&'],
+            ['color=***&', 'color=000&', 'color=fff&'],
+            str_replace(
+                ['color=000000&', 'color=ffffff&', 'color=******&'],
+                ['color=******&', 'color=000000&', 'color=ffffff&'],
+                $css
+            )
+        );
+    }
+
+    /**
+     * @return string SCSS code for variables from OC_Defaults
+     */
+    private function getInjectedVariables(): string {
+        if ($this->injectedVariables !== null) {
+            return $this->injectedVariables;
+        }
+        $variables = '';
+        foreach ($this->defaults->getScssVariables() as $key => $value) {
+            $variables .= '$' . $key . ': ' . $value . ';';
+        }
+
+        // check for valid variables / otherwise fall back to defaults
+        try {
+            $scss = new Compiler();
+            $scss->compile($variables);
+            $this->injectedVariables = $variables;
+        } catch (ParserException $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+        }
+        return $variables;
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -146,15 +146,15 @@ 
 				if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
 					$scssFile .= 'dark';
 				}
-				$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
@@ -164,9 +164,9 @@ 
 			// Import theme, variables and compile css4 variables
 			try {
 				$css .= $scss->compile(
-					$imports .
-					$this->getInjectedVariables() .
-					'@import "variables.scss";' .
+					$imports.
+					$this->getInjectedVariables().
+					'@import "variables.scss";'.
 					'@import "css-variables.scss";'
 				);
 			} catch (ParserException $e) {
@@ -179,21 +179,21 @@ 
 
 		// 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');
 
 		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
 			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
-			$css = $css . $iconsCss;
+			$css = $css.$iconsCss;
 		}
 
 		$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');
 
@@ -236,7 +236,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);
 	}
@@ -268,7 +268,7 @@ 
 		}
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
+			$variables .= '$'.$key.': '.$value.';';
 		}
 
 		// check for valid variables / otherwise fall back to defaults