From 89b6bc9424060e72abaf5b20a5ca531aca74c03f Mon Sep 17 00:00:00 2001
From: =?utf8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Thu, 28 Dec 2017 10:25:10 +0100
Subject: [PATCH] Use OC_Util function for app web path
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 80fa116470b..8da4d51b749 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -102,7 +102,7 @@ class SCSSCacher {
 		$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
 
 		$path = implode('/', $path);
-		$webDir = $this->getWebDir($path);
+		$webDir = $this->getWebDir($path, $app);
 
 		try {
 			$folder = $this->appData->getFolder($app);
@@ -310,20 +310,23 @@ class SCSSCacher {
 	}
 
 	/**
-	 * Prepend hashed base url to the css file
+	 * Get WebDir root
 	 * @param string $path the css file path
+	 * @param string $app the app name
 	 * @return string the webDir
 	 */
-	private function getWebDir($path) {
+	private function getWebDir($path, $app) {
+		// Detect if path is within server root
+		if(strpos($path, $this->serverRoot) > -1) {
+			return \OC::$WEBROOT.substr($path, strlen($this->serverRoot));
+		}
 		// 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);
-				}
-			}
+		if($appWebPath = \OC_App::getAppWebPath($app)) {
+			// Get the file path within the app directory
+			$appDirectoryPath = explode($app, $path)[1];
+			// Remove the webroot
+			return str_replace(\OC::$WEBROOT, '', $appWebPath.$appDirectoryPath);
 		}
-		return substr($path, strlen($this->serverRoot));
+		return \OC::$WEBROOT.substr($path, strlen($this->serverRoot));
 	}
 }
-- 
2.39.5