Merge branch '6739-correct-indentation-of-serveralias-in-apache-vhost-files' into 'develop'

Till Brehm · Till Brehm · commit f83f54f5f10e · 2024-07-11T17:32:36.000Z
Indentation wrong on ServerAlias with apache vhosts, #6739

Closes #6739

See merge request ispconfig/ispconfig3!1933
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1508,7 +1508,7 @@ function update($event_name, $data) {
 
 			// begin a new ServerAlias line after 30 alias domains
 			foreach($server_alias as $tmp_alias) {
-				if($n % 30 == 0) $server_alias_str .= "\n    ServerAlias ";
+				if($n % 30 == 0) $server_alias_str .= "\n                ServerAlias ";
 				$server_alias_str .= $tmp_alias;
 			}
 			unset($tmp_alias);

Original file line number	Diff line number	Diff line change
`@@ -1508,7 +1508,7 @@ function update($event_name, $data) {`
`1508`	`1508`
`1509`	`1509`	`// begin a new ServerAlias line after 30 alias domains`
`1510`	`1510`	`foreach($server_alias as $tmp_alias) {`
`1511`		`- if($n % 30 == 0) $server_alias_str .= "\n ServerAlias ";`
	`1511`	`+ if($n % 30 == 0) $server_alias_str .= "\n ServerAlias ";`
`1512`	`1512`	`$server_alias_str .= $tmp_alias;`
`1513`	`1513`	`}`
`1514`	`1514`	`unset($tmp_alias);`