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

issue 409, off CDN feature when use ssl(retry)

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

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

@ -12,12 +12,18 @@
var $cssMapIndex = array(); var $cssMapIndex = array();
var $jsHeadMapIndex = array(); var $jsHeadMapIndex = array();
var $jsBodyMapIndex = array(); var $jsBodyMapIndex = array();
var $is_ssl = false;
function FrontEndFileHandler() function isSsl()
{ {
$url_info = parse_url(getRequestUriByServerEnviroment()); if ($GLOBAL['__XE_IS_SSL__']) return $GLOBAL['__XE_IS_SSL__'];
if ($url_info['scheme'] == 'https') $this->is_ssl = true;
$url_info = parse_url(Context::getRequestUrl());
if ($url_info['scheme'] == 'https')
$GLOBAL['__XE_IS_SSL__'] = true;
else
$GLOBAL['__XE_IS_SSL__'] = false;
return $GLOBAL['__XE_IS_SSL__'];
} }
/** /**
@ -142,7 +148,7 @@
$result = array(); $result = array();
foreach($map as $file) foreach($map as $file)
{ {
if ($this->is_ssl == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%') if ($this->isSsl() == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
{ {
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName; $fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
} }
@ -177,7 +183,7 @@
$result = array(); $result = array();
foreach($map as $file) foreach($map as $file)
{ {
if ($this->is_ssl == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%') if ($this->isSsl() == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
{ {
$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName; $fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
} }