remove superfluous call to 'getDomainRedirectCode' as its been called…

… before; allow changing of redirect-code when domain has 'ssl-redirect' = 1
froxlor · Jul 28, 2015 · 8332b77 · 8332b77
1 parent 5d423c9
commit 8332b77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/customer_domains.php b/customer_domains.php
@@ -307,6 +307,7 @@
 					// 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 @@
 					// 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
@@ -780,7 +780,6 @@ protected function getVhostContent($domain, $ssl_vhost = false) {
 			$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 {