From 0d2ac5e1f9a1f94b0630bd2199e40ed81d59a71f Mon Sep 17 00:00:00 2001 From: Satoshi Date: Thu, 11 Feb 2016 10:13:14 +0100 Subject: Add support for subs for aliases Add support for subdomains for aliases. If you have both, subs for your main domain and aliases for your main domain, you need cert for subs of yours aliases. --- src/server/plugins-available/nginx_plugin.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server/plugins-available/nginx_plugin.inc.php b/src/server/plugins-available/nginx_plugin.inc.php index d72591c..b451106 100755 --- a/src/server/plugins-available/nginx_plugin.inc.php +++ b/src/server/plugins-available/nginx_plugin.inc.php @@ -1124,9 +1124,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'] == "*") { @@ -1138,6 +1139,7 @@ class nginx_plugin { if(is_array($subdomains)) { foreach($subdomains as $subdomain) { $temp_domains[] = $subdomain['domain']; + $sub_prefixes[] = str_replace($domain, "", $subdomain['domain']); } } @@ -1149,6 +1151,10 @@ class nginx_plugin { if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) { $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; } + + foreach($s as $sub_prefixes) { + $temp_domains[] = $s . $aliasdomain['domain']; + } } } -- cgit v1.2.3 From 88752da9c3c934ff2f71087ba3ad4b0ff0cb3eef Mon Sep 17 00:00:00 2001 From: Satoshi Date: Thu, 11 Feb 2016 10:19:08 +0100 Subject: Fix bug with foreach --- src/server/plugins-available/nginx_plugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/plugins-available/nginx_plugin.inc.php b/src/server/plugins-available/nginx_plugin.inc.php index b451106..73dc3b3 100755 --- a/src/server/plugins-available/nginx_plugin.inc.php +++ b/src/server/plugins-available/nginx_plugin.inc.php @@ -1152,7 +1152,7 @@ class nginx_plugin { $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain']; } - foreach($s as $sub_prefixes) { + foreach($sub_prefixes as $s) { $temp_domains[] = $s . $aliasdomain['domain']; } } -- cgit v1.2.3