Merge branch 'stable-3.1' of http://git.ispconfig.org/ispconfig/ispconfig3 into stable-3.1

Author: florian030

interface/web/mail/mail_blacklist_edit.php

@@ -86,6 +86,8 @@ function onBeforeUpdate() {
 	function onSubmit() {
 		global $app, $conf;
 
+		if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
+		
 		// Check the client limits, if user is not the admin
 		if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin
 			// Get the limits of the client

interface/web/mail/mail_whitelist_edit.php

@@ -85,6 +85,8 @@ function onBeforeUpdate() {
 	function onSubmit() {
 		global $app, $conf;
 
+		if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
+		
 		// Check the client limits, if user is not the admin
 		if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin
 			// Get the limits of the client

server/lib/classes/cron.d/900-letsencrypt.inc.php

@@ -45,19 +45,19 @@ public function onRunJob() {
 				$version = $matches[2];
 				if(($type != 'letsencrypt' && $type != 'certbot') || version_compare($version, '0.7.0', '<')) {
 					exec($letsencrypt . ' -n renew');
-					$app->services->restartServiceDelayed('httpd', 'reload');
+					$app->services->restartServiceDelayed('httpd', 'force-reload');
 				} else {
 					$marker_file = '/usr/local/ispconfig/server/le.restart';
 					$cmd = "echo '1' > " . $marker_file;
 					exec($letsencrypt . ' -n renew --post-hook ' . escapeshellarg($cmd));
 					if(file_exists($marker_file) && trim(file_get_contents($marker_file)) == '1') {
 						unlink($marker_file);
-						$app->services->restartServiceDelayed('httpd', 'reload');
+						$app->services->restartServiceDelayed('httpd', 'force-reload');
 					}
 				}
 			} else {
 				exec($letsencrypt . ' -n renew');
-				$app->services->restartServiceDelayed('httpd', 'reload');
+				$app->services->restartServiceDelayed('httpd', 'force-reload');
 			}
 		}
 

server/mods-available/web_module.inc.php

@@ -213,6 +213,8 @@ function restartHttpd($action = 'restart') {
 		$retval = array('output' => '', 'retval' => 0);
 		if($action == 'restart') {
 			$cmd = $app->system->getinitcommand($daemon, 'restart');
+		} elseif($action == 'force-reload') {
+			$cmd = $app->system->getinitcommand($daemon, 'force-reload');
 		} else {
 			$cmd = $app->system->getinitcommand($daemon, 'reload');
 		}