beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reusable Adjusting Domains Template Code for Redirecting Non-SSL to SSL

Browse source
This commit is contained in:
earnolmartin 2018-06-14 13:56:48 -06:00
parent 44c9cdca2e
commit fb110601cc
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ehcp/classapp.php
View file

@ -13164,7 +13164,7 @@ function getStripNonSSLSectionForDomain($sslInfo, $stripSSLSectionFromTemplate){
return $stripNonSSLSectionFromTemplate;
}
function adjustDomainTemplateDependingOnSSLSettings($webserver_template, $ar1, $type = 'domain', $echoOn = true){
function adjustDomainTemplateDependingOnSSLSettings($webserver_template, &$ar1, $type = 'domain', $echoOn = true){
$sslInfo = $this->getSSLSettingForDomain($ar1['domainname']);
$stripSSLSectionFromTemplate = $this->getStripSSLSectionForDomain($sslInfo);
$stripNonSSLSectionFromTemplate = $this->getStripNonSSLSectionForDomain($sslInfo, $stripSSLSectionFromTemplate);
@ -13194,6 +13194,12 @@ function adjustDomainTemplateDependingOnSSLSettings($webserver_template, $ar1, $
$httpOnlyRedirect = str_replace("{domainname_redirect}", "https://{domainname_redirect}", $httpOnlyRedirect);
$ar1['domainname_redirect'] = $ar1['domainname'];
if($type == "subdomain"){
// Gotta use the subdomain here
$httpOnlyRedirect = str_replace("{domainname}", "{subdomain}.{domainname}", $httpOnlyRedirect);
$ar1['domainname_redirect'] = $ar1["subdomain"];
}
if($this->miscconfig['webservertype'] == "nginx"){
$ar1['domainname_redirect'] = '$host';
}else{