From ad20af619fa3d71d806c12fb10b418ace9cf0f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Wed, 27 Dec 2017 16:44:14 +0100
Subject: [PATCH] getWebDir function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 lib/private/Template/SCSSCacher.php | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index eb3636a189..300187cf74 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -102,21 +102,7 @@ class SCSSCacher {
 		$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
 
 		$path = implode('/', $path);
-		$webDir = null;
-
-		// Detect if path is within an app path
-		$app_paths = $this->config->getSystemValue('apps_paths');
-		if (!empty($app_paths)) {
-			foreach ($app_paths as $app_path) {
-				if (strpos($path, $app_path["path"]) === 0) {
-					$webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
-					break;
-				}
-			}
-		}
-		if (is_null($webDir)) {
-			$webDir = substr($path, strlen($this->serverRoot));
-		}
+		$webDir = $this->getWebDir($path);
 
 		try {
 			$folder = $this->appData->getFolder($app);
@@ -323,4 +309,22 @@ class SCSSCacher {
 		$frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
 		return substr(md5($this->urlGenerator->getBaseUrl() . $frontendController), 0, 8) . '-' . $cssFile;
 	}
+
+	/**
+	 * Prepend hashed base url to the css file
+	 * @param string $path the css file path
+	 * @return string the webDir
+	 */
+	private function getWebDir($path) {
+		// Detect if path is within an app path
+		$app_paths = $this->config->getSystemValue('apps_paths');
+		if (!empty($app_paths)) {
+			foreach ($app_paths as $app_path) {
+				if (strpos($path, $app_path["path"]) === 0) {
+					return $app_path["url"].str_replace($app_path["path"], '', $path);
+				}
+			}
+		}
+		return substr($path, strlen($this->serverRoot));
+	}
 }