fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 409, off CDN feature when use ssl

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9515 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-10-07 09:05:23 +00:00
parent 6cf26c03e4
commit 7e171fe1a2
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,13 @@
var $cssMapIndex = array();
var $jsHeadMapIndex = array();
var $jsBodyMapIndex = array();
var $is_ssl = false;
function FrontEndFileHandler()
{
$url_info = parse_url(getRequestUriByServerEnviroment());
if ($url_info['scheme'] == 'https') $this->is_ssl = true;
}
/**
* @brief load front end file
@ -135,7 +142,7 @@
$result = array();
foreach($map as $file)
{
if ($useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
if ($this->is_ssl == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
{
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
}
@ -170,7 +177,7 @@
$result = array();
foreach($map as $file)
{
if ($useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
if ($this->is_ssl == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
{
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
}