From 5109443346acabee16767171845c9738e2038b80 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 16 Feb 2016 08:51:36 +0100
Subject: [PATCH] output error message when letsencrypt is checked and
 wildcard-serveralias in enabled - not just silently disable letsencrypt,
 people don't read the description and are confused

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 admin_domains.php   | 8 ++++----
 lng/english.lng.php | 1 +
 lng/german.lng.php  | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin_domains.php b/admin_domains.php
index b1da6ff4..c6f99ea7 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -585,8 +585,8 @@ if ($page == 'domains'
 				}
 
 				// We can't enable let's encrypt for wildcard - domains
-				if ($serveraliasoption == '0') {
-					$letsencrypt = 0;
+				if ($serveraliasoption == '0' && $letsencrypt == '1') {
+				    standard_error('nowildcardwithletsencrypt');
 				}
 
 				if (!preg_match('/^https?\:\/\//', $documentroot)) {
@@ -1372,8 +1372,8 @@ if ($page == 'domains'
 				}
 
 				// We can't enable let's encrypt for wildcard domains
-				if ($serveraliasoption == '0') {
-					$letsencrypt = '0';
+				if ($serveraliasoption == '0' && $letsencrypt == '1') {
+					standard_error('nowildcardwithletsencrypt');
 				}
 
 				if (!preg_match('/^https?\:\/\//', $documentroot)) {
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 9cea4f9d..0277b0fd 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1932,6 +1932,7 @@ $lng['admin']['letsencrypt']['description'] = 'Get a free certificate from <a hr
 $lng['customer']['letsencrypt']['title'] = 'Use Let\'s Encrypt';
 $lng['customer']['letsencrypt']['description'] = 'Get a free certificate from <a href="https://letsencrypt.org">Let\'s Encrypt</a>. The certificate will be created and renewed automatically.<br><string class="red">ATTENTION:"</strong>This feature is still in beta.';
 $lng['error']['sslredirectonlypossiblewithsslipport'] = 'Using Let\'s Encrypt is only possible when the domain has at least one ssl-enabled IP/port combination assigned.';
+$lng['error']['nowildcardwithletsencrypt'] = 'Let\'s Encrypt cannot (yet) handle wildcard-domains. Please set the ServerAlias to WWW or disable it completely';
 $lng['panel']['letsencrypt'] = 'Using Let\'s encrypt';
 $lng['crondesc']['cron_letsencrypt'] = 'updating Let\'s Encrypt certificates';
 $lng['serversettings']['letsencryptca']['title'] = "Let's Encrypt environment";
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 6cdbb031..673106f2 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1587,6 +1587,7 @@ $lng['admin']['letsencrypt']['description'] = 'Holt ein kostenloses Zertifikat v
 $lng['customer']['letsencrypt']['title'] = 'Benutze Let\'s Encrypt';
 $lng['customer']['letsencrypt']['description'] = 'Holt ein kostenloses Zertifikat von <a href="https://letsencrypt.org">Let\'s Encrypt</a>. Das Zertifikat wird automatisch erstellt und verl&auml;ngert.<br><string class="red">ACHTUNG:</strong>Dieses Feature befindet sich noch im Test.';
 $lng['error']['sslredirectonlypossiblewithsslipport'] = 'Die Nutzung von Let\'s Encrypt ist nur m&ouml;glich, wenn die Domain mindestens eine IP/Port - Kombination mit aktiviertem SSL zugewiesen hat.';
+$lng['error']['nowildcardwithletsencrypt'] = 'Let\'s Encrypt kann (noch) nicht mit Wildcard-Domains umgehen. Bitte den ServerAlias auf WWW setzen oder deaktivieren';
 $lng['panel']['letsencrypt'] = 'Benutzt Let\'s encrypt';
 $lng['crondesc']['cron_letsencrypt'] = 'aktualisiert Let\'s Encrypt Zertifikate';
 $lng['serversettings']['letsencryptca']['title'] = "Let's Encrypt Umgebung";