Svg from app

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Jun 29, 2018 · 10ebd3b · 10ebd3b
1 parent 74fa4fb
commit 10ebd3b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
@@ -59,8 +59,39 @@ public function __construct(string $appName,
 	 * @param string $color
 	 * @return DataDisplayResponse|NotFoundException
 	 */
-	public function getSvg(string $fileName, $color = 'ffffff') {
+	public function getSvgFromCore(string $fileName, string $color = 'ffffff') {
 		$path = $this->serverRoot . "/core/img/actions/$fileName.svg";
+		return $this->getSvg($path, $color);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 *
+	 * Generate svg from filename with the requested color
+	 *
+	 * @param string $fileName
+	 * @param string $color
+	 * @return DataDisplayResponse|NotFoundException
+	 */
+	public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') {
+		$appPath = \OC_App::getAppWebPath($app);
+		if (!$appPath) {
+			return new NotFoundResponse();
+		}
+		$path = $this->serverRoot . $appPath ."/img/$fileName.svg";
+		return $this->getSvg($path, $color);
+	}
+
+
+	/**
+	 * Generate svg from filename with the requested color
+	 *
+	 * @param string $path
+	 * @param string $color
+	 * @return DataDisplayResponse|NotFoundException
+	 */
+	private function getSvg(string $path, string $color) {
 		if (!file_exists($path)) {
 			return new NotFoundResponse();
 		}

diff --git a/core/routes.php b/core/routes.php
@@ -61,7 +61,8 @@
 		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
 		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
 		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
-		['name' => 'Svg#getSvg', 'url' => '/svg/{fileName}/{color}', 'verb' => 'GET'],
+		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/{fileName}/{color}', 'verb' => 'GET'],
+		['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}/{color}', 'verb' => 'GET'],
 		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
 		['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
 		['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],