nextcloud / server

apps/theming/lib/ThemingDefaults.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 * @param IL10N $l
 	 * @param IURLGenerator $urlGenerator
 	 * @param \OC_Defaults $defaults
-	 * @param IRootFolder $appData
+	 * @param IAppData $appData
 	 * @param ICacheFactory $cacheFactory
 	 * @param Util $util
 	 */

Spacing +12 added lines, -12 removed lines

@@ -112,9 +112,9 @@ 
 
 	public function getShortFooter() {
 		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
+		$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+			' rel="noreferrer">'.$this->getEntity().'</a>'.
+			($slogan !== '' ? ' – '.$slogan : '');
 
 		return $footer;
 	}
@@ -140,8 +140,8 @@ 
 			$file = null;
 		}
 		$logo = $this->config->getAppValue('theming', 'logoMime', false);
-		if(!$logo || $file === null) {
-			return $this->urlGenerator->imagePath('core','logo.svg');
+		if (!$logo || $file === null) {
+			return $this->urlGenerator->imagePath('core', 'logo.svg');
 		} else {
 			return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
 		}
@@ -159,8 +159,8 @@ 
 			$file = null;
 		}
 		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
-		if(!$backgroundLogo || $file === null) {
-			return $this->urlGenerator->imagePath('core','background.jpg');
+		if (!$backgroundLogo || $file === null) {
+			return $this->urlGenerator->imagePath('core', 'background.jpg');
 		} else {
 			return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
 		}
@@ -172,7 +172,7 @@ 
 	 */
 	public function getScssVariables() {
 		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('getScssVariables')) {
+		if ($value = $cache->get('getScssVariables')) {
 			return $value;
 		}
 
@@ -204,11 +204,11 @@ 
 	 */
 	public function shouldReplaceIcons() {
 		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
+		if ($value = $cache->get('shouldReplaceIcons')) {
+			return (bool) $value;
 		}
 		$value = false;
-		if(extension_loaded('imagick')) {
+		if (extension_loaded('imagick')) {
 			$checkImagick = new \Imagick();
 			if (count($checkImagick->queryFormats('SVG')) >= 1) {
 				$value = true;
@@ -224,7 +224,7 @@ 
 	 */
 	private function increaseCacheBuster() {
 		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+		$this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
 		$this->cacheFactory->create('theming')->clear('getScssVariables');
 	}
 

lib/private/legacy/defaults.php

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
 		$this->defaultLogoClaim = '';
 		$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
 
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
+		$themePath = OC::$SERVERROOT.'/themes/'.OC_Util::getTheme().'/defaults.php';
 		if (file_exists($themePath)) {
 			// prevent defaults.php from printing output
 			ob_start();
@@ -239,9 +239,9 @@ 
 		if ($this->themeExist('getShortFooter')) {
 			$footer = $this->theme->getShortFooter();
 		} else {
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
-				' – ' . $this->getSlogan();
+			$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+				' rel="noreferrer">'.$this->getEntity().'</a>'.
+				' – '.$this->getSlogan();
 		}
 
 		return $footer;
@@ -268,7 +268,7 @@ 
 		if ($this->themeExist('buildDocLinkToKey')) {
 			return $this->theme->buildDocLinkToKey($key);
 		}
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/'.$this->defaultDocVersion.'/go.php?to='.$key;
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 * @return array scss variables to overwrite
 	 */
 	public function getScssVariables() {
-		if($this->themeExist('getScssVariables')) {
+		if ($this->themeExist('getScssVariables')) {
 			return $this->theme->getScssVariables();
 		}
 		return [];

lib/private/Template/SCSSCacher.php

Doc Comments -2 removed lines

@@ -125,8 +125,6 @@
 
 	/**
 	 * Check if the variables file has changed
-	 * @param string $fileNameCSS
-	 * @param ISimpleFolder $folder
 	 * @return bool
 	 */
 	private function variablesChanged() {

Spacing +18 added lines, -18 removed lines

@@ -75,23 +75,23 @@ 
 	 * @return boolean
 	 */
 	public function process($root, $file, $app) {
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileNameSCSS = array_pop($path);
 		$fileNameCSS = str_replace('.scss', '.css', $fileNameSCSS);
 
 		$path = implode('/', $path);
 
-		$webDir = substr($path, strlen($this->serverRoot)+1);
+		$webDir = substr($path, strlen($this->serverRoot) + 1);
 
 		try {
 			$folder = $this->appData->getFolder($app);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			// creating css appdata folder
 			$folder = $this->appData->newFolder($app);
 		}
 
-		if(!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder, $path)) {
+		if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder, $path)) {
 			return true;
 		}
 		return $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
@@ -108,7 +108,7 @@ 
 		try {
 			$cachedFile = $folder->getFile($fileNameCSS);
 			if ($cachedFile->getSize() > 0) {
-				$depFile = $folder->getFile($fileNameCSS . '.deps');
+				$depFile = $folder->getFile($fileNameCSS.'.deps');
 				$deps = json_decode($depFile->getContent(), true);
 
 				foreach ($deps as $file=>$mtime) {
@@ -118,7 +118,7 @@ 
 				}
 			}
 			return true;
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return false;
 		}
 	}
@@ -131,7 +131,7 @@ 
 	 */
 	private function variablesChanged() {
 		$injectedVariables = $this->getInjectedVariables();
-		if($injectedVariables !== '' && $this->config->getAppValue('core', 'scss.variables') !== md5($injectedVariables)) {
+		if ($injectedVariables !== '' && $this->config->getAppValue('core', 'scss.variables') !== md5($injectedVariables)) {
 			$this->resetCache();
 			$this->config->setAppValue('core', 'scss.variables', md5($injectedVariables));
 			return true;
@@ -152,9 +152,9 @@ 
 		$scss = new Compiler();
 		$scss->setImportPaths([
 			$path,
-			\OC::$SERVERROOT . '/core/css/',
+			\OC::$SERVERROOT.'/core/css/',
 		]);
-		if($this->config->getSystemValue('debug')) {
+		if ($this->config->getSystemValue('debug')) {
 			// Debug mode
 			$scss->setFormatter(Expanded::class);
 			$scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
@@ -165,11 +165,11 @@ 
 
 		try {
 			$cachedfile = $folder->getFile($fileNameCSS);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			$cachedfile = $folder->newFile($fileNameCSS);
 		}
 
-		$depFileName = $fileNameCSS . '.deps';
+		$depFileName = $fileNameCSS.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -179,10 +179,10 @@ 
 		// Compile
 		try {
 			$compiledScss = $scss->compile(
-				'@import "variables.scss";' .
-				$this->getInjectedVariables() .
+				'@import "variables.scss";'.
+				$this->getInjectedVariables().
 				'@import "'.$fileNameSCSS.'";');
-		} catch(ParserException $e) {
+		} catch (ParserException $e) {
 			$this->logger->error($e, ['app' => 'core']);
 			return false;
 		}
@@ -192,7 +192,7 @@ 
 			$depFile->putContent(json_encode($scss->getParsedFiles()));
 			$this->logger->debug($webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
 			return true;
-		} catch(NotPermittedException $e) {
+		} catch (NotPermittedException $e) {
 			return false;
 		}
 	}
@@ -204,7 +204,7 @@ 
 	private function resetCache() {
 		foreach ($this->appData->getDirectoryListing() as $folder) {
 			foreach ($folder->getDirectoryListing() as $file) {
-				if(substr($file->getName(), -3) === "css" || substr($file->getName(), -4) === "deps") {
+				if (substr($file->getName(), -3) === "css" || substr($file->getName(), -4) === "deps") {
 					$file->delete();
 				}
 			}
@@ -217,7 +217,7 @@ 
 	private function getInjectedVariables() {
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
+			$variables .= '$'.$key.': '.$value.';';
 		}
 		return $variables;
 	}
@@ -231,7 +231,7 @@ 
 	private function rebaseUrls($css, $webDir) {
 		$re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
 		// OC\Route\Router:75
-		if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
+		if (($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
 			$subst = 'url(\'../../'.$webDir.'/$1\')';	
 		} else {
 			$subst = 'url(\'../../../'.$webDir.'/$1\')';

apps/theming/lib/Controller/ThemingController.php

Spacing +7 added lines, -7 removed lines

@@ -353,7 +353,7 @@ 
 		$appPath = substr(\OC::$server->getAppManager()->getAppPath('theming'), strlen(\OC::$SERVERROOT) + 1);
 		$SCSSCacher->process(
 			\OC::$SERVERROOT,
-			$appPath . '/css/theming.scss',
+			$appPath.'/css/theming.scss',
 			$cacheBusterValue
 		);
 
@@ -383,12 +383,12 @@ 
 		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
 		$responseJS = '(function() {
 	OCA.Theming = {
-		name: ' . json_encode($this->themingDefaults->getName()) . ',
-		url: ' . json_encode($this->themingDefaults->getBaseUrl()) . ',
-		slogan: ' . json_encode($this->themingDefaults->getSlogan()) . ',
-		color: ' . json_encode($this->themingDefaults->getMailHeaderColor()) . ',
-		inverted: ' . json_encode($this->util->invertTextColor($this->themingDefaults->getMailHeaderColor())) . ',
-		cacheBuster: ' . json_encode($cacheBusterValue) . '
+		name: ' . json_encode($this->themingDefaults->getName()).',
+		url: ' . json_encode($this->themingDefaults->getBaseUrl()).',
+		slogan: ' . json_encode($this->themingDefaults->getSlogan()).',
+		color: ' . json_encode($this->themingDefaults->getMailHeaderColor()).',
+		inverted: ' . json_encode($this->util->invertTextColor($this->themingDefaults->getMailHeaderColor())).',
+		cacheBuster: ' . json_encode($cacheBusterValue).'
 	};
 })();';
 		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');