From 74f21d865768275cfc8e3f050d47f626ab15fa48 Mon Sep 17 00:00:00 2001
From: "ncomputers.org" <contact@ncomputers.org>
Date: Fri, 3 Mar 2017 20:17:46 -0600
Subject: [PATCH 1/3] seo_redirects improved

---
 server/plugins-available/apache2_plugin.inc.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 1b5993a92c..a752d33050 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -3440,37 +3440,35 @@ class apache2_plugin {
 		if(substr($web['domain'], 0, 2) === '*.') $web['subdomain'] = '*';
 
 		if($web['subdomain'] == 'www' || $web['subdomain'] == '*'){
+			$domain = str_replace('.', '\.', $web['domain']);
 			if($web['seo_redirect'] == 'non_www_to_www'){
-				$seo_redirects[$prefix.'seo_redirect_origin_domain'] = str_replace('.', '\.', $web['domain']);
+				$seo_redirects[$prefix.'seo_redirect_origin_domain'] = $domain;
 				$seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
 				$seo_redirects[$prefix.'seo_redirect_operator'] = '';
 			}
 			if($web['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
-				// ^(example\.com|(?!\bwww\b)\.example\.com)$
-				// ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
-				$seo_redirects[$prefix.'seo_redirect_origin_domain'] = '('.str_replace('.', '\.', $web['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $web['domain']).'))';
+				$seo_redirects[$prefix.'seo_redirect_origin_domain'] = $domain.'|.*\.'.$domain.'(?<!^www\.'.$domain.')';
 				$seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
 				$seo_redirects[$prefix.'seo_redirect_operator'] = '';
 			}
 			if($web['seo_redirect'] == '*_to_www_domain_tld'){
-				$seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $web['domain']);
+				$seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.$domain;
 				$seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
 				$seo_redirects[$prefix.'seo_redirect_operator'] = '!';
 			}
 		}
 		if($web['seo_redirect'] == 'www_to_non_www'){
-			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $web['domain']);
+			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.$domain;
 			$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
 			$seo_redirects[$prefix.'seo_redirect_operator'] = '';
 		}
 		if($web['seo_redirect'] == '*_domain_tld_to_domain_tld'){
-			// ^(.+)\.example\.com$
-			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = '(.+)\.'.str_replace('.', '\.', $web['domain']);
+			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = '.*\.'.$domain;
 			$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
 			$seo_redirects[$prefix.'seo_redirect_operator'] = '';
 		}
 		if($web['seo_redirect'] == '*_to_domain_tld'){
-			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = str_replace('.', '\.', $web['domain']);
+			$seo_redirects[$prefix.'seo_redirect_origin_domain'] = $domain;
 			$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
 			$seo_redirects[$prefix.'seo_redirect_operator'] = '!';
 		}
-- 
GitLab


From bdc0f24a5bf7890b6696d2e5e46a2127b36ff88d Mon Sep 17 00:00:00 2001
From: Oliver <contact@ncomputers.org>
Date: Sat, 4 Mar 2017 04:26:55 +0100
Subject: [PATCH 2/3] Update apache2_plugin.inc.php

---
 server/plugins-available/apache2_plugin.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index a752d33050..c23b69edf9 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1513,7 +1513,7 @@ class apache2_plugin {
 		}
 
 		//* If we have some alias records
-		if($server_alias)) {
+		if($server_alias) {
 			$tpl->setVar('alias', 'ServerAlias '.implode(' ',$server_alias));
 		} else {
 			$tpl->setVar('alias', '');
-- 
GitLab


From 1e9a68db95fda1219a477bd65148def0cbd7b0f5 Mon Sep 17 00:00:00 2001
From: "ncomputers.org" <contact@ncomputers.org>
Date: Sat, 4 Mar 2017 11:33:00 -0600
Subject: [PATCH 3/3] updated

---
 server/plugins-available/apache2_plugin.inc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index c23b69edf9..c4059e42c4 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1514,7 +1514,13 @@ class apache2_plugin {
 
 		//* If we have some alias records
 		if($server_alias) {
-			$tpl->setVar('alias', 'ServerAlias '.implode(' ',$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', '');
 		}
-- 
GitLab