- upstream fixes

Author: Marius Burkard

server/plugins-available/apache2_plugin.inc.php

@@ -1052,6 +1052,10 @@ function update($event_name, $data) {
 								}
 							}
 						}
+
+						foreach($sub_prefixes as $s) {
+							$temp_domains[] = $s . $aliasdomain['domain'];
+						}
 					}
 				}
 			}
@@ -1137,6 +1141,7 @@ function update($event_name, $data) {
 			$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 @@ function update($event_name, $data) {
 			if(is_array($subdomains)) {
 				foreach($subdomains as $subdomain) {
 					$temp_domains[] = $subdomain['domain'];
+					$sub_prefixes[] = str_replace($domain, "", $subdomain['domain']);
 				}
 			}
 

server/plugins-available/nginx_plugin.inc.php

@@ -1253,9 +1253,10 @@ function update($event_name, $data) {
 
 			// 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 @@ function update($event_name, $data) {
 			if(is_array($subdomains)) {
 				foreach($subdomains as $subdomain) {
 					$temp_domains[] = $subdomain['domain'];
+					$sub_prefixes[] = str_replace($domain, "", $subdomain['domain']);
 				}
  			}
 
@@ -1278,6 +1280,10 @@ function update($event_name, $data) {
 					if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
 						$temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
 					}
+					
+					foreach($sub_prefixes as $s) {
+						$temp_domains[] = $s . $aliasdomain['domain'];
+					}
 				}
 			}