From fce9de7372d248f45876d44b4e9045014ab458b3 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 28 Jul 2015 13:20:11 +0200
Subject: [PATCH] remove superfluous call to 'getDomainRedirectCode' as its
 been called before; allow changing of redirect-code when domain has
 'ssl-redirect' = 1

---
 customer_domains.php                           | 2 ++
 scripts/jobs/cron_tasks.inc.http.10.apache.php | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

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 d186ff5f..9bc36c44 100644
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -788,7 +788,6 @@ class apache {
 			$vhost_content .= '    RewriteRule ^/(.*) '. $corrected_docroot.'$1 ' . $modrew_red . "\n";
 			$vhost_content .= '  </IfModule>' . "\n";
 
-			$code = getDomainRedirectCode($domain['id']);
 			$vhost_content .= '  Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n";
 
 		} else {