fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-20 02:42:23 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up path handling in FrontEndFileHandler

Browse source
This commit is contained in:
Kijin Sung 2016-05-03 21:44:13 +09:00
parent 7709eb97c6
commit 99a86a072b
1 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -273,11 +273,11 @@ class FrontEndFileHandler extends Handler
}
$file->fileName = $minifiedFileHash . '.' . $minifiedFileName;
$file->filePath = $this->_getAbsFileUrl('./files/cache/minify');
$file->filePath = \RX_BASEURL . 'files/cache/minify';
$file->fileRealPath = \RX_BASEDIR . 'files/cache/minify';
$file->fileFullPath = $minifiedFilePath;
$file->keyName = $minifiedFileHash . '.' . $file->fileNameNoExt . '.' . $file->fileExtension;
$file->cdnPath = $this->_normalizeFilePath('./files/cache/minify');
$file->cdnPath = './files/cache/minify';
$file->isMinified = true;
}
@ -311,11 +311,11 @@ class FrontEndFileHandler extends Handler
}
$file->fileName = $compiledFileHash . '.' . $compiledFileName;
$file->filePath = $this->_getAbsFileUrl('./files/cache/minify');
$file->filePath = \RX_BASEURL . 'files/cache/minify';
$file->fileRealPath = \RX_BASEDIR . 'files/cache/minify';
$file->fileFullPath = $compiledFilePath;
$file->keyName = $compiledFileHash . '.' . $file->fileNameNoExt . '.' . $file->fileExtension;
$file->cdnPath = $this->_normalizeFilePath('./files/cache/minify');
$file->cdnPath = './files/cache/minify';
$file->isMinified = true;
$file->fileExtension = 'css';
}
@ -488,24 +488,11 @@ class FrontEndFileHandler extends Handler
*/
function _getAbsFileUrl($path)
{
$path = $this->_normalizeFilePath($path);
if(strpos($path, './') === 0)
$path = Rhymix\Framework\Filters\FilenameFilter::cleanPath($path);
if (!strncmp($path, \RX_BASEDIR, strlen(\RX_BASEDIR)))
{
if(dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')
{
$path = '/' . substr($path, 2);
}
else
{
$path = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($path, 2);
}
$path = \RX_BASEURL . substr($path, strlen(\RX_BASEDIR));
}
else if(strpos($file, '../') === 0)
{
$path = $this->_normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$path}");
}
return $path;
}