nextcloud / server

apps/theming/lib/Themes/CommonThemeTrait.php

Spacing +5 added lines, -5 removed lines

@@ -103,7 +103,7 @@ 
 					}
 					$variables['--image-background-size'] = 'cover';
 				}
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
+				$variables["--image-$image"] = "url('".$imageUrl."')";
 			}
 		}
 
@@ -123,13 +123,13 @@ 
 			&& !$this->themingDefaults->isUserThemingDisabled()
 			&& $this->appManager->isEnabledForUser(Application::APP_ID)) {
 			$themingBackground = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background', 'default');
-			$currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
+			$currentVersion = (int) $this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
 
 			// The user uploaded a custom background
 			if ($themingBackground === 'custom') {
-				$cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
+				$cacheBuster = substr(sha1($user->getUID().'_'.$currentVersion), 0, 8);
 				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
+					'--image-background' => "url('".$this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground')."?v=$cacheBuster')",
 					// TODO: implement primary color from custom background --color-background-plain
 				];
 			}
@@ -137,7 +137,7 @@ 
 			// The user picked a shipped background
 			if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$themingBackground])) {
 				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground") . "')",
+					'--image-background' => "url('".$this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground")."')",
 					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
 				];
 			}

apps/theming/lib/Themes/DefaultTheme.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
 			'--color-text-light' => $colorMainText,
 			'--color-text-lighter' => $this->util->lighten($colorMainText, 33),
 
-			'--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
+			'--color-scrollbar' => 'rgba('.$colorMainTextRgb.', .15)',
 
 			// info/warning/success feedback colours
 			'--color-error' => '#e9322d',
@@ -191,7 +191,7 @@ 
 			'--background-invert-if-bright' => 'invert(100%)',
 
 			// Default last fallback values
-			'--image-background' => "url('" . $this->urlGenerator->imagePath('core', 'app-background.jpg') . "')",
+			'--image-background' => "url('".$this->urlGenerator->imagePath('core', 'app-background.jpg')."')",
 			'--color-background-plain' => $this->defaultPrimaryColor,
 		];
 

apps/theming/lib/ImageManager.php

Spacing +15 added lines, -15 removed lines

@@ -78,16 +78,16 @@ 
 	public function getImageUrl(string $key, bool $useSvg = true): string {
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
 		if ($this->hasImage($key)) {
-			return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => $key ]) . '?v=' . $cacheBusterCounter;
+			return $this->urlGenerator->linkToRoute('theming.Theming.getImage', ['key' => $key]).'?v='.$cacheBusterCounter;
 		}
 
 		switch ($key) {
 			case 'logo':
 			case 'logoheader':
 			case 'favicon':
-				return $this->urlGenerator->imagePath('core', 'logo/logo.png') . '?v=' . $cacheBusterCounter;
+				return $this->urlGenerator->imagePath('core', 'logo/logo.png').'?v='.$cacheBusterCounter;
 			case 'background':
-				return $this->urlGenerator->imagePath('core', 'background.png') . '?v=' . $cacheBusterCounter;
+				return $this->urlGenerator->imagePath('core', 'background.png').'?v='.$cacheBusterCounter;
 		}
 		return '';
 	}
@@ -104,7 +104,7 @@ 
 	 * @throws NotPermittedException
 	 */
 	public function getImage(string $key, bool $useSvg = true): ISimpleFile {
-		$logo = $this->config->getAppValue('theming', $key . 'Mime', '');
+		$logo = $this->config->getAppValue('theming', $key.'Mime', '');
 		$folder = $this->getRootFolder()->getFolder('images');
 
 		if ($logo === '' || !$folder->fileExists($key)) {
@@ -112,20 +112,20 @@ 
 		}
 
 		if (!$useSvg && $this->shouldReplaceIcons()) {
-			if (!$folder->fileExists($key . '.png')) {
+			if (!$folder->fileExists($key.'.png')) {
 				try {
 					$finalIconFile = new \Imagick();
 					$finalIconFile->setBackgroundColor('none');
 					$finalIconFile->readImageBlob($folder->getFile($key)->getContent());
 					$finalIconFile->setImageFormat('png32');
-					$pngFile = $folder->newFile($key . '.png');
+					$pngFile = $folder->newFile($key.'.png');
 					$pngFile->putContent($finalIconFile->getImageBlob());
 					return $pngFile;
 				} catch (\ImagickException $e) {
-					$this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed: ' . $e->getMessage());
+					$this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed: '.$e->getMessage());
 				}
 			} else {
-				return $folder->getFile($key . '.png');
+				return $folder->getFile($key.'.png');
 			}
 		}
 
@@ -133,7 +133,7 @@ 
 	}
 
 	public function hasImage(string $key): bool {
-		$mimeSetting = $this->config->getAppValue('theming', $key . 'Mime', '');
+		$mimeSetting = $this->config->getAppValue('theming', $key.'Mime', '');
 		return $mimeSetting !== '';
 	}
 
@@ -144,7 +144,7 @@ 
 		$images = [];
 		foreach ($this::SupportedImageKeys as $key) {
 			$images[$key] = [
-				'mime' => $this->config->getAppValue('theming', $key . 'Mime', ''),
+				'mime' => $this->config->getAppValue('theming', $key.'Mime', ''),
 				'url' => $this->getImageUrl($key),
 			];
 		}
@@ -210,7 +210,7 @@ 
 		} catch (NotPermittedException $e) {
 		}
 		try {
-			$file = $this->getRootFolder()->getFolder('images')->getFile($key . '.png');
+			$file = $this->getRootFolder()->getFolder('images')->getFile($key.'.png');
 			$file->delete();
 		} catch (NotFoundException $e) {
 		} catch (NotPermittedException $e) {
@@ -243,8 +243,8 @@ 
 			imagealphablending($newImage, true);
 
 			$tmpFile = $this->tempManager->getTemporaryFile();
-			$newWidth = (int)(imagesx($newImage) < 4096 ? imagesx($newImage) : 4096);
-			$newHeight = (int)(imagesy($newImage) / (imagesx($newImage) / $newWidth));
+			$newWidth = (int) (imagesx($newImage) < 4096 ? imagesx($newImage) : 4096);
+			$newHeight = (int) (imagesy($newImage) / (imagesx($newImage) / $newWidth));
 			$outputImage = imagescale($newImage, $newWidth, $newHeight);
 
 			imageinterlace($outputImage, 1);
@@ -305,9 +305,9 @@ 
 	 * @return bool
 	 */
 	public function shouldReplaceIcons() {
-		$cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
+		$cache = $this->cacheFactory->createDistributed('theming-'.$this->urlGenerator->getBaseUrl());
 		if ($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
+			return (bool) $value;
 		}
 		$value = false;
 		if (extension_loaded('imagick')) {