maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

remove superfluous call to 'getDomainRedirectCode' as its been called before; allow changing of redirect-code when domain has 'ssl-redirect' = 1

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2015-07-28 13:20:11 +02:00
parent f4f1315715
commit fce9de7372
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customer_domains.php
View File

@@ -307,6 +307,7 @@ if ($page == 'overview') {
// ssl ip/port assigned to the domain // ssl ip/port assigned to the domain
if (domainHasSslIpPort($domain_check['id']) == true) { if (domainHasSslIpPort($domain_check['id']) == true) {
$ssl_redirect = '1'; $ssl_redirect = '1';
$_doredirect = true;
} else { } else {
standard_error('sslredirectonlypossiblewithsslipport'); standard_error('sslredirectonlypossiblewithsslipport');
} }
@@ -548,6 +549,7 @@ if ($page == 'overview') {
// ssl ip/port assigned to the domain // ssl ip/port assigned to the domain
if (domainHasSslIpPort($id) == true) { if (domainHasSslIpPort($id) == true) {
$ssl_redirect = '1'; $ssl_redirect = '1';
$_doredirect = true;
} else { } else {
standard_error('sslredirectonlypossiblewithsslipport'); standard_error('sslredirectonlypossiblewithsslipport');
} }

1
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -788,7 +788,6 @@ class apache {
$vhost_content .= ' RewriteRule ^/(.*) '. $corrected_docroot.'$1 ' . $modrew_red . "\n"; $vhost_content .= ' RewriteRule ^/(.*) '. $corrected_docroot.'$1 ' . $modrew_red . "\n";
$vhost_content .= ' </IfModule>' . "\n"; $vhost_content .= ' </IfModule>' . "\n";
$code = getDomainRedirectCode($domain['id']);
$vhost_content .= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n"; $vhost_content .= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n";
} else { } else {