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

change cdn feature

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9017 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-04 08:48:26 +00:00
parent b45522cdc4
commit 8062daecf3
5 changed files with 59 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<?php
/**
* @class FrontEndFileHandler
* @author NHN (developer@xpressengine.com)
* @author NHN (developers@xpressengine.com)
**/
class FrontEndFileHandler extends Handler
@ -27,7 +27,7 @@
* $args[2]: target IE
* $args[3]: index
**/
function loadFile($args, $cdnPath = '')
function loadFile($args, $useCdn = false, $cdnPrefix = '', $cdnVersion = '')
{
if (!is_array($args)) $args = array($args);
@ -35,7 +35,14 @@
$file->fileName = $pathInfo['basename'];
$file->filePath = $this->_getAbsFileUrl($pathInfo['dirname']);
$file->fileExtension = strtolower($pathInfo['extension']);
$file->cdnPath = $cdnPath;
if (strpos($file->filePath, '://') == false)
{
$file->useCdn = $useCdn;
$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
$file->cdnPrefix = $cdnPrefix;
$file->cdnVersion = $cdnVersion;
}
$availableExtension = array('css', 'js');
if (!in_array($file->fileExtension, $availableExtension)) return;
@ -46,6 +53,7 @@
if ($file->fileExtension == 'css')
{
$file->media = $args[1];
if (!$file->media) $file->media = 'all';
$map = &$this->cssMap;
$mapIndex = &$this->cssMapIndex;
$key = $file->filePath . $file->fileName . "\t" . $file->targetIe . "\t" . $file->media;
@ -123,12 +131,13 @@
$dbInfo = Context::get('db_info');
$useCdn = $dbInfo->use_cdn;
$result = array();
foreach($map as $file)
{
if ($useCdn == 'Y' && $file->cdnPath)
if ($useCdn == 'Y' && $file->useCdn)
{
$fullFilePath = __XE_CDN__ . $file->cdnPath . '/' . $file->fileName;
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
}
else
{
@ -157,12 +166,13 @@
$dbInfo = Context::get('db_info');
$useCdn = $dbInfo->use_cdn;
$result = array();
foreach($map as $file)
{
if ($useCdn == 'Y' && $file->cdnPath)
if ($useCdn == 'Y' && $file->useCdn)
{
$fullFilePath = __XE_CDN__ . $file->cdnPath . '/' . $file->fileName;
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
}
else
{