Commit 34c940ec authored by Marius Burkard's avatar Marius Burkard
Browse files

- upstream fixes

parent 09b790e9
......@@ -1052,6 +1052,10 @@ class apache2_plugin {
}
}
}
foreach($sub_prefixes as $s) {
$temp_domains[] = $s . $aliasdomain['domain'];
}
}
}
}
......@@ -1137,6 +1141,7 @@ class apache2_plugin {
$lddomain = $domain;
$subdomains = null;
$aliasdomains = null;
$sub_prefixes = array();
//* be sure to have good domain
if($data['new']['subdomain'] == "www" OR $data['new']['subdomain'] == "*") {
......@@ -1148,6 +1153,7 @@ class apache2_plugin {
if(is_array($subdomains)) {
foreach($subdomains as $subdomain) {
$temp_domains[] = $subdomain['domain'];
$sub_prefixes[] = str_replace($domain, "", $subdomain['domain']);
}
}
......
......@@ -1253,9 +1253,10 @@ class nginx_plugin {
// default values
$temp_domains = array();
$lddomain = $domain;
$subdomains = null;
$lddomain = $domain;
$subdomains = null;
$aliasdomains = null;
$sub_prefixes = array();
//* be sure to have good domain
if($data['new']['subdomain'] == "www" OR $data['new']['subdomain'] == "*") {
......@@ -1267,6 +1268,7 @@ class nginx_plugin {
if(is_array($subdomains)) {
foreach($subdomains as $subdomain) {
$temp_domains[] = $subdomain['domain'];
$sub_prefixes[] = str_replace($domain, "", $subdomain['domain']);
}
}
......@@ -1278,6 +1280,10 @@ class nginx_plugin {
if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
$temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
}
foreach($sub_prefixes as $s) {
$temp_domains[] = $s . $aliasdomain['domain'];
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment