nextcloud / server

core/Controller/SvgController.php

Indentation +100 added lines, -100 removed lines

@@ -43,104 +43,104 @@
 
 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') {
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-		} catch (AppPathNotFoundException $e) {
-			return new NotFoundResponse();
-		}
-
-		$path = $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') {
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+        } catch (AppPathNotFoundException $e) {
+            return new NotFoundResponse();
+        }
+
+        $path = $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;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 	 * @return DataDisplayResponse|NotFoundResponse
 	 */
 	public function getSvgFromCore(string $folder, string $fileName, string $color = 'ffffff') {
-		$path = $this->serverRoot . "/core/img/$folder/$fileName.svg";
+		$path = $this->serverRoot."/core/img/$folder/$fileName.svg";
 		return $this->getSvg($path, $color, $fileName);
 	}
 
@@ -104,7 +104,7 @@ 
 			return new NotFoundResponse();
 		}
 
-		$path = $appPath . "/img/$fileName.svg";
+		$path = $appPath."/img/$fileName.svg";
 		return $this->getSvg($path, $color, $fileName);
 	}
 
@@ -134,10 +134,10 @@ 
 		// Set cache control
 		$ttl = 31536000;
 		$response->cacheFor($ttl);
-		$response->addHeader('Content-Disposition', 'inline; filename="' . $fileName . '.svg"');
+		$response->addHeader('Content-Disposition', 'inline; filename="'.$fileName.'.svg"');
 		$expires = new \DateTime();
 		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
+		$expires->add(new \DateInterval('PT'.$ttl.'S'));
 		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
 		$response->addHeader('Pragma', 'cache');