From 8c93e18d6e527e39c9cf58f53677c1c7d31286df Mon Sep 17 00:00:00 2001
From: Moll <Moll@mhknet.de>
Date: Mon, 4 Jul 2016 15:32:09 +0200
Subject: [PATCH] Only if none there is no prefix else it's www
---
server/plugins-available/apache2_plugin.inc.php | 4 ++--
server/plugins-available/nginx_plugin.inc.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 18219721b9..ec92e699bb 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1207,8 +1207,8 @@ class apache2_plugin {
if(is_array($aliasdomains)) {
foreach($aliasdomains as $aliasdomain) {
$temp_domains[] = $aliasdomain['domain'];
- if(isset($aliasdomain['subdomain']) && (! empty($aliasdomain['subdomain']) && $aliasdomain['subdomain'] != "none" )) {
- $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
+ if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
+ $temp_domains[] = "www." . $aliasdomain['domain'];
}
}
}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 4bd5da5234..9933aae618 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1281,8 +1281,8 @@ class nginx_plugin {
if(is_array($aliasdomains)) {
foreach($aliasdomains as $aliasdomain) {
$temp_domains[] = $aliasdomain['domain'];
- if(isset($aliasdomain['subdomain']) && (! empty($aliasdomain['subdomain']) && $aliasdomain['subdomain'] != "none" )) {
- $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
+ if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
+ $temp_domains[] = "www." . $aliasdomain['domain'];
}
foreach($sub_prefixes as $s) {
--
GitLab