wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

getWebDir function

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-12-27 16:44:14 +01:00
parent 89ca9cb35c
commit ad20af619f
No known key found for this signature in database
GPG key ID: FB5ACEED51955BF8
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/private/Template/SCSSCacher.php
View file

@ -102,21 +102,7 @@ class SCSSCacher {
$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)); $fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
$path = implode('/', $path); $path = implode('/', $path);
$webDir = null; $webDir = $this->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) {
$webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
break;
}
}
}
if (is_null($webDir)) {
$webDir = substr($path, strlen($this->serverRoot));
}
try { try {
$folder = $this->appData->getFolder($app); $folder = $this->appData->getFolder($app);
@ -323,4 +309,22 @@ class SCSSCacher {
$frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'); $frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
return substr(md5($this->urlGenerator->getBaseUrl() . $frontendController), 0, 8) . '-' . $cssFile; 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));
}
} }