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

remove cdn feature

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13187 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
khongchi 2013-11-08 06:04:28 +00:00
parent bce0a0b6d4
commit 3581db5932
83 changed files with 137 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,28 +87,15 @@ class FrontEndFileHandler extends Handler
* $args[3]: index
* </pre>
*
* If $useCdn set true, use CDN instead local file.
* CDN path = $cdnPrefix . $cdnVersion . $args[0]<br />
* <br />
* i.e.<br />
* $cdnPrefix = 'http://static.xpressengine.com/core/';<br />
* $cdnVersion = 'ardent1';<br />
* $args[0] = './common/js/xe.js';<br />
* The CDN path is http://static.xprssengine.com/core/ardent1/common/js/xe.js.<br />
*
* @param array $args Arguments
* @param bool $useCdn If set true, use cdn instead local file
* @param string $cdnPrefix CDN url prefix. (http://static.xpressengine.com/core/)
* @param string $cdnVersion CDN version string (ardent1)
* @return void
* */
function loadFile($args, $useCdn = FALSE, $cdnPrefix = '', $cdnVersion = '')
function loadFile($args)
{
if(!is_array($args))
{
$args = array($args);
}
$file = $this->getFileInfo($args[0], $args[2], $args[1]);
$availableExtension = array('css' => 1, 'js' => 1);
@ -117,9 +104,6 @@ class FrontEndFileHandler extends Handler
return;
}
$file->useCdn = $useCdn;
$file->cdnPrefix = $cdnPrefix;
$file->cdnVersion = $cdnVersion;
$file->index = (int) $args[3];
if($file->fileExtension == 'css')
@ -294,23 +278,14 @@ class FrontEndFileHandler extends Handler
$this->_sortMap($map, $mapIndex);
$dbInfo = Context::getDBInfo();
$useCdn = $dbInfo->use_cdn;
$result = array();
foreach($map as $indexedMap)
{
foreach($indexedMap as $file)
{
if($this->isSsl() == FALSE && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
{
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
}
else
{
$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';
$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;
}
$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';
$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;
$result[] = array('file' => $fullFilePath, 'media' => $file->media, 'targetie' => $file->targetIe);
}
}
@ -339,23 +314,14 @@ class FrontEndFileHandler extends Handler
$this->_sortMap($map, $mapIndex);
$dbInfo = Context::getDBInfo();
$useCdn = $dbInfo->use_cdn;
$result = array();
foreach($map as $indexedMap)
{
foreach($indexedMap as $file)
{
if($this->isSsl() == FALSE && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
{
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
}
else
{
$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';
$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;
}
$noneCache = (is_readable($file->cdnPath . '/' . $file->fileName)) ? '?' . date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName)) : '';
$fullFilePath = $file->filePath . '/' . $file->fileName . $noneCache;
$result[] = array('file' => $fullFilePath, 'targetie' => $file->targetIe);
}
}