diff options
| author | Alexandre Alouit <alexandre.alouit@gmail.com> | 2016-07-28 18:20:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 18:20:47 +0200 |
| commit | be8bde79c1a29efdcc15da5267e4689f5bb3d817 (patch) | |
| tree | 5dfec4c06e8229869a527daccd12562d269f6740 | |
| parent | a0e424b8da0ea6fe085442254789b3f4d42456d1 (diff) | |
| parent | 723b248c40568d09a29de0c802e5ad4c979acf56 (diff) | |
Merge pull request #52 from exmatrikulator/none_subdomainISPConfig-3.0.5.4p9
bugfix: alias domain produce a none.domain #48
| -rwxr-xr-x | src/server/plugins-available/apache2_plugin.inc.php | 2 | ||||
| -rwxr-xr-x | src/server/plugins-available/nginx_plugin.inc.php | 2 |
2 files changed, 4 insertions, 0 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,8 +988,10 @@ class apache2_plugin { foreach($aliasdomains as $aliasdomain) { $temp_domains[] = $aliasdomain['domain']; if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) { + if($aliasdomain['subdomain'] != "none"){ $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; } + } foreach($sub_prefixes as $s) { $temp_domains[] = $s . $aliasdomain['domain']; 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,8 +1149,10 @@ class nginx_plugin { foreach($aliasdomains as $aliasdomain) { $temp_domains[] = $aliasdomain['domain']; if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) { + if($aliasdomain['subdomain'] != "none"){ $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; } + } foreach($sub_prefixes as $s) { $temp_domains[] = $s . $aliasdomain['domain']; |