Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

Author: florian030

install/tpl/mysql-virtual_sender_login_maps.cf.master

@@ -9,3 +9,6 @@ query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active =
         UNION
         SELECT login FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id}
            AND EXISTS (SELECT domain_id FROM mail_domain WHERE domain = SUBSTRING_INDEX(email, '@', -1) AND active = 'y' AND server_id = {server_id})
+        UNION
+        SELECT cc FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND disabledeliver = 'y' AND server_id = {server_id}
+           AND EXISTS (SELECT domain_id FROM mail_domain WHERE domain = SUBSTRING_INDEX(email, '@', -1) AND active = 'y' AND server_id = {server_id})

interface/lib/plugins/mail_user_filter_plugin.inc.php

@@ -217,7 +217,7 @@ private function mail_user_filter_get_rule($page_form) {
 			} elseif ($page_form->dataRecord["action"] == 'stop') {
 				$content .= "    stop;\n";
 			} elseif ($page_form->dataRecord["action"] == 'reject') {
-				$content .= '    reject "'.$page_form->dataRecord["target"].'";    stop;\n\n';
+				$content .= '    reject "'.$page_form->dataRecord["target"].'";' . "\n    stop;\n";
 			} else {
 				$content .= "    discard;\n    stop;\n";
 			}

interface/web/monitor/dataloghistory_view.php

@@ -52,6 +52,10 @@
 $out['id'] = $id;
 $out['username'] = $record['user'];
 
+if(!$data = unserialize(stripslashes($record['data']))) {
+	$data = unserialize($record['data']);
+}
+
 $out['timestamp'] = date($app->lng('conf_format_datetime'), $record['tstamp']);
 $out['table'] = $record['dbtable'];
 list($key, $value) = explode(':', $record['dbidx']);
@@ -62,7 +66,20 @@
 	} else {
 		switch ($out['table']) {
 			case 'mail_forwarding':
-				$file = 'mail/mail_forward_edit.php';
+				switch ($data['new']['type']) {
+					case 'alias':
+						$file = 'mail/mail_alias_edit.php';
+						break;
+					case 'aliasdomain':
+						$file = 'mail/mail_aliasdomain_edit.php';
+						break;
+					case 'forward':
+						$file = 'mail/mail_forward_edit.php';
+						break;
+					case 'catchall':
+						$file = 'mail/mail_domain_catchall_edit.php';
+						break;
+				}
 			break;
 			case 'mail_user':
 				$file = 'mail/mail_user_edit.php';
@@ -79,6 +96,15 @@
 			case 'web_database_user':
 				$file = 'sites/database_user_edit.php';
 			break;
+                       case 'ftp_user':
+                               $file = 'sites/ftp_user_edit.php';
+                       break;
+                       case 'shell_user':
+                               $file = 'sites/shell_user_edit.php';
+                       break;
+                       case 'dns_soa':
+                               $file = 'dns/dns_soa_edit.php';
+                       break;
 
 			// TODO Add a link per content type
 			default:
@@ -98,10 +124,6 @@
 
 $out['session_id'] = $record['session_id'];
 
-if(!$data = unserialize(stripslashes($record['data']))) {
-	$data = unserialize($record['data']);
-}
-
 switch ($record['action']) {
 	case 'i':
 		$inserts = array();

remoting_client/examples/sites_web_domain_add.php

@@ -53,6 +53,7 @@
 		'allow_override' => 'All',
 		'apache_directives' => '',
 		'php_open_basedir' => '/',
+		'pm' => 'ondemand',
 		'pm_max_requests' => 0,
 		'pm_process_idle_timeout' => 10,
 		'custom_php_ini' => '',

server/lib/classes/backup.inc.php

@@ -100,12 +100,21 @@ protected static function getBackupWebExtension($format)
      * @param string $web_user
      * @author Ramil Valitov <ramilvalitov@gmail.com>
      */
-    protected static function restoreFileOwnership($web_document_root, $web_user)
+    protected static function restoreFileOwnership($web_document_root, $web_user, $web_group)
     {
         global $app;
 
+        $blacklist = array('bin', 'dev', 'etc', 'home', 'lib', 'lib32', 'lib64', 'log', 'opt', 'proc', 'net', 'run', 'sbin', 'ssl', 'srv', 'sys', 'usr', 'var');
+
+	$find_excludes = '-not -path "." -and -not -path "./web/stats/*"';
+
+	foreach ( $blacklist as $dir ) {
+		$find_excludes .= ' -and -not -path "./'.$dir.'" -and -not -path "./'.$dir.'/*"';
+	}
+
         $app->log('Restoring permissions for ' . $web_document_root, LOGLEVEL_DEBUG);
-        $app->system->exec_safe('cd ? && find . -not -path "./web/stats/*" -and -not -path "./log" -and -not -path "./log/*" -and -not -path "./ssl" -and -not -path "./ssl/*" -and -not -path "." -exec chown ?:? {} \;', $web_document_root, $web_user, $web_user);
+        $app->system->exec_safe('cd ? && find . '.$find_excludes.' -exec chown ?:? {} \;', $web_document_root, $web_user, $web_group);
+
     }
 
     /**
@@ -290,7 +299,7 @@ public static function restoreBackupWebFiles($backup_format, $password, $backup_
                              */
                             $success = ($retval == 0 || $retval == 50);
                             if ($success) {
-                                self::restoreFileOwnership($web_root, $web_user);
+                                self::restoreFileOwnership($web_root, $web_user, $web_group);
                             }
                             break;
                         case 'rar':

server/lib/classes/letsencrypt.inc.php

@@ -162,7 +162,7 @@ public function get_certbot_command($domains) {
 			$webroot_args = "$cmd --webroot-path /usr/local/ispconfig/interface/acme";
 		}
 
-		$cmd = $letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server $acme_version --rsa-key-size 4096 --email postmaster@$domain $cmd --webroot-path /usr/local/ispconfig/interface/acme";
+		$cmd = $letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server $acme_version --rsa-key-size 4096 --email postmaster@$domain $webroot_args";
 
 		return $cmd;
 	}

server/mods-available/remoteaction_core_module.inc.php

@@ -180,9 +180,8 @@ private function _doOsUpdate($action) {
 		if(file_exists('/etc/gentoo-release')) {
 			exec("glsa-check -f --nocolor affected");
 		} elseif(file_exists('/etc/redhat-release')) {
-			exec("dnf -y update");
-		}
-		else {
+			exec("which dnf &> /dev/null && dnf -y update || yum -y update");
+		} else {
 			exec("apt-get update");
 			exec("apt-get -y upgrade");
 		}

server/plugins-available/software_update_plugin.inc.php

@@ -289,6 +289,11 @@ public function os_update($action_name, $data) {
 			$app->log('Execeuted Debian / Ubuntu update', LOGLEVEL_DEBUG);
 		}
 
+		//** Redhat, CentOS, Fedora
+		if(file_exists('/etc/redhat-release')) {
+			exec("which dnf &> /dev/null && dnf -y update || yum -y update");
+		}
+
 		//** Gentoo Linux
 		if(file_exists('/etc/gentoo-release')) {
 			exec("glsa-check -f --nocolor affected");