upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 06:37:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Fixed scss url rewriting

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

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

@ -103,7 +103,17 @@ class SCSSCacher {
$path = implode('/', $path);
$webDir = substr($path, strlen($this->serverRoot)+1);
// Detect if path is within an app path
$app_paths = $this->config->getSystemValue('apps_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 {
$folder = $this->appData->getFolder($app);
@ -155,7 +165,7 @@ class SCSSCacher {
}
}
}
return true;
return false;
} catch(NotFoundException $e) {
return false;
}
@ -283,12 +293,7 @@ class SCSSCacher {
*/
private function rebaseUrls($css, $webDir) {
$re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
// OC\Route\Router:75
if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
$subst = 'url(\'../../'.$webDir.'/$1\')';
} else {
$subst = 'url(\'../../../'.$webDir.'/$1\')';
}
$subst = 'url(\''.$webDir.'/$1\')';
return preg_replace($re, $subst, $css);
}
@ -299,6 +304,7 @@ class SCSSCacher {
* @return string
*/
public function getCachedSCSS($appName, $fileName) {
//var_dump([$appName, $fileName]);
$tmpfileLoc = explode('/', $fileName);
$fileName = array_pop($tmpfileLoc);
$fileName = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName));