Only disable HTTPS redirect when SSL is turned off (#4325)

thom · thom · commit f0cc342e06de · 2020-09-15T10:30:08.000+02:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1492,9 +1492,7 @@ function update($event_name, $data) {
 		}
 
 		if($data['new']['ssl'] == 'n') {
-			$tpl->setVar('rewrite_enabled', 0);
-		} else {
-			$tpl->setVar('rewrite_enabled', 1);
+			$tpl->setVar('rewrite_to_https', 'n');
 		}
 
 		//$tpl->setLoop('redirects',$rewrite_rules);

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