diff --git a/customer_domains.php b/customer_domains.php index 58ea32b1..416f3e4b 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -307,6 +307,7 @@ if ($page == 'overview') { // ssl ip/port assigned to the domain if (domainHasSslIpPort($domain_check['id']) == true) { $ssl_redirect = '1'; + $_doredirect = true; } else { standard_error('sslredirectonlypossiblewithsslipport'); } @@ -548,6 +549,7 @@ if ($page == 'overview') { // ssl ip/port assigned to the domain if (domainHasSslIpPort($id) == true) { $ssl_redirect = '1'; + $_doredirect = true; } else { standard_error('sslredirectonlypossiblewithsslipport'); } diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 9d6887b9..02e7820f 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -780,7 +780,6 @@ class apache { $vhost_content .= ' RewriteRule ^/(.*) '. $corrected_docroot.'$1 ' . $modrew_red . "\n"; $vhost_content .= ' ' . "\n"; - $code = getDomainRedirectCode($domain['id']); $vhost_content .= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n"; } else {