aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Alouit <alexandre.alouit@gmail.com>2016-07-28 18:20:47 +0200
committerGitHub <noreply@github.com>2016-07-28 18:20:47 +0200
commitbe8bde79c1a29efdcc15da5267e4689f5bb3d817 (patch)
tree5dfec4c06e8229869a527daccd12562d269f6740
parenta0e424b8da0ea6fe085442254789b3f4d42456d1 (diff)
parent723b248c40568d09a29de0c802e5ad4c979acf56 (diff)
Merge pull request #52 from exmatrikulator/none_subdomainISPConfig-3.0.5.4p9
bugfix: alias domain produce a none.domain #48
-rwxr-xr-xsrc/server/plugins-available/apache2_plugin.inc.php4
-rwxr-xr-xsrc/server/plugins-available/nginx_plugin.inc.php4
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) {