Merge branch 'server_alias' into 'master'

Server alias

before:
```
ServerAlias domain
      ServerAlias alias0
      ServerAlias alias1
```
after (8 alias per line example):
```
ServerAlias www.kljsf.com kljsf.com www.kjdf.org kjdf.org www.klsdjf.put klsdjf.put www.skdf.jak skdf.jak
ServerAlias www.abc.com abc.com www.bca.com bca.com www.ksd.com ksd.com www.lkjas.com lkjas.com
ServerAlias www.kak.com kak.com www.skdf.jaku skdf.jaku www.klsjdf.jks klsjdf.jks www.lksdjf.kj lksdjf.kj
ServerAlias www.lkdj.kjdf lkdj.kjdf www.klsdjf.jksdf klsdjf.jksdf www.hjd.hja hjd.hja www.lksjdf.ujk lksjdf.ujk
ServerAlias www.lksjdfl.lskdjf lksjdfl.lskdjf www.kjsdlkfj.sdfj kjsdlkfj.sdfj www.lksdjf.sdkf lksdjf.sdkf www.kjflksjf.ksdfl kjflksjf.ksdfl
ServerAlias www.lskdjf.ksdf lskdjf.ksdf www.lksjdf.lksjdf lksjdf.lksjdf www.kjhf.ksjdf kjhf.ksjdf
```

See merge request !543

Author: Marius Burkard

server/plugins-available/apache2_plugin.inc.php

@@ -1422,31 +1422,31 @@ function update($event_name, $data) {
 			unset($client);
 			unset($aa_search);
 			unset($aa_replace);
-			$server_alias[] .= $auto_alias.' ';
+			$server_alias[] .= $auto_alias;
 		}
 
 		// get alias domains (co-domains and subdomains)
 		$aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ? AND active = 'y' AND (type != 'vhostsubdomain' AND type != 'vhostalias')", $data['new']['domain_id']);
 		$alias_seo_redirects = array();
 		switch($data['new']['subdomain']) {
 		case 'www':
-			$server_alias[] = 'www.'.$data['new']['domain'].' ';
+			$server_alias[] = 'www.'.$data['new']['domain'];
 			break;
 		case '*':
-			$server_alias[] = '*.'.$data['new']['domain'].' ';
+			$server_alias[] = '*.'.$data['new']['domain'];
 			break;
 		}
 		if(is_array($aliases)) {
 			foreach($aliases as $alias) {
 				switch($alias['subdomain']) {
 				case 'www':
-					$server_alias[] .= 'www.'.$alias['domain'].' '.$alias['domain'].' ';
+					$server_alias[] .= 'www.'.$alias['domain'].' '.$alias['domain'];
 					break;
 				case '*':
-					$server_alias[] .= '*.'.$alias['domain'].' '.$alias['domain'].' ';
+					$server_alias[] .= '*.'.$alias['domain'].' '.$alias['domain'];
 					break;
 				default:
-					$server_alias[] .= $alias['domain'].' ';
+					$server_alias[] .= $alias['domain'];
 					break;
 				}
 				$app->log('Add server alias: '.$alias['domain'], LOGLEVEL_DEBUG);
@@ -1513,22 +1513,18 @@ function update($event_name, $data) {
 		}
 
 		//* If we have some alias records
-		if(count($server_alias) > 0) {
-			$server_alias_str = '';
-			$n = 0;
-
-			// begin a new ServerAlias line after 30 alias domains
-			foreach($server_alias as $tmp_alias) {
-				if($n % 30 == 0) $server_alias_str .= "\n    ServerAlias ";
-				$server_alias_str .= $tmp_alias;
-			}
-			unset($tmp_alias);
-
-			$tpl->setVar('alias', trim($server_alias_str));
+		if($server_alias) {
+			//* begin a new ServerAlias line after 32 alias domains to avoid apache bugs
+			$server_alias_str = 'ServerAlias '.$server_alias[0];
+			for($n=1;$n<count($server_alias);++$n)
+				$server_alias_str .= ($n % 32?' ':"\nServerAlias ").$server_alias[$n];
+			$tpl->setVar('alias', $server_alias_str);
+			unset($server_alias_str);
+			unset($n);
 		} else {
 			$tpl->setVar('alias', '');
 		}
-		
+
 		if (count($rewrite_wildcard_rules) > 0) $rewrite_rules = array_merge($rewrite_rules, $rewrite_wildcard_rules); // Append wildcard rules to the end of rules
 
 		if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0 || $data['new']['rewrite_to_https'] == 'y') {