Do not use ssl_domain for LE, fixes #4302

Author: Marius Burkard

server/plugins-available/apache2_plugin.inc.php

@@ -1158,6 +1158,7 @@ function update($event_name, $data) {
 		$vhost_data['ssl_bundle_file'] = $bundle_file;
 
 		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') {
+			$domain = $data['new']['domain'];
 			if(substr($domain, 0, 2) === '*.') {
 				// wildcard domain not yet supported by letsencrypt!
 				$app->log('Wildcard domains not yet supported by letsencrypt, so changing ' . $domain . ' to ' . substr($domain, 2), LOGLEVEL_WARN);
@@ -2087,8 +2088,7 @@ function delete($event_name, $data) {
 
 			// remove letsencrypt if it exists (renew will always fail otherwise)
 
-			$old_domain = $data['old']['ssl_domain'];
-			if(!$old_domain) $old_domain = $data['old']['domain'];
+			$old_domain = $data['old']['domain'];
 			if(substr($old_domain, 0, 2) === '*.') {
 				// wildcard domain not yet supported by letsencrypt!
 				$old_domain = substr($old_domain, 2);

server/plugins-available/nginx_plugin.inc.php

@@ -1230,6 +1230,7 @@ function update($event_name, $data) {
 		$tpl->setVar('ssl_letsencrypt', "n");
 
 		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') {
+			$domain = $data['new']['domain'];
 			if(substr($domain, 0, 2) === '*.') {
 				// wildcard domain not yet supported by letsencrypt!
 				$app->log('Wildcard domains not yet supported by letsencrypt, so changing ' . $domain . ' to ' . substr($domain, 2), LOGLEVEL_WARN);
@@ -2118,8 +2119,7 @@ function delete($event_name, $data) {
 
 			// remove letsencrypt if it exists (renew will always fail otherwise)
 
-			$old_domain = $data['old']['ssl_domain'];
-			if(!$old_domain) $old_domain = $data['old']['domain'];
+			$old_domain = $data['old']['domain'];
 			if(substr($old_domain, 0, 2) === '*.') {
 				// wildcard domain not yet supported by letsencrypt!
 				$old_domain = substr($old_domain, 2);