nextcloud / server

lib/private/Template/IconsCacher.php

Indentation +221 added lines, -221 removed lines

@@ -35,226 +35,226 @@
 
 class IconsCacher {
 
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var ISimpleFolder */
-	private $folder;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var string */
-	private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+):\s?url\(["\']?([a-zA-Z0-9-_\~\/\.\?\&\=\:\;\+\,]+)[^;]+;/m';
-
-	/** @var string */
-	private $fileName = 'icons-vars.css';
-
-	private $iconList = 'icons-list.template';
-
-	private $cachedCss;
-	private $cachedList;
-
-	/**
-	 * @param ILogger $logger
-	 * @param Factory $appDataFactory
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function __construct(ILogger $logger,
-								Factory $appDataFactory,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory) {
-		$this->logger       = $logger;
-		$this->appData      = $appDataFactory->get('css');
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-
-		try {
-			$this->folder = $this->appData->getFolder('icons');
-		} catch (NotFoundException $e) {
-			$this->folder = $this->appData->newFolder('icons');
-		}
-	}
-
-	private function getIconsFromCss(string $css): array {
-		preg_match_all($this->iconVarRE, $css, $matches, PREG_SET_ORDER);
-		$icons = [];
-		foreach ($matches as $icon) {
-			$icons[$icon[1]] = $icon[2];
-		}
-
-		return $icons;
-	}
-
-	/**
-	 * @param string $css
-	 * @return string
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function setIconsCss(string $css): string {
-
-		$cachedFile = $this->getCachedList();
-		if (!$cachedFile) {
-			$currentData = '';
-			$cachedFile = $this->folder->newFile($this->iconList);
-		} else {
-			$currentData = $cachedFile->getContent();
-		}
-
-		$cachedVarsCssFile = $this->getCachedCSS();
-		if (!$cachedVarsCssFile) {
-			$cachedVarsCssFile = $this->folder->newFile($this->fileName);
-		}
-
-		$icons = $this->getIconsFromCss($currentData . $css);
-
-		$data = '';
-		$list = '';
-		foreach ($icons as $icon => $url) {
-			$list .= "--$icon: url('$url');";
-			list($location,$color) = $this->parseUrl($url);
-			$svg = false;
-			if ($location !== '' && \file_exists($location)) {
-				$svg = \file_get_contents($location);
-			}
-			if ($svg === false) {
-				$this->logger->debug('Failed to get icon file ' . $location);
-				$data .= "--$icon: url('$url');";
-				continue;
-			}
-			$encode = base64_encode($this->colorizeSvg($svg, $color));
-			$data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
-		}
-
-		if (\strlen($data) > 0 && \strlen($list) > 0) {
-			$data = ":root {\n$data\n}";
-			$cachedVarsCssFile->putContent($data);
-			$list = ":root {\n$list\n}";
-			$cachedFile->putContent($list);
-			$this->cachedList = null;
-			$this->cachedCss = null;
-		}
-
-		return preg_replace($this->iconVarRE, '', $css);
-	}
-
-	/**
-	 * @param $url
-	 * @return array
-	 */
-	private function parseUrl($url): array {
-		$location = '';
-		$color = '';
-		$base = $this->getRoutePrefix() . '/svg/';
-		$cleanUrl = \substr($url, \strlen($base));
-		if (\strpos($url, $base . 'core') === 0) {
-			$cleanUrl = \substr($cleanUrl, \strlen('core'));
-			if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				list(,$cleanUrl,$color) = $matches;
-				$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
-			}
-		} elseif (\strpos($url, $base) === 0) {
-			if(\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				list(,$app,$cleanUrl, $color) = $matches;
-				$location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
-				if ($app === 'settings') {
-					$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
-				}
-			}
-
-		}
-		return [
-			$location,
-			$color
-		];
-	}
-
-	/**
-	 * @param $svg
-	 * @param $color
-	 * @return string
-	 */
-	public function colorizeSvg($svg, $color): string {
-		if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
-			// Prevent not-sane colors from being written into the SVG
-			$color = '000';
-		}
-
-		// add fill (fill is not present on black elements)
-		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
-		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
-
-		// replace any fill or stroke colors
-		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
-		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
-		return $svg;
-	}
-
-	private function getRoutePrefix() {
-		$frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
-		if ($frontControllerActive) {
-			$prefix = \OC::$WEBROOT;
-		}
-		return $prefix;
-	}
-
-	/**
-	 * Get icons css file
-	 * @return ISimpleFile|boolean
-	 */
-	public function getCachedCSS() {
-		try {
-			if (!$this->cachedCss) {
-				$this->cachedCss = $this->folder->getFile($this->fileName);
-			}
-			return $this->cachedCss;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Get icon-vars list template
-	 * @return ISimpleFile|boolean
-	 */
-	public function getCachedList() {
-		try {
-			if (!$this->cachedList) {
-				$this->cachedList = $this->folder->getFile($this->iconList);
-			}
-			return $this->cachedList;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function injectCss() {
-		$mtime = $this->timeFactory->getTime();
-		$file = $this->getCachedList();
-		if ($file) {
-			$mtime = $file->getMTime();
-		}
-		// Only inject once
-		foreach (\OC_Util::$headers as $header) {
-			if (
-				array_key_exists('attributes', $header) &&
-				array_key_exists('href', $header['attributes']) &&
-				strpos($header['attributes']['href'], $this->fileName) !== false) {
-				return;
-			}
-		}
-		$linkToCSS = $this->urlGenerator->linkToRoute('core.Css.getCss', ['appName' => 'icons', 'fileName' => $this->fileName, 'v' => $mtime]);
-		\OC_Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS], null, true);
-	}
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var ISimpleFolder */
+    private $folder;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var string */
+    private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+):\s?url\(["\']?([a-zA-Z0-9-_\~\/\.\?\&\=\:\;\+\,]+)[^;]+;/m';
+
+    /** @var string */
+    private $fileName = 'icons-vars.css';
+
+    private $iconList = 'icons-list.template';
+
+    private $cachedCss;
+    private $cachedList;
+
+    /**
+     * @param ILogger $logger
+     * @param Factory $appDataFactory
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function __construct(ILogger $logger,
+                                Factory $appDataFactory,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory) {
+        $this->logger       = $logger;
+        $this->appData      = $appDataFactory->get('css');
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory  = $timeFactory;
+
+        try {
+            $this->folder = $this->appData->getFolder('icons');
+        } catch (NotFoundException $e) {
+            $this->folder = $this->appData->newFolder('icons');
+        }
+    }
+
+    private function getIconsFromCss(string $css): array {
+        preg_match_all($this->iconVarRE, $css, $matches, PREG_SET_ORDER);
+        $icons = [];
+        foreach ($matches as $icon) {
+            $icons[$icon[1]] = $icon[2];
+        }
+
+        return $icons;
+    }
+
+    /**
+     * @param string $css
+     * @return string
+     * @throws NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function setIconsCss(string $css): string {
+
+        $cachedFile = $this->getCachedList();
+        if (!$cachedFile) {
+            $currentData = '';
+            $cachedFile = $this->folder->newFile($this->iconList);
+        } else {
+            $currentData = $cachedFile->getContent();
+        }
+
+        $cachedVarsCssFile = $this->getCachedCSS();
+        if (!$cachedVarsCssFile) {
+            $cachedVarsCssFile = $this->folder->newFile($this->fileName);
+        }
+
+        $icons = $this->getIconsFromCss($currentData . $css);
+
+        $data = '';
+        $list = '';
+        foreach ($icons as $icon => $url) {
+            $list .= "--$icon: url('$url');";
+            list($location,$color) = $this->parseUrl($url);
+            $svg = false;
+            if ($location !== '' && \file_exists($location)) {
+                $svg = \file_get_contents($location);
+            }
+            if ($svg === false) {
+                $this->logger->debug('Failed to get icon file ' . $location);
+                $data .= "--$icon: url('$url');";
+                continue;
+            }
+            $encode = base64_encode($this->colorizeSvg($svg, $color));
+            $data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
+        }
+
+        if (\strlen($data) > 0 && \strlen($list) > 0) {
+            $data = ":root {\n$data\n}";
+            $cachedVarsCssFile->putContent($data);
+            $list = ":root {\n$list\n}";
+            $cachedFile->putContent($list);
+            $this->cachedList = null;
+            $this->cachedCss = null;
+        }
+
+        return preg_replace($this->iconVarRE, '', $css);
+    }
+
+    /**
+     * @param $url
+     * @return array
+     */
+    private function parseUrl($url): array {
+        $location = '';
+        $color = '';
+        $base = $this->getRoutePrefix() . '/svg/';
+        $cleanUrl = \substr($url, \strlen($base));
+        if (\strpos($url, $base . 'core') === 0) {
+            $cleanUrl = \substr($cleanUrl, \strlen('core'));
+            if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
+                list(,$cleanUrl,$color) = $matches;
+                $location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
+            }
+        } elseif (\strpos($url, $base) === 0) {
+            if(\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
+                list(,$app,$cleanUrl, $color) = $matches;
+                $location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
+                if ($app === 'settings') {
+                    $location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
+                }
+            }
+
+        }
+        return [
+            $location,
+            $color
+        ];
+    }
+
+    /**
+     * @param $svg
+     * @param $color
+     * @return string
+     */
+    public function colorizeSvg($svg, $color): string {
+        if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
+            // Prevent not-sane colors from being written into the SVG
+            $color = '000';
+        }
+
+        // add fill (fill is not present on black elements)
+        $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
+        $svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
+
+        // replace any fill or stroke colors
+        $svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
+        $svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
+        return $svg;
+    }
+
+    private function getRoutePrefix() {
+        $frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+        $prefix = \OC::$WEBROOT . '/index.php';
+        if ($frontControllerActive) {
+            $prefix = \OC::$WEBROOT;
+        }
+        return $prefix;
+    }
+
+    /**
+     * Get icons css file
+     * @return ISimpleFile|boolean
+     */
+    public function getCachedCSS() {
+        try {
+            if (!$this->cachedCss) {
+                $this->cachedCss = $this->folder->getFile($this->fileName);
+            }
+            return $this->cachedCss;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Get icon-vars list template
+     * @return ISimpleFile|boolean
+     */
+    public function getCachedList() {
+        try {
+            if (!$this->cachedList) {
+                $this->cachedList = $this->folder->getFile($this->iconList);
+            }
+            return $this->cachedList;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function injectCss() {
+        $mtime = $this->timeFactory->getTime();
+        $file = $this->getCachedList();
+        if ($file) {
+            $mtime = $file->getMTime();
+        }
+        // Only inject once
+        foreach (\OC_Util::$headers as $header) {
+            if (
+                array_key_exists('attributes', $header) &&
+                array_key_exists('href', $header['attributes']) &&
+                strpos($header['attributes']['href'], $this->fileName) !== false) {
+                return;
+            }
+        }
+        $linkToCSS = $this->urlGenerator->linkToRoute('core.Css.getCss', ['appName' => 'icons', 'fileName' => $this->fileName, 'v' => $mtime]);
+        \OC_Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS], null, true);
+    }
 
 }

core/Controller/SvgController.php

Indentation +106 added lines, -106 removed lines

@@ -35,110 +35,110 @@
 
 class SvgController extends Controller {
 
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IconsCacher */
-	private $iconsCacher;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								ITimeFactory $timeFactory,
-								IAppManager $appManager,
-								IconsCacher $iconsCacher) {
-		parent::__construct($appName, $request);
-
-		$this->serverRoot  = \OC::$SERVERROOT;
-		$this->timeFactory = $timeFactory;
-		$this->appManager = $appManager;
-		$this->iconsCacher = $iconsCacher;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * Generate svg from filename with the requested color
-	 *
-	 * @param string $folder
-	 * @param string $fileName
-	 * @param string $color
-	 * @return DataDisplayResponse|NotFoundResponse
-	 */
-	public function getSvgFromCore(string $folder, string $fileName, string $color = 'ffffff') {
-		$path = $this->serverRoot . "/core/img/$folder/$fileName.svg";
-		return $this->getSvg($path, $color, $fileName);
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * Generate svg from filename with the requested color
-	 *
-	 * @param string $app
-	 * @param string $fileName
-	 * @param string $color
-	 * @return DataDisplayResponse|NotFoundResponse
-	 */
-	public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') {
-
-		if ($app === 'settings') {
-			$path = $this->serverRoot . "/settings/img/$fileName.svg";
-			return $this->getSvg($path, $color, $fileName);
-		}
-
-		$appRootPath = $this->appManager->getAppPath($app);
-		$appPath = substr($appRootPath, strlen($this->serverRoot));
-
-		if (!$appPath) {
-			return new NotFoundResponse();
-		}
-		$path = $this->serverRoot . $appPath ."/img/$fileName.svg";
-		return $this->getSvg($path, $color, $fileName);
-	}
-
-	/**
-	 * Generate svg from filename with the requested color
-	 *
-	 * @param string $path
-	 * @param string $color
-	 * @param string $fileName
-	 * @return DataDisplayResponse|NotFoundResponse
-	 */
-	private function getSvg(string $path, string $color, string $fileName) {
-		if (!file_exists($path)) {
-			return new NotFoundResponse();
-		}
-
-		$svg = file_get_contents($path);
-
-		if ($svg === null) {
-			return new NotFoundResponse();
-		}
-
-		$svg = $this->iconsCacher->colorizeSvg($svg, $color);
-
-		$response = new DataDisplayResponse($svg, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
-
-		// Set cache control
-		$ttl = 31536000;
-		$response->cacheFor($ttl);
-		$response->addHeader('Content-Disposition', 'inline; filename="' . $fileName . '.svg"');
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-
-		return $response;
-	}
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /** @var IconsCacher */
+    private $iconsCacher;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ITimeFactory $timeFactory,
+                                IAppManager $appManager,
+                                IconsCacher $iconsCacher) {
+        parent::__construct($appName, $request);
+
+        $this->serverRoot  = \OC::$SERVERROOT;
+        $this->timeFactory = $timeFactory;
+        $this->appManager = $appManager;
+        $this->iconsCacher = $iconsCacher;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * Generate svg from filename with the requested color
+     *
+     * @param string $folder
+     * @param string $fileName
+     * @param string $color
+     * @return DataDisplayResponse|NotFoundResponse
+     */
+    public function getSvgFromCore(string $folder, string $fileName, string $color = 'ffffff') {
+        $path = $this->serverRoot . "/core/img/$folder/$fileName.svg";
+        return $this->getSvg($path, $color, $fileName);
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * Generate svg from filename with the requested color
+     *
+     * @param string $app
+     * @param string $fileName
+     * @param string $color
+     * @return DataDisplayResponse|NotFoundResponse
+     */
+    public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') {
+
+        if ($app === 'settings') {
+            $path = $this->serverRoot . "/settings/img/$fileName.svg";
+            return $this->getSvg($path, $color, $fileName);
+        }
+
+        $appRootPath = $this->appManager->getAppPath($app);
+        $appPath = substr($appRootPath, strlen($this->serverRoot));
+
+        if (!$appPath) {
+            return new NotFoundResponse();
+        }
+        $path = $this->serverRoot . $appPath ."/img/$fileName.svg";
+        return $this->getSvg($path, $color, $fileName);
+    }
+
+    /**
+     * Generate svg from filename with the requested color
+     *
+     * @param string $path
+     * @param string $color
+     * @param string $fileName
+     * @return DataDisplayResponse|NotFoundResponse
+     */
+    private function getSvg(string $path, string $color, string $fileName) {
+        if (!file_exists($path)) {
+            return new NotFoundResponse();
+        }
+
+        $svg = file_get_contents($path);
+
+        if ($svg === null) {
+            return new NotFoundResponse();
+        }
+
+        $svg = $this->iconsCacher->colorizeSvg($svg, $color);
+
+        $response = new DataDisplayResponse($svg, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
+
+        // Set cache control
+        $ttl = 31536000;
+        $response->cacheFor($ttl);
+        $response->addHeader('Content-Disposition', 'inline; filename="' . $fileName . '.svg"');
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT' . $ttl . 'S'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+        $response->addHeader('Pragma', 'cache');
+
+        return $response;
+    }
 }