Merge branch '4325-redir-off' into 'develop'

Till Brehm · Till Brehm · commit 517e8dfb44c2 · 2020-09-15T13:54:53.000+02:00
Disable http to https redirect when SSL is turned off

Closes #4325

See merge request ispconfig/ispconfig3!1170
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1491,6 +1491,10 @@ function update($event_name, $data) {
 			$tpl->setVar('rewrite_enabled', 0);
 		}
 
+		if($data['new']['ssl'] == 'n') {
+			$tpl->setVar('rewrite_to_https', 'n');
+		}
+
 		//$tpl->setLoop('redirects',$rewrite_rules);
 
 		/**

Original file line number	Diff line number	Diff line change
`@@ -1491,6 +1491,10 @@ function update($event_name, $data) {`
`1491`	`1491`	`$tpl->setVar('rewrite_enabled', 0);`
`1492`	`1492`	`}`
`1493`	`1493`
	`1494`	`+ if($data['new']['ssl'] == 'n') {`
	`1495`	`+ $tpl->setVar('rewrite_to_https', 'n');`
	`1496`	`+ }`
	`1497`	`+`
`1494`	`1498`	`//$tpl->setLoop('redirects',$rewrite_rules);`
`1495`	`1499`
`1496`	`1500`	`/**`