aboutsummaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorAlexandre Alouit <alexandre.alouit@gmail.com>2016-02-04 15:54:37 +0100
committerAlexandre Alouit <alexandre.alouit@gmail.com>2016-02-04 15:54:37 +0100
commitab8d08cf39481d30d581ab65ca9fa745746e711e (patch)
tree94d580500cecb5ee4efab23a2b333f93cab93e1d /src/server
parenta9097316199eaf8d50fcee739a3bc8322026cedc (diff)
bugfix
support subdomain for alias domain
Diffstat (limited to 'src/server')
-rwxr-xr-xsrc/server/plugins-available/apache2_plugin.inc.php5
-rwxr-xr-xsrc/server/plugins-available/nginx_plugin.inc.php5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/server/plugins-available/apache2_plugin.inc.php b/src/server/plugins-available/apache2_plugin.inc.php
index 755d0e1..5ac6c78 100755
--- a/src/server/plugins-available/apache2_plugin.inc.php
+++ b/src/server/plugins-available/apache2_plugin.inc.php
@@ -981,10 +981,13 @@ class apache2_plugin {
}
//* then, add alias domain if we have
- $aliasdomains = $app->db->queryAllRecords('SELECT domain FROM web_domain WHERE parent_domain_id = '.intval($data['new']['domain_id'])." AND active = 'y' AND type = 'alias'");
+ $aliasdomains = $app->db->queryAllRecords('SELECT domain,subdomain FROM web_domain WHERE parent_domain_id = '.intval($data['new']['domain_id'])." AND active = 'y' AND type = 'alias'");
if(is_array($aliasdomains)) {
foreach($aliasdomains as $aliasdomain) {
$temp_domains[] = $aliasdomain['domain'];
+ if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
+ $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
+ }
}
}
diff --git a/src/server/plugins-available/nginx_plugin.inc.php b/src/server/plugins-available/nginx_plugin.inc.php
index 5c77632..d72591c 100755
--- a/src/server/plugins-available/nginx_plugin.inc.php
+++ b/src/server/plugins-available/nginx_plugin.inc.php
@@ -1142,10 +1142,13 @@ class nginx_plugin {
}
//* then, add alias domain if we have
- $aliasdomains = $app->db->queryAllRecords('SELECT domain FROM web_domain WHERE parent_domain_id = '.intval($data['new']['domain_id'])." AND active = 'y' AND type = 'alias'");
+ $aliasdomains = $app->db->queryAllRecords('SELECT domain,subdomain FROM web_domain WHERE parent_domain_id = '.intval($data['new']['domain_id'])." AND active = 'y' AND type = 'alias'");
if(is_array($aliasdomains)) {
foreach($aliasdomains as $aliasdomain) {
$temp_domains[] = $aliasdomain['domain'];
+ if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
+ $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
+ }
}
}