From 723b248c40568d09a29de0c802e5ad4c979acf56 Mon Sep 17 00:00:00 2001 From: ex Date: Mon, 2 May 2016 12:04:07 +0200 Subject: alias domain produce a none.domain #48 --- src/server/plugins-available/apache2_plugin.inc.php | 4 +++- src/server/plugins-available/nginx_plugin.inc.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/server/plugins-available/apache2_plugin.inc.php b/src/server/plugins-available/apache2_plugin.inc.php index 935b970..1db47e5 100755 --- a/src/server/plugins-available/apache2_plugin.inc.php +++ b/src/server/plugins-available/apache2_plugin.inc.php @@ -988,7 +988,9 @@ class apache2_plugin { foreach($aliasdomains as $aliasdomain) { $temp_domains[] = $aliasdomain['domain']; if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) { - $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; + if($aliasdomain['subdomain'] != "none"){ + $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; + } } foreach($sub_prefixes as $s) { diff --git a/src/server/plugins-available/nginx_plugin.inc.php b/src/server/plugins-available/nginx_plugin.inc.php index 73dc3b3..ddd17b9 100755 --- a/src/server/plugins-available/nginx_plugin.inc.php +++ b/src/server/plugins-available/nginx_plugin.inc.php @@ -1149,7 +1149,9 @@ class nginx_plugin { foreach($aliasdomains as $aliasdomain) { $temp_domains[] = $aliasdomain['domain']; if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) { - $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; + if($aliasdomain['subdomain'] != "none"){ + $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; + } } foreach($sub_prefixes as $s) { -- cgit v1.2.3