Inspection of "Fallback to default favicon" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#4888)

by Julius

created 2017-05-18 08:47 UTC

Status

Indentation +145 added lines, -145 removed lines patch added patch discarded remove patch

@@ -38,154 +38,154 @@
 block discarded – undo
 use OCP\IConfig;
 
 class IconController extends Controller {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IConfig */
-	private $config;
-	/** @var IconBuilder */
-	private $iconBuilder;
-	/** @var ImageManager */
-	private $imageManager;
-	/** @var FileAccessHelper */
-	private $fileAccessHelper;
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var IconBuilder */
+    private $iconBuilder;
+    /** @var ImageManager */
+    private $imageManager;
+    /** @var FileAccessHelper */
+    private $fileAccessHelper;
 
-	/**
-	 * IconController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param IconBuilder $iconBuilder
-	 * @param ImageManager $imageManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		ITimeFactory $timeFactory,
-		IConfig $config,
-		IconBuilder $iconBuilder,
-		ImageManager $imageManager,
-		FileAccessHelper $fileAccessHelper
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * IconController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param IconBuilder $iconBuilder
+     * @param ImageManager $imageManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        ITimeFactory $timeFactory,
+        IConfig $config,
+        IconBuilder $iconBuilder,
+        ImageManager $imageManager,
+        FileAccessHelper $fileAccessHelper
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->iconBuilder = $iconBuilder;
-		$this->imageManager = $imageManager;
-		$this->fileAccessHelper = $fileAccessHelper;
-	}
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->iconBuilder = $iconBuilder;
+        $this->imageManager = $imageManager;
+        $this->fileAccessHelper = $fileAccessHelper;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @param $image string image file name (svg required)
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getThemedIcon($app, $image) {
-		try {
-			$iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
-		} catch (NotFoundException $exception) {
-			$icon = $this->iconBuilder->colorSvg($app, $image);
-			if ($icon === false || $icon === "") {
-				return new NotFoundResponse();
-			}
-			$iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
-		}
-		if ($iconFile !== false) {
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
-			$response->cacheFor(86400);
-			$expires = new \DateTime();
-			$expires->setTimestamp($this->timeFactory->getTime());
-			$expires->add(new \DateInterval('PT24H'));
-			$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-			$response->addHeader('Pragma', 'cache');
-			return $response;
-		} else {
-			return new NotFoundResponse();
-		}
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @param $image string image file name (svg required)
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getThemedIcon($app, $image) {
+        try {
+            $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
+        } catch (NotFoundException $exception) {
+            $icon = $this->iconBuilder->colorSvg($app, $image);
+            if ($icon === false || $icon === "") {
+                return new NotFoundResponse();
+            }
+            $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
+        }
+        if ($iconFile !== false) {
+            $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
+            $response->cacheFor(86400);
+            $expires = new \DateTime();
+            $expires->setTimestamp($this->timeFactory->getTime());
+            $expires->add(new \DateInterval('PT24H'));
+            $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+            $response->addHeader('Pragma', 'cache');
+            return $response;
+        } else {
+            return new NotFoundResponse();
+        }
+    }
 
-	/**
-	 * Return a 32x32 favicon as png
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @return FileDisplayResponse|DataDisplayResponse
-	 */
-	public function getFavicon($app = "core") {
-		$response = null;
-		if ($this->themingDefaults->shouldReplaceIcons()) {
-			try {
-				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
-			} catch (NotFoundException $exception) {
-				$icon = $this->iconBuilder->getFavicon($app);
-				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
-			}
-			if ($iconFile !== false) {
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-			}
-		}
-		if($response === null) {
-			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
-			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-		}
-		$response->cacheFor(86400);
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT24H'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-		$response->addHeader('Pragma', 'cache');
-		return $response;
-	}
+    /**
+     * Return a 32x32 favicon as png
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @return FileDisplayResponse|DataDisplayResponse
+     */
+    public function getFavicon($app = "core") {
+        $response = null;
+        if ($this->themingDefaults->shouldReplaceIcons()) {
+            try {
+                $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
+            } catch (NotFoundException $exception) {
+                $icon = $this->iconBuilder->getFavicon($app);
+                $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
+            }
+            if ($iconFile !== false) {
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+            }
+        }
+        if($response === null) {
+            $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
+            $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+        }
+        $response->cacheFor(86400);
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT24H'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+        $response->addHeader('Pragma', 'cache');
+        return $response;
+    }
 
-	/**
-	 * Return a 512x512 icon for touch devices
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param $app string app name
-	 * @return FileDisplayResponse|NotFoundResponse
-	 */
-	public function getTouchIcon($app = "core") {
-		$response = null;
-		if ($this->themingDefaults->shouldReplaceIcons()) {
-			try {
-				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
-			} catch (NotFoundException $exception) {
-				$icon = $this->iconBuilder->getTouchIcon($app);
-				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
-			}
-			if ($iconFile !== false) {
-				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-			}
-		}
-		if($response === null) {
-			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
-			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
-		}
-		$response->cacheFor(86400);
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT24H'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-		$response->addHeader('Pragma', 'cache');
-		return $response;
-	}
+    /**
+     * Return a 512x512 icon for touch devices
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param $app string app name
+     * @return FileDisplayResponse|NotFoundResponse
+     */
+    public function getTouchIcon($app = "core") {
+        $response = null;
+        if ($this->themingDefaults->shouldReplaceIcons()) {
+            try {
+                $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
+            } catch (NotFoundException $exception) {
+                $icon = $this->iconBuilder->getTouchIcon($app);
+                $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
+            }
+            if ($iconFile !== false) {
+                $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+            }
+        }
+        if($response === null) {
+            $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
+            $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
+        }
+        $response->cacheFor(86400);
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT24H'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+        $response->addHeader('Pragma', 'cache');
+        return $response;
+    }
 }

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -97,13 +97,13 @@  discard block
 block discarded – undo
 	 */
 	public function getThemedIcon($app, $image) {
 		try {
-			$iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
+			$iconFile = $this->imageManager->getCachedImage("icon-".$app.'-'.str_replace("/", "_", $image));
 		} catch (NotFoundException $exception) {
 			$icon = $this->iconBuilder->colorSvg($app, $image);
 			if ($icon === false || $icon === "") {
 				return new NotFoundResponse();
 			}
-			$iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
+			$iconFile = $this->imageManager->setCachedImage("icon-".$app.'-'.str_replace("/", "_", $image), $icon);
 		}
 		if ($iconFile !== false) {
 			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
@@ -132,17 +132,17 @@  discard block
 block discarded – undo
 		$response = null;
 		if ($this->themingDefaults->shouldReplaceIcons()) {
 			try {
-				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
+				$iconFile = $this->imageManager->getCachedImage('favIcon-'.$app);
 			} catch (NotFoundException $exception) {
 				$icon = $this->iconBuilder->getFavicon($app);
-				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
+				$iconFile = $this->imageManager->setCachedImage('favIcon-'.$app, $icon);
 			}
 			if ($iconFile !== false) {
 				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
 			}
 		}
-		if($response === null) {
-			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
+		if ($response === null) {
+			$fallbackLogo = \OC::$SERVERROOT.'/core/img/favicon.png';
 			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
 		}
 		$response->cacheFor(86400);
@@ -167,17 +167,17 @@  discard block
 block discarded – undo
 		$response = null;
 		if ($this->themingDefaults->shouldReplaceIcons()) {
 			try {
-				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
+				$iconFile = $this->imageManager->getCachedImage('touchIcon-'.$app);
 			} catch (NotFoundException $exception) {
 				$icon = $this->iconBuilder->getTouchIcon($app);
-				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
+				$iconFile = $this->imageManager->setCachedImage('touchIcon-'.$app, $icon);
 			}
 			if ($iconFile !== false) {
 				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
 			}
 		}
-		if($response === null) {
-			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
+		if ($response === null) {
+			$fallbackLogo = \OC::$SERVERROOT.'/core/img/favicon-touch.png';
 			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
 		}
 		$response->cacheFor(86400);

Please login to merge, or discard this patch.

apps/theming/lib/IconBuilder.php 2 patches

Indentation +168 added lines, -168 removed lines patch added patch discarded remove patch

@@ -29,173 +29,173 @@
 block discarded – undo
 use OCP\Files\SimpleFS\ISimpleFile;
 
 class IconBuilder {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-
-	/**
-	 * IconBuilder constructor.
-	 *
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 */
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getFavicon($app) {
-		try {
-			$icon = $this->renderAppIcon($app, 32);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png24");
-			$data = $icon->getImageBlob();
-			$icon->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getTouchIcon($app) {
-		try {
-			$icon = $this->renderAppIcon($app, 512);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png24");
-			$data = $icon->getImageBlob();
-			$icon->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Render app icon on themed background color
-	 * fallback to logo
-	 *
-	 * @param $app string app name
-	 * @param $size int size of the icon in px
-	 * @return Imagick|false
-	 */
-	public function renderAppIcon($app, $size) {
-		$appIcon = $this->util->getAppIcon($app);
-		if($appIcon === false) {
-			return false;
-		}
-		if ($appIcon instanceof ISimpleFile) {
-			$appIconContent = $appIcon->getContent();
-			$mime = $appIcon->getMimeType();
-		} else {
-			$appIconContent = file_get_contents($appIcon);
-			$mime = mime_content_type($appIcon);
-		}
-
-		if($appIconContent === false || $appIconContent === "") {
-			return false;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-
-		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
-			'</svg>';
-		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
-				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
-			} else {
-				$svg = $appIconContent;
-			}
-			$tmp = new Imagick();
-			$tmp->readImageBlob($svg);
-			$x = $tmp->getImageWidth();
-			$y = $tmp->getImageHeight();
-			$res = $tmp->getImageResolution();
-			$tmp->destroy();
-
-			if($x>$y) {
-				$max = $x;
-			} else {
-				$max = $y;
-			}
-
-			// convert svg to resized image
-			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
-			$appIconFile->setResolution($resX, $resY);
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($svg);
-			$appIconFile->scaleImage(512, 512, true);
-		} else {
-			$appIconFile = new Imagick();
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($appIconContent);
-			$appIconFile->scaleImage(512, 512, true);
-		}
-		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
-		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
-		// center icon
-		$offset_w = 512 / 2 - $innerWidth / 2;
-		$offset_h = 512 / 2 - $innerHeight / 2;
-
-		$appIconFile->setImageFormat("png24");
-
-		$finalIconFile = new Imagick();
-		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-		$finalIconFile->readImageBlob($background);
-		$finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-		$finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-		$finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
-		$finalIconFile->setImageFormat('png24');
-		if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
-			$filter = Imagick::INTERPOLATE_BICUBIC;
-		} else {
-			$filter = Imagick::FILTER_LANCZOS;
-		}
-		$finalIconFile->resizeImage($size, $size, $filter, 1, false);
-
-		$appIconFile->destroy();
-		return $finalIconFile;
-	}
-
-	public function colorSvg($app, $image) {
-		try {
-			$imageFile = $this->util->getAppImage($app, $image);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-		$svg = file_get_contents($imageFile);
-		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
-			$svg = $this->util->colorizeSvg($svg, $color);
-			return $svg;
-		} else {
-			return false;
-		}
-	}
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+
+    /**
+     * IconBuilder constructor.
+     *
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     */
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getFavicon($app) {
+        try {
+            $icon = $this->renderAppIcon($app, 32);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png24");
+            $data = $icon->getImageBlob();
+            $icon->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getTouchIcon($app) {
+        try {
+            $icon = $this->renderAppIcon($app, 512);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png24");
+            $data = $icon->getImageBlob();
+            $icon->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Render app icon on themed background color
+     * fallback to logo
+     *
+     * @param $app string app name
+     * @param $size int size of the icon in px
+     * @return Imagick|false
+     */
+    public function renderAppIcon($app, $size) {
+        $appIcon = $this->util->getAppIcon($app);
+        if($appIcon === false) {
+            return false;
+        }
+        if ($appIcon instanceof ISimpleFile) {
+            $appIconContent = $appIcon->getContent();
+            $mime = $appIcon->getMimeType();
+        } else {
+            $appIconContent = file_get_contents($appIcon);
+            $mime = mime_content_type($appIcon);
+        }
+
+        if($appIconContent === false || $appIconContent === "") {
+            return false;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+
+        // generate background image with rounded corners
+        $background = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
+            '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+            '</svg>';
+        // resize svg magic as this seems broken in Imagemagick
+        if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+            if(substr($appIconContent, 0, 5) !== "<?xml") {
+                $svg = "<?xml version=\"1.0\"?>".$appIconContent;
+            } else {
+                $svg = $appIconContent;
+            }
+            $tmp = new Imagick();
+            $tmp->readImageBlob($svg);
+            $x = $tmp->getImageWidth();
+            $y = $tmp->getImageHeight();
+            $res = $tmp->getImageResolution();
+            $tmp->destroy();
+
+            if($x>$y) {
+                $max = $x;
+            } else {
+                $max = $y;
+            }
+
+            // convert svg to resized image
+            $appIconFile = new Imagick();
+            $resX = (int)(512 * $res['x'] / $max * 2.53);
+            $resY = (int)(512 * $res['y'] / $max * 2.53);
+            $appIconFile->setResolution($resX, $resY);
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($svg);
+            $appIconFile->scaleImage(512, 512, true);
+        } else {
+            $appIconFile = new Imagick();
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($appIconContent);
+            $appIconFile->scaleImage(512, 512, true);
+        }
+        // offset for icon positioning
+        $border_w = (int)($appIconFile->getImageWidth() * 0.05);
+        $border_h = (int)($appIconFile->getImageHeight() * 0.05);
+        $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
+        $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+        $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
+        // center icon
+        $offset_w = 512 / 2 - $innerWidth / 2;
+        $offset_h = 512 / 2 - $innerHeight / 2;
+
+        $appIconFile->setImageFormat("png24");
+
+        $finalIconFile = new Imagick();
+        $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+        $finalIconFile->readImageBlob($background);
+        $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+        $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+        $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
+        $finalIconFile->setImageFormat('png24');
+        if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
+            $filter = Imagick::INTERPOLATE_BICUBIC;
+        } else {
+            $filter = Imagick::FILTER_LANCZOS;
+        }
+        $finalIconFile->resizeImage($size, $size, $filter, 1, false);
+
+        $appIconFile->destroy();
+        return $finalIconFile;
+    }
+
+    public function colorSvg($app, $image) {
+        try {
+            $imageFile = $this->util->getAppImage($app, $image);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+        $svg = file_get_contents($imageFile);
+        if ($svg !== false && $svg !== "") {
+            $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
+            $svg = $this->util->colorizeSvg($svg, $color);
+            return $svg;
+        } else {
+            return false;
+        }
+    }
 
 }

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -96,7 +96,7 @@  discard block
 block discarded – undo
 	 */
 	public function renderAppIcon($app, $size) {
 		$appIcon = $this->util->getAppIcon($app);
-		if($appIcon === false) {
+		if ($appIcon === false) {
 			return false;
 		}
 		if ($appIcon instanceof ISimpleFile) {
@@ -107,20 +107,20 @@  discard block
 block discarded – undo
 			$mime = mime_content_type($appIcon);
 		}
 
-		if($appIconContent === false || $appIconContent === "") {
+		if ($appIconContent === false || $appIconContent === "") {
 			return false;
 		}
 
 		$color = $this->themingDefaults->getColorPrimary();
 
 		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
 			'</svg>';
 		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
+		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+			if (substr($appIconContent, 0, 5) !== "<?xml") {
 				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
 			} else {
 				$svg = $appIconContent;
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 			$res = $tmp->getImageResolution();
 			$tmp->destroy();
 
-			if($x>$y) {
+			if ($x > $y) {
 				$max = $x;
 			} else {
 				$max = $y;
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
 
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
 			$appIconFile->scaleImage(512, 512, true);
 		}
 		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
+		$innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
+		$innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
 		// center icon
 		$offset_w = 512 / 2 - $innerWidth / 2;

Please login to merge, or discard this patch.

		@@ -97,13 +97,13 @@ discard block
		block discarded – undo
97	97	*/
98	98	public function getThemedIcon($app, $image) {
99	99	try {
100		- $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
	100	+ $iconFile = $this->imageManager->getCachedImage("icon-".$app.'-'.str_replace("/", "_", $image));
101	101	} catch (NotFoundException $exception) {
102	102	$icon = $this->iconBuilder->colorSvg($app, $image);
103	103	if ($icon === false \|\| $icon === "") {
104	104	return new NotFoundResponse();
105	105	}
106		- $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
	106	+ $iconFile = $this->imageManager->setCachedImage("icon-".$app.'-'.str_replace("/", "_", $image), $icon);
107	107	}
108	108	if ($iconFile !== false) {
109	109	$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
		@@ -132,17 +132,17 @@ discard block
		block discarded – undo
132	132	$response = null;
133	133	if ($this->themingDefaults->shouldReplaceIcons()) {
134	134	try {
135		- $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
	135	+ $iconFile = $this->imageManager->getCachedImage('favIcon-'.$app);
136	136	} catch (NotFoundException $exception) {
137	137	$icon = $this->iconBuilder->getFavicon($app);
138		- $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
	138	+ $iconFile = $this->imageManager->setCachedImage('favIcon-'.$app, $icon);
139	139	}
140	140	if ($iconFile !== false) {
141	141	$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
142	142	}
143	143	}
144		- if($response === null) {
145		- $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
	144	+ if ($response === null) {
	145	+ $fallbackLogo = \OC::$SERVERROOT.'/core/img/favicon.png';
146	146	$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
147	147	}
148	148	$response->cacheFor(86400);
		@@ -167,17 +167,17 @@ discard block
		block discarded – undo
167	167	$response = null;
168	168	if ($this->themingDefaults->shouldReplaceIcons()) {
169	169	try {
170		- $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
	170	+ $iconFile = $this->imageManager->getCachedImage('touchIcon-'.$app);
171	171	} catch (NotFoundException $exception) {
172	172	$icon = $this->iconBuilder->getTouchIcon($app);
173		- $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
	173	+ $iconFile = $this->imageManager->setCachedImage('touchIcon-'.$app, $icon);
174	174	}
175	175	if ($iconFile !== false) {
176	176	$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
177	177	}
178	178	}
179		- if($response === null) {
180		- $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
	179	+ if ($response === null) {
	180	+ $fallbackLogo = \OC::$SERVERROOT.'/core/img/favicon-touch.png';
181	181	$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
182	182	}
183	183	$response->cacheFor(86400);

		@@ -38,154 +38,154 @@
		block discarded – undo
38	38	use OCP\IConfig;
39	39
40	40	class IconController extends Controller {
41		- /** @var ThemingDefaults */
42		- private $themingDefaults;
43		- /** @var Util */
44		- private $util;
45		- /** @var ITimeFactory */
46		- private $timeFactory;
47		- /** @var IConfig */
48		- private $config;
49		- /** @var IconBuilder */
50		- private $iconBuilder;
51		- /** @var ImageManager */
52		- private $imageManager;
53		- /** @var FileAccessHelper */
54		- private $fileAccessHelper;
	41	+ /** @var ThemingDefaults */
	42	+ private $themingDefaults;
	43	+ /** @var Util */
	44	+ private $util;
	45	+ /** @var ITimeFactory */
	46	+ private $timeFactory;
	47	+ /** @var IConfig */
	48	+ private $config;
	49	+ /** @var IconBuilder */
	50	+ private $iconBuilder;
	51	+ /** @var ImageManager */
	52	+ private $imageManager;
	53	+ /** @var FileAccessHelper */
	54	+ private $fileAccessHelper;
55	55
56		- /**
57		- * IconController constructor.
58		- *
59		- * @param string $appName
60		- * @param IRequest $request
61		- * @param ThemingDefaults $themingDefaults
62		- * @param Util $util
63		- * @param ITimeFactory $timeFactory
64		- * @param IConfig $config
65		- * @param IconBuilder $iconBuilder
66		- * @param ImageManager $imageManager
67		- */
68		- public function __construct(
69		- $appName,
70		- IRequest $request,
71		- ThemingDefaults $themingDefaults,
72		- Util $util,
73		- ITimeFactory $timeFactory,
74		- IConfig $config,
75		- IconBuilder $iconBuilder,
76		- ImageManager $imageManager,
77		- FileAccessHelper $fileAccessHelper
78		- ) {
79		- parent::__construct($appName, $request);
	56	+ /**
	57	+ * IconController constructor.
	58	+ *
	59	+ * @param string $appName
	60	+ * @param IRequest $request
	61	+ * @param ThemingDefaults $themingDefaults
	62	+ * @param Util $util
	63	+ * @param ITimeFactory $timeFactory
	64	+ * @param IConfig $config
	65	+ * @param IconBuilder $iconBuilder
	66	+ * @param ImageManager $imageManager
	67	+ */
	68	+ public function __construct(
	69	+ $appName,
	70	+ IRequest $request,
	71	+ ThemingDefaults $themingDefaults,
	72	+ Util $util,
	73	+ ITimeFactory $timeFactory,
	74	+ IConfig $config,
	75	+ IconBuilder $iconBuilder,
	76	+ ImageManager $imageManager,
	77	+ FileAccessHelper $fileAccessHelper
	78	+ ) {
	79	+ parent::__construct($appName, $request);
80	80
81		- $this->themingDefaults = $themingDefaults;
82		- $this->util = $util;
83		- $this->timeFactory = $timeFactory;
84		- $this->config = $config;
85		- $this->iconBuilder = $iconBuilder;
86		- $this->imageManager = $imageManager;
87		- $this->fileAccessHelper = $fileAccessHelper;
88		- }
	81	+ $this->themingDefaults = $themingDefaults;
	82	+ $this->util = $util;
	83	+ $this->timeFactory = $timeFactory;
	84	+ $this->config = $config;
	85	+ $this->iconBuilder = $iconBuilder;
	86	+ $this->imageManager = $imageManager;
	87	+ $this->fileAccessHelper = $fileAccessHelper;
	88	+ }
89	89
90		- /**
91		- * @PublicPage
92		- * @NoCSRFRequired
93		- *
94		- * @param $app string app name
95		- * @param $image string image file name (svg required)
96		- * @return FileDisplayResponse\|NotFoundResponse
97		- */
98		- public function getThemedIcon($app, $image) {
99		- try {
100		- $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
101		- } catch (NotFoundException $exception) {
102		- $icon = $this->iconBuilder->colorSvg($app, $image);
103		- if ($icon === false \|\| $icon === "") {
104		- return new NotFoundResponse();
105		- }
106		- $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
107		- }
108		- if ($iconFile !== false) {
109		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
110		- $response->cacheFor(86400);
111		- $expires = new \DateTime();
112		- $expires->setTimestamp($this->timeFactory->getTime());
113		- $expires->add(new \DateInterval('PT24H'));
114		- $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
115		- $response->addHeader('Pragma', 'cache');
116		- return $response;
117		- } else {
118		- return new NotFoundResponse();
119		- }
120		- }
	90	+ /**
	91	+ * @PublicPage
	92	+ * @NoCSRFRequired
	93	+ *
	94	+ * @param $app string app name
	95	+ * @param $image string image file name (svg required)
	96	+ * @return FileDisplayResponse\|NotFoundResponse
	97	+ */
	98	+ public function getThemedIcon($app, $image) {
	99	+ try {
	100	+ $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
	101	+ } catch (NotFoundException $exception) {
	102	+ $icon = $this->iconBuilder->colorSvg($app, $image);
	103	+ if ($icon === false \|\| $icon === "") {
	104	+ return new NotFoundResponse();
	105	+ }
	106	+ $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
	107	+ }
	108	+ if ($iconFile !== false) {
	109	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
	110	+ $response->cacheFor(86400);
	111	+ $expires = new \DateTime();
	112	+ $expires->setTimestamp($this->timeFactory->getTime());
	113	+ $expires->add(new \DateInterval('PT24H'));
	114	+ $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
	115	+ $response->addHeader('Pragma', 'cache');
	116	+ return $response;
	117	+ } else {
	118	+ return new NotFoundResponse();
	119	+ }
	120	+ }
121	121
122		- /**
123		- * Return a 32x32 favicon as png
124		- *
125		- * @PublicPage
126		- * @NoCSRFRequired
127		- *
128		- * @param $app string app name
129		- * @return FileDisplayResponse\|DataDisplayResponse
130		- */
131		- public function getFavicon($app = "core") {
132		- $response = null;
133		- if ($this->themingDefaults->shouldReplaceIcons()) {
134		- try {
135		- $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
136		- } catch (NotFoundException $exception) {
137		- $icon = $this->iconBuilder->getFavicon($app);
138		- $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
139		- }
140		- if ($iconFile !== false) {
141		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
142		- }
143		- }
144		- if($response === null) {
145		- $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
146		- $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
147		- }
148		- $response->cacheFor(86400);
149		- $expires = new \DateTime();
150		- $expires->setTimestamp($this->timeFactory->getTime());
151		- $expires->add(new \DateInterval('PT24H'));
152		- $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
153		- $response->addHeader('Pragma', 'cache');
154		- return $response;
155		- }
	122	+ /**
	123	+ * Return a 32x32 favicon as png
	124	+ *
	125	+ * @PublicPage
	126	+ * @NoCSRFRequired
	127	+ *
	128	+ * @param $app string app name
	129	+ * @return FileDisplayResponse\|DataDisplayResponse
	130	+ */
	131	+ public function getFavicon($app = "core") {
	132	+ $response = null;
	133	+ if ($this->themingDefaults->shouldReplaceIcons()) {
	134	+ try {
	135	+ $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
	136	+ } catch (NotFoundException $exception) {
	137	+ $icon = $this->iconBuilder->getFavicon($app);
	138	+ $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
	139	+ }
	140	+ if ($iconFile !== false) {
	141	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
	142	+ }
	143	+ }
	144	+ if($response === null) {
	145	+ $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
	146	+ $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
	147	+ }
	148	+ $response->cacheFor(86400);
	149	+ $expires = new \DateTime();
	150	+ $expires->setTimestamp($this->timeFactory->getTime());
	151	+ $expires->add(new \DateInterval('PT24H'));
	152	+ $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
	153	+ $response->addHeader('Pragma', 'cache');
	154	+ return $response;
	155	+ }
156	156
157		- /**
158		- * Return a 512x512 icon for touch devices
159		- *
160		- * @PublicPage
161		- * @NoCSRFRequired
162		- *
163		- * @param $app string app name
164		- * @return FileDisplayResponse\|NotFoundResponse
165		- */
166		- public function getTouchIcon($app = "core") {
167		- $response = null;
168		- if ($this->themingDefaults->shouldReplaceIcons()) {
169		- try {
170		- $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
171		- } catch (NotFoundException $exception) {
172		- $icon = $this->iconBuilder->getTouchIcon($app);
173		- $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
174		- }
175		- if ($iconFile !== false) {
176		- $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
177		- }
178		- }
179		- if($response === null) {
180		- $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
181		- $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
182		- }
183		- $response->cacheFor(86400);
184		- $expires = new \DateTime();
185		- $expires->setTimestamp($this->timeFactory->getTime());
186		- $expires->add(new \DateInterval('PT24H'));
187		- $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
188		- $response->addHeader('Pragma', 'cache');
189		- return $response;
190		- }
	157	+ /**
	158	+ * Return a 512x512 icon for touch devices
	159	+ *
	160	+ * @PublicPage
	161	+ * @NoCSRFRequired
	162	+ *
	163	+ * @param $app string app name
	164	+ * @return FileDisplayResponse\|NotFoundResponse
	165	+ */
	166	+ public function getTouchIcon($app = "core") {
	167	+ $response = null;
	168	+ if ($this->themingDefaults->shouldReplaceIcons()) {
	169	+ try {
	170	+ $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
	171	+ } catch (NotFoundException $exception) {
	172	+ $icon = $this->iconBuilder->getTouchIcon($app);
	173	+ $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
	174	+ }
	175	+ if ($iconFile !== false) {
	176	+ $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
	177	+ }
	178	+ }
	179	+ if($response === null) {
	180	+ $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';
	181	+ $response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
	182	+ }
	183	+ $response->cacheFor(86400);
	184	+ $expires = new \DateTime();
	185	+ $expires->setTimestamp($this->timeFactory->getTime());
	186	+ $expires->add(new \DateInterval('PT24H'));
	187	+ $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
	188	+ $response->addHeader('Pragma', 'cache');
	189	+ return $response;
	190	+ }
191	191	}

		@@ -29,173 +29,173 @@
		block discarded – undo
29	29	use OCP\Files\SimpleFS\ISimpleFile;
30	30
31	31	class IconBuilder {
32		- /** @var ThemingDefaults */
33		- private $themingDefaults;
34		- /** @var Util */
35		- private $util;
36		-
37		- /**
38		- * IconBuilder constructor.
39		- *
40		- * @param ThemingDefaults $themingDefaults
41		- * @param Util $util
42		- */
43		- public function __construct(
44		- ThemingDefaults $themingDefaults,
45		- Util $util
46		- ) {
47		- $this->themingDefaults = $themingDefaults;
48		- $this->util = $util;
49		- }
50		-
51		- /**
52		- * @param $app string app name
53		- * @return string\|false image blob
54		- */
55		- public function getFavicon($app) {
56		- try {
57		- $icon = $this->renderAppIcon($app, 32);
58		- if ($icon === false) {
59		- return false;
60		- }
61		- $icon->setImageFormat("png24");
62		- $data = $icon->getImageBlob();
63		- $icon->destroy();
64		- return $data;
65		- } catch (\ImagickException $e) {
66		- return false;
67		- }
68		- }
69		-
70		- /**
71		- * @param $app string app name
72		- * @return string\|false image blob
73		- */
74		- public function getTouchIcon($app) {
75		- try {
76		- $icon = $this->renderAppIcon($app, 512);
77		- if ($icon === false) {
78		- return false;
79		- }
80		- $icon->setImageFormat("png24");
81		- $data = $icon->getImageBlob();
82		- $icon->destroy();
83		- return $data;
84		- } catch (\ImagickException $e) {
85		- return false;
86		- }
87		- }
88		-
89		- /**
90		- * Render app icon on themed background color
91		- * fallback to logo
92		- *
93		- * @param $app string app name
94		- * @param $size int size of the icon in px
95		- * @return Imagick\|false
96		- */
97		- public function renderAppIcon($app, $size) {
98		- $appIcon = $this->util->getAppIcon($app);
99		- if($appIcon === false) {
100		- return false;
101		- }
102		- if ($appIcon instanceof ISimpleFile) {
103		- $appIconContent = $appIcon->getContent();
104		- $mime = $appIcon->getMimeType();
105		- } else {
106		- $appIconContent = file_get_contents($appIcon);
107		- $mime = mime_content_type($appIcon);
108		- }
109		-
110		- if($appIconContent === false \|\| $appIconContent === "") {
111		- return false;
112		- }
113		-
114		- $color = $this->themingDefaults->getColorPrimary();
115		-
116		- // generate background image with rounded corners
117		- $background = '<?xml version="1.0" encoding="UTF-8"?>' .
118		- '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
119		- '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
120		- '</svg>';
121		- // resize svg magic as this seems broken in Imagemagick
122		- if($mime === "image/svg+xml" \|\| substr($appIconContent, 0, 4) === "<svg") {
123		- if(substr($appIconContent, 0, 5) !== "<?xml") {
124		- $svg = "<?xml version=\"1.0\"?>".$appIconContent;
125		- } else {
126		- $svg = $appIconContent;
127		- }
128		- $tmp = new Imagick();
129		- $tmp->readImageBlob($svg);
130		- $x = $tmp->getImageWidth();
131		- $y = $tmp->getImageHeight();
132		- $res = $tmp->getImageResolution();
133		- $tmp->destroy();
134		-
135		- if($x>$y) {
136		- $max = $x;
137		- } else {
138		- $max = $y;
139		- }
140		-
141		- // convert svg to resized image
142		- $appIconFile = new Imagick();
143		- $resX = (int)(512 * $res['x'] / $max * 2.53);
144		- $resY = (int)(512 * $res['y'] / $max * 2.53);
145		- $appIconFile->setResolution($resX, $resY);
146		- $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
147		- $appIconFile->readImageBlob($svg);
148		- $appIconFile->scaleImage(512, 512, true);
149		- } else {
150		- $appIconFile = new Imagick();
151		- $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
152		- $appIconFile->readImageBlob($appIconContent);
153		- $appIconFile->scaleImage(512, 512, true);
154		- }
155		- // offset for icon positioning
156		- $border_w = (int)($appIconFile->getImageWidth() * 0.05);
157		- $border_h = (int)($appIconFile->getImageHeight() * 0.05);
158		- $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
159		- $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
160		- $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
161		- // center icon
162		- $offset_w = 512 / 2 - $innerWidth / 2;
163		- $offset_h = 512 / 2 - $innerHeight / 2;
164		-
165		- $appIconFile->setImageFormat("png24");
166		-
167		- $finalIconFile = new Imagick();
168		- $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
169		- $finalIconFile->readImageBlob($background);
170		- $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
171		- $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
172		- $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
173		- $finalIconFile->setImageFormat('png24');
174		- if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
175		- $filter = Imagick::INTERPOLATE_BICUBIC;
176		- } else {
177		- $filter = Imagick::FILTER_LANCZOS;
178		- }
179		- $finalIconFile->resizeImage($size, $size, $filter, 1, false);
180		-
181		- $appIconFile->destroy();
182		- return $finalIconFile;
183		- }
184		-
185		- public function colorSvg($app, $image) {
186		- try {
187		- $imageFile = $this->util->getAppImage($app, $image);
188		- } catch (AppPathNotFoundException $e) {
189		- return false;
190		- }
191		- $svg = file_get_contents($imageFile);
192		- if ($svg !== false && $svg !== "") {
193		- $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
194		- $svg = $this->util->colorizeSvg($svg, $color);
195		- return $svg;
196		- } else {
197		- return false;
198		- }
199		- }
	32	+ /** @var ThemingDefaults */
	33	+ private $themingDefaults;
	34	+ /** @var Util */
	35	+ private $util;
	36	+
	37	+ /**
	38	+ * IconBuilder constructor.
	39	+ *
	40	+ * @param ThemingDefaults $themingDefaults
	41	+ * @param Util $util
	42	+ */
	43	+ public function __construct(
	44	+ ThemingDefaults $themingDefaults,
	45	+ Util $util
	46	+ ) {
	47	+ $this->themingDefaults = $themingDefaults;
	48	+ $this->util = $util;
	49	+ }
	50	+
	51	+ /**
	52	+ * @param $app string app name
	53	+ * @return string\|false image blob
	54	+ */
	55	+ public function getFavicon($app) {
	56	+ try {
	57	+ $icon = $this->renderAppIcon($app, 32);
	58	+ if ($icon === false) {
	59	+ return false;
	60	+ }
	61	+ $icon->setImageFormat("png24");
	62	+ $data = $icon->getImageBlob();
	63	+ $icon->destroy();
	64	+ return $data;
	65	+ } catch (\ImagickException $e) {
	66	+ return false;
	67	+ }
	68	+ }
	69	+
	70	+ /**
	71	+ * @param $app string app name
	72	+ * @return string\|false image blob
	73	+ */
	74	+ public function getTouchIcon($app) {
	75	+ try {
	76	+ $icon = $this->renderAppIcon($app, 512);
	77	+ if ($icon === false) {
	78	+ return false;
	79	+ }
	80	+ $icon->setImageFormat("png24");
	81	+ $data = $icon->getImageBlob();
	82	+ $icon->destroy();
	83	+ return $data;
	84	+ } catch (\ImagickException $e) {
	85	+ return false;
	86	+ }
	87	+ }
	88	+
	89	+ /**
	90	+ * Render app icon on themed background color
	91	+ * fallback to logo
	92	+ *
	93	+ * @param $app string app name
	94	+ * @param $size int size of the icon in px
	95	+ * @return Imagick\|false
	96	+ */
	97	+ public function renderAppIcon($app, $size) {
	98	+ $appIcon = $this->util->getAppIcon($app);
	99	+ if($appIcon === false) {
	100	+ return false;
	101	+ }
	102	+ if ($appIcon instanceof ISimpleFile) {
	103	+ $appIconContent = $appIcon->getContent();
	104	+ $mime = $appIcon->getMimeType();
	105	+ } else {
	106	+ $appIconContent = file_get_contents($appIcon);
	107	+ $mime = mime_content_type($appIcon);
	108	+ }
	109	+
	110	+ if($appIconContent === false \|\| $appIconContent === "") {
	111	+ return false;
	112	+ }
	113	+
	114	+ $color = $this->themingDefaults->getColorPrimary();
	115	+
	116	+ // generate background image with rounded corners
	117	+ $background = '<?xml version="1.0" encoding="UTF-8"?>' .
	118	+ '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
	119	+ '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
	120	+ '</svg>';
	121	+ // resize svg magic as this seems broken in Imagemagick
	122	+ if($mime === "image/svg+xml" \|\| substr($appIconContent, 0, 4) === "<svg") {
	123	+ if(substr($appIconContent, 0, 5) !== "<?xml") {
	124	+ $svg = "<?xml version=\"1.0\"?>".$appIconContent;
	125	+ } else {
	126	+ $svg = $appIconContent;
	127	+ }
	128	+ $tmp = new Imagick();
	129	+ $tmp->readImageBlob($svg);
	130	+ $x = $tmp->getImageWidth();
	131	+ $y = $tmp->getImageHeight();
	132	+ $res = $tmp->getImageResolution();
	133	+ $tmp->destroy();
	134	+
	135	+ if($x>$y) {
	136	+ $max = $x;
	137	+ } else {
	138	+ $max = $y;
	139	+ }
	140	+
	141	+ // convert svg to resized image
	142	+ $appIconFile = new Imagick();
	143	+ $resX = (int)(512 * $res['x'] / $max * 2.53);
	144	+ $resY = (int)(512 * $res['y'] / $max * 2.53);
	145	+ $appIconFile->setResolution($resX, $resY);
	146	+ $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
	147	+ $appIconFile->readImageBlob($svg);
	148	+ $appIconFile->scaleImage(512, 512, true);
	149	+ } else {
	150	+ $appIconFile = new Imagick();
	151	+ $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
	152	+ $appIconFile->readImageBlob($appIconContent);
	153	+ $appIconFile->scaleImage(512, 512, true);
	154	+ }
	155	+ // offset for icon positioning
	156	+ $border_w = (int)($appIconFile->getImageWidth() * 0.05);
	157	+ $border_h = (int)($appIconFile->getImageHeight() * 0.05);
	158	+ $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
	159	+ $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
	160	+ $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
	161	+ // center icon
	162	+ $offset_w = 512 / 2 - $innerWidth / 2;
	163	+ $offset_h = 512 / 2 - $innerHeight / 2;
	164	+
	165	+ $appIconFile->setImageFormat("png24");
	166	+
	167	+ $finalIconFile = new Imagick();
	168	+ $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
	169	+ $finalIconFile->readImageBlob($background);
	170	+ $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
	171	+ $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
	172	+ $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
	173	+ $finalIconFile->setImageFormat('png24');
	174	+ if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
	175	+ $filter = Imagick::INTERPOLATE_BICUBIC;
	176	+ } else {
	177	+ $filter = Imagick::FILTER_LANCZOS;
	178	+ }
	179	+ $finalIconFile->resizeImage($size, $size, $filter, 1, false);
	180	+
	181	+ $appIconFile->destroy();
	182	+ return $finalIconFile;
	183	+ }
	184	+
	185	+ public function colorSvg($app, $image) {
	186	+ try {
	187	+ $imageFile = $this->util->getAppImage($app, $image);
	188	+ } catch (AppPathNotFoundException $e) {
	189	+ return false;
	190	+ }
	191	+ $svg = file_get_contents($imageFile);
	192	+ if ($svg !== false && $svg !== "") {
	193	+ $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
	194	+ $svg = $this->util->colorizeSvg($svg, $color);
	195	+ return $svg;
	196	+ } else {
	197	+ return false;
	198	+ }
	199	+ }
200	200
201	201	}

		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	*/
97	97	public function renderAppIcon($app, $size) {
98	98	$appIcon = $this->util->getAppIcon($app);
99		- if($appIcon === false) {
	99	+ if ($appIcon === false) {
100	100	return false;
101	101	}
102	102	if ($appIcon instanceof ISimpleFile) {
		@@ -107,20 +107,20 @@ discard block
		block discarded – undo
107	107	$mime = mime_content_type($appIcon);
108	108	}
109	109
110		- if($appIconContent === false \|\| $appIconContent === "") {
	110	+ if ($appIconContent === false \|\| $appIconContent === "") {
111	111	return false;
112	112	}
113	113
114	114	$color = $this->themingDefaults->getColorPrimary();
115	115
116	116	// generate background image with rounded corners
117		- $background = '<?xml version="1.0" encoding="UTF-8"?>' .
118		- '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
119		- '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
	117	+ $background = '<?xml version="1.0" encoding="UTF-8"?>'.
	118	+ '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
	119	+ '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
120	120	'</svg>';
121	121	// resize svg magic as this seems broken in Imagemagick
122		- if($mime === "image/svg+xml" \|\| substr($appIconContent, 0, 4) === "<svg") {
123		- if(substr($appIconContent, 0, 5) !== "<?xml") {
	122	+ if ($mime === "image/svg+xml" \|\| substr($appIconContent, 0, 4) === "<svg") {
	123	+ if (substr($appIconContent, 0, 5) !== "<?xml") {
124	124	$svg = "<?xml version=\"1.0\"?>".$appIconContent;
125	125	} else {
126	126	$svg = $appIconContent;
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	$res = $tmp->getImageResolution();
133	133	$tmp->destroy();
134	134
135		- if($x>$y) {
	135	+ if ($x > $y) {
136	136	$max = $x;
137	137	} else {
138	138	$max = $y;
		@@ -140,8 +140,8 @@ discard block
		block discarded – undo
140	140
141	141	// convert svg to resized image
142	142	$appIconFile = new Imagick();
143		- $resX = (int)(512 * $res['x'] / $max * 2.53);
144		- $resY = (int)(512 * $res['y'] / $max * 2.53);
	143	+ $resX = (int) (512 * $res['x'] / $max * 2.53);
	144	+ $resY = (int) (512 * $res['y'] / $max * 2.53);
145	145	$appIconFile->setResolution($resX, $resY);
146	146	$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
147	147	$appIconFile->readImageBlob($svg);
		@@ -153,10 +153,10 @@ discard block
		block discarded – undo
153	153	$appIconFile->scaleImage(512, 512, true);
154	154	}
155	155	// offset for icon positioning
156		- $border_w = (int)($appIconFile->getImageWidth() * 0.05);
157		- $border_h = (int)($appIconFile->getImageHeight() * 0.05);
158		- $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
159		- $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
	156	+ $border_w = (int) ($appIconFile->getImageWidth() * 0.05);
	157	+ $border_h = (int) ($appIconFile->getImageHeight() * 0.05);
	158	+ $innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
	159	+ $innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
160	160	$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
161	161	// center icon
162	162	$offset_w = 512 / 2 - $innerWidth / 2;

nextcloud / server

Pull Request — master (#4888)

Status

Category

Indentation +145 added lines, -145 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +168 added lines, -168 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch