- fixed LE command not being called

Author: Marius Burkard

server/lib/classes/letsencrypt.inc.php

@@ -63,6 +63,10 @@ public function get_acme_command($domains, $key_file, $bundle_file, $cert_file)
 			$cmd .= (string) " -d " . $domain;
 		}
 
+		if($cmd == '') {
+			return false;
+		}
+		
 		$cmd = $letsencrypt . " --issue $cmd -w /usr/local/ispconfig/interface/acme && " . $letsencrypt . " --install-cert " . $cmd . " --key-file " . escapeshellarg($key_file) . " --fullchain-file " . escapeshellarg($bundle_file) . " --cert-file " . escapeshellarg($cert_file) . " --reloadcmd " . escapeshellarg($this->get_reload_command());
 
 		return $cmd;
@@ -121,6 +125,10 @@ public function get_certbot_command($domains) {
 			$cmd .= (string) " --domains " . $domain;
 		}
 
+		if($cmd == '') {
+			return false;
+		}
+		
 		$matches = array();
 		$ret = null;
 		$val = 0;
@@ -375,7 +383,7 @@ public function request_certificates($data, $server_type = 'apache') {
 		}
 
 		$success = false;
-		if(!empty($cli_domain_arg)) {
+		if(!$letsencrypt_cmd) {
 			if(!isset($server_config['migration_mode']) || $server_config['migration_mode'] != 'y') {
 				$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
 				$app->log("Let's Encrypt SSL Cert domains: $cli_domain_arg", LOGLEVEL_DEBUG);