From 984b941fec2fc38b8247c82b3c445d9a19fa8294 Mon Sep 17 00:00:00 2001
From: Michael Seevogel <git_projects@michaelseevogel.de>
Date: Wed, 17 Jan 2018 16:24:32 +0100
Subject: [PATCH 01/23] by default megacli is generating a MegaSAS.log file
 which grows further with every cron execution. The logfile can be disabled by
 using -NoLog

---
 server/lib/classes/cron.d/100-monitor_raid.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/lib/classes/cron.d/100-monitor_raid.inc.php b/server/lib/classes/cron.d/100-monitor_raid.inc.php
index 3349ffbf4..d1a9a5345 100644
--- a/server/lib/classes/cron.d/100-monitor_raid.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_raid.inc.php
@@ -283,7 +283,7 @@ class cronjob_monitor_raid extends cronjob {
 		if($retval === 0 || $retval64 === 0) {
 			$binary=@($retval === 0)?'megacli':'megacli64';
 			$state = 'ok';
-			$data['output'] = shell_exec($binary.' -LDInfo -Lall -aAll');
+			$data['output'] = shell_exec($binary.' -LDInfo -Lall -aAll -NoLog');
 			if (strpos($data['output'], 'Optimal') !== false) {
 				$this->_tools->_setState($state, 'ok');
 			} else if (strpos($data['output'], 'Degraded') !== false) {
-- 
GitLab


From 0dd73c60b80f81aff229efa16459b3571b012415 Mon Sep 17 00:00:00 2001
From: Anton Avramov <aavramov@lukanet.com>
Date: Fri, 26 Jan 2018 13:13:14 +0200
Subject: [PATCH 02/23] Fix #4934 When deleting client delete its cronjobs also

---
 interface/web/client/client_del.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index 8bef6e9d6..dfb4e7464 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -128,7 +128,7 @@ class page_action extends tform_actions {
 			$app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id);
 
 			// Delete all records (sub-clients, mail, web, etc....)  of this client.
-			$tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_folder,web_folder_user,domain,mail_mailinglist,spamfilter_wblist';
+			$tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_folder,web_folder_user,domain,mail_mailinglist,spamfilter_wblist';
 			$tables_array = explode(',', $tables);
 			$client_group_id = $app->functions->intval($client_group['groupid']);
 			if($client_group_id > 1) {
-- 
GitLab


From e519302daf4c840ea70087a3653973c8b5159a4c Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 26 Jan 2018 13:50:07 +0100
Subject: [PATCH 03/23] fixed interface/lib/classes/remoting.inc.php with no
 IPs set for remote-access

---
 interface/lib/classes/remoting.inc.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index a3bb192d9..2aaf1930f 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -144,17 +144,19 @@ class remoting {
 			$sql = "SELECT * FROM remote_user WHERE remote_username = ? and remote_password = md5(?)";
 			$remote_user = $app->db->queryOneRecord($sql, $username, $password);
 			if($remote_user['remote_userid'] > 0) {
-				$allowed_ips = explode(',',$remote_user['remote_ips']);
-				foreach($allowed_ips as $i => $allowed) { 
-					if(!filter_var($allowed, FILTER_VALIDATE_IP)) { 
-						// get the ip for a hostname
-						unset($allowed_ips[$i]);
-						$temp=dns_get_record($allowed, DNS_A+DNS_AAAA);
-						foreach($temp as $t) {
-							if(isset($t['ip'])) $allowed_ips[] = $t['ip'];
-							if(isset($t['ipv6'])) $allowed_ips[] = $t['ipv6'];
+				if (trim($remote_user['remote_ips']) != '') {
+					$allowed_ips = explode(',',$remote_user['remote_ips']);
+					foreach($allowed_ips as $i => $allowed) { 
+						if(!filter_var($allowed, FILTER_VALIDATE_IP)) { 
+							// get the ip for a hostname
+							unset($allowed_ips[$i]);
+							$temp=dns_get_record($allowed, DNS_A+DNS_AAAA);
+							foreach($temp as $t) {
+								if(isset($t['ip'])) $allowed_ips[] = $t['ip'];
+								if(isset($t['ipv6'])) $allowed_ips[] = $t['ipv6'];
+							}
+							unset($temp);
 						}
-						unset($temp);
 					}
 				}
 				$allowed_ips[] = '127.0.0.1';
-- 
GitLab


From cd3b3a72be82c89894cb65fb74dbc442472d799e Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Mon, 29 Jan 2018 07:21:58 +0100
Subject: [PATCH 04/23] update iterate_query for dovecot2

---
 install/tpl/debian6_dovecot-sql.conf.master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index 496e9965d..e05330dc2 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -19,4 +19,4 @@ user_query = SELECT email as user, maildir as home, CONCAT( maildir_format, ':',
 
 # The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
 # Do not enable it on Dovecot 1.x servers
-# iterate_query = SELECT email as user FROM mail_user WHERE `disable%Ls` = 'n' AND server_id = '{server_id}'
+# iterate_query = SELECT email as user FROM mail_user WHERE server_id = '{server_id}'
-- 
GitLab


From 29c96a7495814edcf3c3b52707a1edf3ca743eb5 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Sat, 3 Feb 2018 09:44:19 +0100
Subject: [PATCH 05/23] new dkim-key generator (Fixes #4941)

---
 install/patches/upd_0086.php                  |  46 +++++
 interface/web/js/mail_domain_dkim.js          |  99 -----------
 interface/web/mail/ajax_get_json.php          | 115 ++++++++++++
 .../web/mail/mail_domain_dkim_create.php      | 163 ------------------
 interface/web/mail/mail_domain_edit.php       |  21 +--
 .../web/mail/templates/mail_domain_edit.htm   |  31 +++-
 6 files changed, 200 insertions(+), 275 deletions(-)
 create mode 100644 install/patches/upd_0086.php
 delete mode 100755 interface/web/js/mail_domain_dkim.js
 create mode 100644 interface/web/mail/ajax_get_json.php
 delete mode 100644 interface/web/mail/mail_domain_dkim_create.php

diff --git a/install/patches/upd_0086.php b/install/patches/upd_0086.php
new file mode 100644
index 000000000..045c48b2f
--- /dev/null
+++ b/install/patches/upd_0086.php
@@ -0,0 +1,46 @@
+<?php
+
+if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
+
+/*
+	Example installer patch update class. the classname must match
+	the php and the sql patch update filename. The php patches are
+	only executed when a corresponding sql patch exists.
+*/
+
+class upd_0086 extends installer_patch_update {
+
+	public function onAfterSQL() {
+		global $inst;
+		
+		// delete all the files that were deleted on previous updates
+		$delete = array(
+			'interface/web/js/mail_domain_dkim.js',
+			'interface/web/mail/mail_domain_dkim_create.php'
+		);
+		
+		$curpath = dirname(dirname(realpath(dirname(__FILE__))));
+		
+		$c = 0;
+		$del_all = false;
+		foreach($delete as $file) {
+			if(strpos($file, '..') !== false) continue; // security!
+			
+			if($del_all == false) {
+				$answer = $inst->simple_query('Delete obsolete file ' . $file . '?', array('y', 'n', 'a', 'all', 'none'), 'y');
+				if($answer == 'n') continue;
+				elseif($answer == 'a' || $answer == 'all') $del_all = true;
+				elseif($answer == 'none') break;
+			}
+			if(@is_file('/usr/local/ispconfig/' . $file) && !@is_file($curpath . '/' . $file)) {
+				// be sure this is not a file contained in installation!
+				@unlink('/usr/local/ispconfig/' . $file);
+				ilog('Deleted obsolete file /usr/local/ispconfig/' . $file);
+				$c++;
+			}
+		}
+		ilog($c . 'obsolete files deleted.');
+	}
+}
+
+?>
diff --git a/interface/web/js/mail_domain_dkim.js b/interface/web/js/mail_domain_dkim.js
deleted file mode 100755
index 0e9be0aec..000000000
--- a/interface/web/js/mail_domain_dkim.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
-Copyright (c) 2013, Florian Schaal, info@schaal-24.de
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-This Javascript is invoked by
-	* mail/templates/mail_domain_edit.htm to show and/or create the key-pair
-*/
-
-var request = false;
-
-//function setRequest(action) {
-function setRequest() {
-	if (window.XMLHttpRequest) {
-			request = new XMLHttpRequest();
-	} else if (window.ActiveXObject) {
-		try {
-			request = new ActiveXObject('Msxml2.XMLHTTP');
-		}
-		catch (e) {
-			try {
-				request = new ActiveXObject('Microsoft.XMLHTTP');
-			}
-			catch (e) {}
-		}
-	}
-	if (!request) {
-		alert("Error creating XMLHTTP-instance");
-		return false;
-	} else {
-		// jQuery depends on domain-module active / inactive
-		var check = jQuery('#domain_module').val();
-		if ( check == "1" ) {
-			var skillsSelect = document.getElementById("domain");
-			var domain = skillsSelect.options[skillsSelect.selectedIndex].text;
-		} else { 
-			var domain = jQuery('#domain').val();
-		}
-
-		// we nedd the client-id to get the dkim-strength of the right mail-server
-		try {
-			var clientid = document.getElementById("client_group_id").selectedIndex; // admin and reseller
-		}
-		catch (e) {
-			var clientid = jQuery('#client_id').val();; // user
-		}
-
-		var selector=jQuery('#dkim_selector').val();
-		var publickey=jQuery('#dkim_public').val();
-		request.open('POST', 'mail/mail_domain_dkim_create.php', true);
-		request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-		request.send('domain='+domain+'&dkim_selector='+selector+'&dkim_public='+publickey+'&client_id='+clientid);
-		request.onreadystatechange = interpretRequest;
-	}
-}
-
-function interpretRequest() {
-	switch (request.readyState) {
-		case 4:
-			if ( request.status != 200 ) {
-				alert("Request done but NOK\nError:"+request.status);
-			} else {
-				document.getElementsByName('dkim_selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
-				document.getElementsByName('dkim_private')[0].value = request.responseXML.getElementsByTagName('privatekey')[0].firstChild.nodeValue;
-				document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
-				document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
-			}
-		break;
-		default:
-		break;
-	}
-}
-
-//setRequest('show');
diff --git a/interface/web/mail/ajax_get_json.php b/interface/web/mail/ajax_get_json.php
new file mode 100644
index 000000000..153b3e87e
--- /dev/null
+++ b/interface/web/mail/ajax_get_json.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+Copyright (c) 2018, Florian Schaal - schaal @it UG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
+
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
+
+$type = $_GET['type'];
+$domain_id = $_GET['domain_id'];
+
+if($type == 'create_dkim' && $domain_id != ''){
+	$dkim_public = $_GET['dkim_public'];
+	$dkim_selector = $_GET['dkim_selector'];
+	$client_id = $_GET['client_group_id'];
+	$server_id = $_GET['server_id'];
+
+	$domain=@(is_numeric($domain_id))?$app->db->queryOneRecord("SELECT domain FROM domain WHERE domain_id = ?", $domain_id)['domain']:$domain_id;
+	$maildomain = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = ?", $domain)['domain'];
+
+	$mail_config = $app->getconf->get_server_config($server_id, 'mail');
+	$dkim_strength = $app->functions->intval($mail_config['dkim_strength']);
+	if ($dkim_strength=='') $dkim_strength = 2048;
+	
+	$rnd_val = $dkim_strength * 10;
+	exec('openssl rand -out ../../temp/random-data.bin '.$rnd_val.' 2> /dev/null', $output, $result);
+	exec('openssl genrsa -rand ../../temp/random-data.bin '.$dkim_strength.' 2> /dev/null', $privkey, $result);
+	unlink("../../temp/random-data.bin");
+	$dkim_private='';
+	foreach($privkey as $values) $dkim_private=$dkim_private.$values."\n";
+
+	if ($dkim_public != '' && $maildomain != '') {
+		if (validate_domain($domain) && validate_selector($dkim_selector) ) {
+			//* get active selectors from dns
+			$soa_rec = $app->db->queryOneRecord("SELECT origin FROM dns_soa WHERE active = 'Y' AND origin = ?", $domain.'.');
+			if (isset($soa_rec) && !empty($soa_rec)) {
+				//* check for a dkim-record in the dns?
+				$dns_data = $app->db->queryOneRecord("SELECT name FROM dns_rr WHERE name = ? AND active = 'Y'", $dkim_selector.'._domainkey.'.$domain.'.');
+				if (!empty($dns_data)){
+					$selector = str_replace( '._domainkey.'.$domain.'.', '', $dns_data['name']);
+				} else {
+				}
+			}
+			if ($dkim_selector == $selector || !isset($selector)) {
+				$selector = substr($old_selector,0,53).time(); //* add unix-timestamp to delimiter to allow old and new key in the dns
+			}
+		} else {
+			$selector = 'invalid domain or selector';
+		}
+	} else {
+		unset($dkim_public);
+		exec('echo '.escapeshellarg($dkim_private).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
+		foreach($pubkey as $values) $dkim_public=$dkim_public.$values."\n";
+		$selector = $dkim_selector;
+	}
+
+	$dns_record=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$dkim_public);
+	$dns_record = str_replace(array("\r\n", "\n", "\r"),'',$dns_record);
+
+	$dkim_private=json_encode($dkim_private);
+	$dkim_private=substr($dkim_private, 1, -1);
+
+	$dkim_public=json_encode($dkim_public);
+	$dkim_public=substr($dkim_public, 1, -1);
+
+	$json = '{';
+	$json .= '"dkim_private":"'.$dkim_private.'"';
+	$json .= ',"dkim_public":"'.$dkim_public.'"';
+	$json .= ',"dkim_selector":"'.$selector.'"';
+	$json .= ',"dns_record":"'.$dns_record.'"';
+	$json .= ',"domain":"'.$domain.'"';
+	$json .= '}';
+}
+header('Content-type: application/json');
+echo $json;
+
+function validate_domain($domain) {
+	$regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
+	if ( preg_match($regex, $domain) === 1 ) return true; else return false;
+}
+
+function validate_selector($selector) {
+	$regex = '/^[a-z0-9]{0,63}$/';
+	if ( preg_match($regex, $selector) === 1 ) return true; else return false;
+}
+
+?>
diff --git a/interface/web/mail/mail_domain_dkim_create.php b/interface/web/mail/mail_domain_dkim_create.php
deleted file mode 100644
index 940c11024..000000000
--- a/interface/web/mail/mail_domain_dkim_create.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/**
- Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
- Copyright (c) 2013, Florian Schaal, info@schaal-24.de
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/**
-* This script is invoked by interface/js/mail_domain_dkim.js
-* to generate or show the DKIM Private-key and to show the Private-key.
-* returns DKIM keys, selector, and dns-record
-*/
-
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-require_once '../../lib/classes/validate_dkim.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('mail');
-
-header('Content-Type: text/xml; charset=utf-8');
-header('Cache-Control: must-revalidate, pre-check=0, no-store, no-cache, max-age=0, post-check=0');
-
-function validate_domain($domain) {
-	$regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
-	if ( preg_match($regex, $domain) === 1 ) return true; else return false;
-}
-
-function validate_selector($selector) {
-	$regex = '/^[a-z0-9]{0,63}$/';
-	if ( preg_match($regex, $selector) === 1 ) return true; else return false;
-}
-
-/**
- * This function formats the public-key
- * @param array $pubkey
- * @return string public-key
- */
-function pub_key($pubkey) {
-	$public_key='';
-	foreach($pubkey as $values) $public_key=$public_key.$values."\n";
-	return $public_key;
-}
-
-function get_public_key($private_key, $dkim_strength) {
-	$validate_dkim=new validate_dkim ();
-	if($validate_dkim->validate_post('private', $private_key, $dkim_strength)) { /* validate the $_POST-value */
-		exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
-		$public_key=pub_key($pubkey);
-	} else {
-		$public_key='invalid key';
-	}
-	return $public_key;
-}
-
-/**
- * This function updates the selector if a new key-pair was created
- * and the selector is already used in the dns-record
- * @param string $old_selector
- * @return string selector
- */
-function new_selector ($old_selector, $domain, $client_id = -1) {
-	global $app;
-	//* validate post-values
-	if ( validate_domain($domain) && validate_selector($old_selector) ) {
-		//* get active selectors from dns
-		$soa_rec = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE active = 'Y' AND origin = ?", $domain.'.');
-		if ( isset($soa_rec) && !empty($soa_rec) ) {
-			//* check for a dkim-record in the dns?
-			$dns_data = $app->db->queryOneRecord("SELECT name FROM dns_rr WHERE name = ? AND active = 'Y'", $old_selector.'._domainkey.'.$domain.'.');
-			if ( !empty($dns_data) ){
-				$selector = str_replace( '._domainkey.'.$domain.'.', '', $dns_data['name']);
-			} else {
-			}
-		} else { //* no dns-zone found - check for existing mail-domain to create a new selector (we need this if a external dns is used)
-			if ( $client_id >= 0 ) {
-				$sql = "SELECT * from mail_domain WHERE dkim = 'y' AND domain = ? AND dkim_selector = ?";
-				$maildomain =  $app->db->queryOneRecord($sql, $domain, $old_selector);
-				if ( !empty($maildomain) ) {
-					$selector = $maildomain['selector'];
-				}
-			}
-		}
-		if ( $old_selector == $selector) {
-			$selector = substr($old_selector, 0, 53) . time(); //* add unix-timestamp to delimiter to allow old and new key in the dns
-		} else {
-			$selector = $old_selector;
-		}
-	} else {
-		$selector = 'invalid domain or selector';
-	}
-	return $selector;
-}
-
-$client_id = $app->functions->intval($_POST['client_id']);
-
-//* get dkim-strength for server_id
-$sql = "SELECT server_id from mail_domain WHERE domain = ?";
-$mail_server = $app->db->queryOneRecord($sql, $_POST['domain']);
-if ( is_array($mail_server) ) { //* we are adding an existing mail-domain
-	$mail_server_id = $app->functions->intval( $mail_server['server_id'] );
-} else {
-	$sql = "SELECT default_mailserver FROM client WHERE client_id = ?";
-	$mail_server = $app->db->queryOneRecord($sql, $client_id);
-	$mail_server_id = $app->functions->intval( $mail_server['default_mailserver'] );
-}
-unset($mail_server);
-$mail_config = $app->getconf->get_server_config($mail_server_id, 'mail');
-$dkim_strength = $app->functions->intval($mail_config['dkim_strength']);
-unset($mail_config);
-
-if ( empty($dkim_strength) ) $dkim_strength = 2048;
-
-$rnd_val = $dkim_strength * 10;
-exec('openssl rand -out ../../temp/random-data.bin '.$rnd_val.' 2> /dev/null', $output, $result);
-exec('openssl genrsa -rand ../../temp/random-data.bin '.$dkim_strength.' 2> /dev/null', $privkey, $result);
-unlink("../../temp/random-data.bin");
-foreach($privkey as $values) $private_key=$private_key.$values."\n";
-//* check the selector for updated dkim-settings only
-if ( isset($_POST['dkim_public']) && !empty($_POST['dkim_public']) ) $selector = new_selector($_POST['dkim_selector'], $_POST['domain'], $client_id); 
-
-if ( !isset($public_key) ) $public_key=get_public_key($private_key, $dkim_strength);
-
-$dns_record=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$public_key);
-
-if ( !isset($selector) ) {
-	if ( validate_selector($_POST['dkim_selector']) ) $selector=$_POST['dkim_selector']; 
-}
-echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-echo "<formatname>\n";
-echo "<selector>".$selector."</selector>\n";
-echo "<privatekey>".$private_key."</privatekey>\n";
-echo "<publickey>".$public_key."</publickey>\n";
-if ( validate_domain($_POST['domain']) ) {
-	echo '<dns_record>'.$selector.'._domainkey.'.$_POST['domain'].'. 3600	TXT	"v=DKIM1; t=s; p='.$dns_record.'"</dns_record>';
-}
-echo "</formatname>\n";
-?>
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index d7d6ea4c6..ad383c474 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -80,7 +80,6 @@ class page_action extends tform_actions {
 			$sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
 
 			$clients = $app->db->queryAllRecords($sql);
-			$clients = $app->functions->htmlentities($clients);
 			$client_select = '';
 			if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
 			//$tmp_data_record = $app->tform->getDataRecord($this->id);
@@ -97,18 +96,16 @@ class page_action extends tform_actions {
 			// Get the limits of the client
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, client.default_mailserver, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ? order by client.contact_name", $client_group_id);
-			$client = $app->functions->htmlentities($client);
 
 			// Set the mailserver to the default server of the client
 			$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $client['default_mailserver']);
-			$app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>" . $app->functions->htmlentities($tmp['server_name']) . "</option>");
+			$app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>$tmp[server_name]</option>");
 			unset($tmp);
 
 			if ($settings['use_domain_module'] != 'y') {
 				// Fill the client select field
 				$sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ? ORDER BY client.company_name, client.contact_name, sys_group.name";
 				$clients = $app->db->queryAllRecords($sql, $client['client_id']);
-				$clients = $app->functions->htmlentities($clients);
 				$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ?", $client['client_id']);
 				$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
 				//$tmp_data_record = $app->tform->getDataRecord($this->id);
@@ -142,7 +139,7 @@ class page_action extends tform_actions {
 			$options_mail_servers = "";
 
 			foreach ($mail_servers as $mail_server) {
-				$options_mail_servers .= '<option value="'.$mail_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $mail_server['server_id'] ? ' selected="selected"' : '').'>'.$app->functions->htmlentities($mail_server['server_name']).'</option>';
+				$options_mail_servers .= '<option value="'.$mail_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $mail_server['server_id'] ? ' selected="selected"' : '').'>'.$mail_server['server_name'].'</option>';
 			}
 
 			$app->tpl->setVar("client_server_id", $options_mail_servers);
@@ -167,7 +164,7 @@ class page_action extends tform_actions {
 					if ($domain['domain'] == $this->dataRecord["domain"]) {
 						$domain_select .= " selected";
 					}
-					$domain_select .= ">" . $app->functions->htmlentities($app->functions->idn_decode($domain['domain'])) . "</option>\r\n";
+					$domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
 				}
 			}
 			else {
@@ -193,7 +190,7 @@ class page_action extends tform_actions {
 		if(is_array($policys)) {
 			foreach( $policys as $p) {
 				$selected = ($p["id"] == $tmp_user["policy_id"])?'SELECTED':'';
-				$policy_select .= "<option value='$p[id]' $selected>" . $app->functions->htmlentities($p['policy_name']) . "</option>\r\n";
+				$policy_select .= "<option value='$p[id]' $selected>$p[policy_name]</option>\r\n";
 			}
 		}
 		$app->tpl->setVar("policy", $policy_select);
@@ -204,7 +201,7 @@ class page_action extends tform_actions {
 		if($this->id > 0) {
 			//* we are editing a existing record
 			$app->tpl->setVar("edit_disabled", 1);
-			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"], true);
+			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
 		} else {
 			$app->tpl->setVar("edit_disabled", 0);
 		}
@@ -214,10 +211,10 @@ class page_action extends tform_actions {
 		$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
 		$dns_key = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$rec['dkim_public']);
 		$dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600   TXT   v=DKIM1; t=s; p=' . $dns_key;
-		$app->tpl->setVar('dkim_selector', $rec['dkim_selector'], true);
-		$app->tpl->setVar('dkim_private', $rec['dkim_private'], true);
-		$app->tpl->setVar('dkim_public', $rec['dkim_public'], true);
-		if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record, true);
+		$app->tpl->setVar('dkim_selector', $rec['dkim_selector']);
+		$app->tpl->setVar('dkim_private', $rec['dkim_private']);
+		$app->tpl->setVar('dkim_public', $rec['dkim_public']);
+		if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record);
 
 		parent::onShowEnd();
 	}
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 960f4462b..ab02aa2ce 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -101,7 +101,10 @@
                 <label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
               </div>
+<!--
 				<a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
+-->
+				<a class="btn btn-default formbutton-default" id="dkim-button" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
 		<div class="form-group">
                 <div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
               </div>
@@ -121,4 +124,30 @@
             <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
             <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
         </div></div>
-<script language="JavaScript" type="text/javascript" src="js/mail_domain_dkim.js"></script>
+<script language="JavaScript" type="text/javascript">
+	$("#dkim-button").click(function() { getDKIM(); });
+
+	function getDKIM() {
+		var domain_id = jQuery('#domain').val();
+		var client_group_id = jQuery('#client_group_id').val();
+		var server_id = jQuery('#server_id').val();
+		var dkim_selector = jQuery('#dkim_selector').val();
+		var dkim_public = jQuery('#dkim_public').val();
+		jQuery.getJSON('mail/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {
+			domain_id : domain_id,
+			client_group_id : client_group_id,
+			server_id : server_id,
+			dkim_public : dkim_public,
+			dkim_selector : dkim_selector,
+			type : "create_dkim" 
+		}, function(data) {
+			var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600	TXT	v=DKIM1; t=s; p=' + data['dns_record'];
+			$("#dkim_selector").val(data.dkim_selector);
+			$("#dkim_public").val(data.dkim_public);
+			$("#dkim_private").val(data.dkim_private);
+			$("#dns_record").val(dns);
+		});
+	};
+</script>
+
+
-- 
GitLab


From adbf18a99577bd237401d2ce71cd6da0e9c9a49d Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Sat, 3 Feb 2018 09:58:48 +0100
Subject: [PATCH 06/23] re-add changes to last commit

---
 interface/web/mail/mail_domain_edit.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index ad383c474..d7d6ea4c6 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -80,6 +80,7 @@ class page_action extends tform_actions {
 			$sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
 
 			$clients = $app->db->queryAllRecords($sql);
+			$clients = $app->functions->htmlentities($clients);
 			$client_select = '';
 			if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
 			//$tmp_data_record = $app->tform->getDataRecord($this->id);
@@ -96,16 +97,18 @@ class page_action extends tform_actions {
 			// Get the limits of the client
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, client.default_mailserver, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ? order by client.contact_name", $client_group_id);
+			$client = $app->functions->htmlentities($client);
 
 			// Set the mailserver to the default server of the client
 			$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $client['default_mailserver']);
-			$app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>$tmp[server_name]</option>");
+			$app->tpl->setVar("server_id", "<option value='$client[default_mailserver]'>" . $app->functions->htmlentities($tmp['server_name']) . "</option>");
 			unset($tmp);
 
 			if ($settings['use_domain_module'] != 'y') {
 				// Fill the client select field
 				$sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ? ORDER BY client.company_name, client.contact_name, sys_group.name";
 				$clients = $app->db->queryAllRecords($sql, $client['client_id']);
+				$clients = $app->functions->htmlentities($clients);
 				$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ?", $client['client_id']);
 				$client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
 				//$tmp_data_record = $app->tform->getDataRecord($this->id);
@@ -139,7 +142,7 @@ class page_action extends tform_actions {
 			$options_mail_servers = "";
 
 			foreach ($mail_servers as $mail_server) {
-				$options_mail_servers .= '<option value="'.$mail_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $mail_server['server_id'] ? ' selected="selected"' : '').'>'.$mail_server['server_name'].'</option>';
+				$options_mail_servers .= '<option value="'.$mail_server['server_id'].'"'.($this->id > 0 && $this->dataRecord["server_id"] == $mail_server['server_id'] ? ' selected="selected"' : '').'>'.$app->functions->htmlentities($mail_server['server_name']).'</option>';
 			}
 
 			$app->tpl->setVar("client_server_id", $options_mail_servers);
@@ -164,7 +167,7 @@ class page_action extends tform_actions {
 					if ($domain['domain'] == $this->dataRecord["domain"]) {
 						$domain_select .= " selected";
 					}
-					$domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
+					$domain_select .= ">" . $app->functions->htmlentities($app->functions->idn_decode($domain['domain'])) . "</option>\r\n";
 				}
 			}
 			else {
@@ -190,7 +193,7 @@ class page_action extends tform_actions {
 		if(is_array($policys)) {
 			foreach( $policys as $p) {
 				$selected = ($p["id"] == $tmp_user["policy_id"])?'SELECTED':'';
-				$policy_select .= "<option value='$p[id]' $selected>$p[policy_name]</option>\r\n";
+				$policy_select .= "<option value='$p[id]' $selected>" . $app->functions->htmlentities($p['policy_name']) . "</option>\r\n";
 			}
 		}
 		$app->tpl->setVar("policy", $policy_select);
@@ -201,7 +204,7 @@ class page_action extends tform_actions {
 		if($this->id > 0) {
 			//* we are editing a existing record
 			$app->tpl->setVar("edit_disabled", 1);
-			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+			$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"], true);
 		} else {
 			$app->tpl->setVar("edit_disabled", 0);
 		}
@@ -211,10 +214,10 @@ class page_action extends tform_actions {
 		$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
 		$dns_key = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$rec['dkim_public']);
 		$dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600   TXT   v=DKIM1; t=s; p=' . $dns_key;
-		$app->tpl->setVar('dkim_selector', $rec['dkim_selector']);
-		$app->tpl->setVar('dkim_private', $rec['dkim_private']);
-		$app->tpl->setVar('dkim_public', $rec['dkim_public']);
-		if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record);
+		$app->tpl->setVar('dkim_selector', $rec['dkim_selector'], true);
+		$app->tpl->setVar('dkim_private', $rec['dkim_private'], true);
+		$app->tpl->setVar('dkim_public', $rec['dkim_public'], true);
+		if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record, true);
 
 		parent::onShowEnd();
 	}
-- 
GitLab


From 55b82883b832055e94ac860b28678b50d2c6db11 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 5 Feb 2018 13:48:17 +0100
Subject: [PATCH 07/23] Implemented #4947 request: not forward spam to external
 mailbox

---
 server/conf/sieve_filter_1.2.master | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master
index 0dd9e62e6..b1f7fcb87 100644
--- a/server/conf/sieve_filter_1.2.master
+++ b/server/conf/sieve_filter_1.2.master
@@ -1,12 +1,5 @@
 require ["fileinto", "regex", "date", "relational", "vacation"];
 
-<tmpl_if name="cc">
-# Send a copy of email to
-<tmpl_loop name="ccloop">
-redirect "<tmpl_var name='address'>";
-</tmpl_loop>
-</tmpl_if>
-
 <tmpl_if name="move_junk" op="==" value="y">
 # Move spam to spam folder
 if header :contains "X-Spam-Flag" "YES" {
@@ -16,6 +9,13 @@ if header :contains "X-Spam-Flag" "YES" {
 }
 </tmpl_if>
 
+<tmpl_if name="cc">
+# Send a copy of email to
+<tmpl_loop name="ccloop">
+redirect "<tmpl_var name='address'>";
+</tmpl_loop>
+</tmpl_if>
+
 <tmpl_var name='custom_mailfilter'>
 
 keep;
-- 
GitLab


From fe1f21db16c64c72273bb0c126587f9b02bb0f0d Mon Sep 17 00:00:00 2001
From: iMZ <zucha@imz.sk>
Date: Wed, 7 Feb 2018 20:59:29 +0100
Subject: [PATCH 08/23] Update limits.php - show assigned and total quota of
 web, mail, database

---
 interface/web/dashboard/dashlets/limits.php | 34 ++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/interface/web/dashboard/dashlets/limits.php b/interface/web/dashboard/dashlets/limits.php
index d58c3eb8e..62cd2db35 100644
--- a/interface/web/dashboard/dashlets/limits.php
+++ b/interface/web/dashboard/dashlets/limits.php
@@ -8,6 +8,11 @@ class dashlet_limits {
 		$limits = array();
 
 		/* Limits to be shown*/
+		
+		$limits[] = array('field' => 'limit_mailquota',
+			'db_table' => 'mail_user',
+			'db_where' => 'quota > 0',  /* Count only posive value of quota, negative value -1 is unlimited */
+			'q_type' => 'quota');
 
 		$limits[] = array('field' => 'limit_maildomain',
 			'db_table' => 'mail_domain',
@@ -61,6 +66,11 @@ class dashlet_limits {
 			'db_table' => 'spamfilter_policy',
 			'db_where' => "");
 
+		$limits[] = array('field' => 'limit_web_quota',
+			'db_table' => 'web_domain',
+			'db_where' => 'hd_quota > 0', /* Count only posive value of quota, negative value -1 is unlimited */
+			'q_type' => 'hd_quota');
+			
 		$limits[] = array('field' => 'limit_web_domain',
 			'db_table' => 'web_domain',
 			'db_where' => "type = 'vhost'");
@@ -93,6 +103,11 @@ class dashlet_limits {
 			'db_table' => 'dns_rr',
 			'db_where' => "");
 
+		$limits[] = array('field' => 'limit_database_quota',
+			'db_table' => 'web_database',
+			'db_where' => 'database_quota > 0', /* Count only posive value of quota, negative value -1 is unlimited */
+			'q_type' => 'database_quota');
+			
 		$limits[] = array('field' => 'limit_database',
 			'db_table' => 'web_database',
 			'db_where' => "");
@@ -143,7 +158,11 @@ class dashlet_limits {
 			}
 			if($value != 0 || $value == $wb['unlimited_txt']) {
 				$value_formatted = ($value == '-1')?$wb['unlimited_txt']:$value;
-				$usage = $this->_get_limit_usage($limit);
+				if($limit['q_type']!=''){
+					$usage = $this->_get_assigned_quota($limit) . " MB";
+					$value_formatted = ($value == '-1')?$wb['unlimited_txt']:$value . " MB";
+				}
+				else $usage = $this->_get_limit_usage($limit);
 				$percentage = ($value == '-1' || $value == 0 ? 0 : round(100 * $usage / $value));
 				$rows[] = array('field' => $field,
 					'field_txt' => $wb[$field.'_txt'],
@@ -172,6 +191,19 @@ class dashlet_limits {
 		return $rec['number'];
 
 	}
+	
+	function _get_assigned_quota($limit) {
+		global $app;
+
+		$sql = "SELECT sum(??) as number FROM ?? WHERE ";
+		if($limit['db_where'] != '') $sql .= $limit['db_where']." AND ";
+		$sql .= $app->tform->getAuthSQL('r');
+		$rec = $app->db->queryOneRecord($sql, $limit['q_type'], $limit['db_table']);
+		if($limit['db_table']=='mail_user') $quotaMB = $rec['number'] / 1048576; // Mail quota is in bytes, must be converted to MB
+		else $quotaMB = $rec['number'];
+		return $quotaMB;
+
+	}
 
 }
 
-- 
GitLab


From 8fb9f4d88963c69a46697ea6e752f506bc400a1d Mon Sep 17 00:00:00 2001
From: iMZ <zucha@imz.sk>
Date: Wed, 7 Feb 2018 21:01:15 +0100
Subject: [PATCH 09/23] Update en_dashlet_limits.lng

---
 interface/web/dashboard/lib/lang/en_dashlet_limits.lng | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
index 3f0ce2f43..5d504c8e9 100644
--- a/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/en_dashlet_limits.lng
@@ -28,4 +28,7 @@ $wb["limit_webdav_user_txt"] = 'Number of Webdav users';
 $wb["limit_client_txt"] = 'Number of Clients';
 $wb["limit_database_txt"] = 'Number of Databases';
 $wb['limit_domain_txt'] = 'Number of Domains';
+$wb['limit_mailquota_txt'] = 'Assigned mailbox quota';
+$wb['limit_web_quota_txt'] = 'Assigned web quota';
+$wb['limit_database_quota_txt'] = 'Assigned database quota';
 ?>
-- 
GitLab


From 71adfd203bf4f3e0b5e7a21141c475491ee07b23 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Thu, 8 Feb 2018 12:51:18 +0100
Subject: [PATCH 10/23] catch ipv6-connection errors for ec.europa.eu

---
 interface/lib/classes/validate_client.inc.php | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php
index 256b483c4..4652e2a07 100644
--- a/interface/lib/classes/validate_client.inc.php
+++ b/interface/lib/classes/validate_client.inc.php
@@ -174,10 +174,8 @@ class validate_client {
 					}
 				}
 			}
-
-			$client = new SoapClient("http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl");
-
-			if($client){
+			try {
+				$client = new SoapClient("http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl");
 				$params = array('countryCode' => $cc, 'vatNumber' => $vn);
 				try{
 					$r = $client->checkVat($params);
@@ -191,12 +189,12 @@ class validate_client {
 							}
 					}
 
-					// This foreach shows every single line of the returned information
-					/*
-					foreach($r as $k=>$prop){
-						echo $k . ': ' . $prop;
-					}
-					*/
+				// This foreach shows every single line of the returned information
+				/*
+				foreach($r as $k=>$prop){
+					echo $k . ': ' . $prop;
+				}
+				*/
 
 				} catch(SoapFault $e) {
 					//echo 'Error, see message: '.$e->faultstring;
@@ -217,7 +215,7 @@ class validate_client {
 							break;
 					}
 				}
-			} else {
+			} catch(SoapFault $e){
 				// Connection to host not possible, europe.eu down?
 				// this shouldn't be the user's fault, so we return no error
 			}
-- 
GitLab


From f81f3ec8ffe88cb8f5e2d44b0767e6a4ece4d8d3 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 12 Feb 2018 12:25:02 +0100
Subject: [PATCH 11/23] Corrected some remote api examples.

---
 remoting_client/examples/mail_user_add.php           | 4 ++--
 remoting_client/examples/sites_database_add.php      | 2 +-
 remoting_client/examples/sites_database_user_add.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/remoting_client/examples/mail_user_add.php b/remoting_client/examples/mail_user_add.php
index 25e3590af..3b7d240ec 100644
--- a/remoting_client/examples/mail_user_add.php
+++ b/remoting_client/examples/mail_user_add.php
@@ -29,8 +29,8 @@ try {
 		'cc' => '',
 		'homedir' => '/var/vmail',
 		'autoresponder' => 'n',
-		'autoresponder_start_date' => array('day' => 1, 'month' => 7, 'year' => 2012, 'hour' => 0, 'minute' => 0),
-		'autoresponder_end_date' => array('day' => 20, 'month' => 7, 'year' => 2012, 'hour' => 0, 'minute' => 0),
+		'autoresponder_start_date' => '',
+		'autoresponder_end_date' => '',
 		'autoresponder_text' => 'hallo',
 		'move_junk' => 'n',
 		'custom_mailfilter' => 'spam',
diff --git a/remoting_client/examples/sites_database_add.php b/remoting_client/examples/sites_database_add.php
index 3c8277699..c63ad551e 100644
--- a/remoting_client/examples/sites_database_add.php
+++ b/remoting_client/examples/sites_database_add.php
@@ -19,7 +19,7 @@ try {
 	$params = array(
 		'server_id' => 1,
 		'type' => 'mysql',
-		'website_id' => 1,
+		'parent_domain_id' => 1,
 		'database_name' => 'db_name2',
 		'database_user_id' => '1',
 		'database_ro_user_id' => '0',
diff --git a/remoting_client/examples/sites_database_user_add.php b/remoting_client/examples/sites_database_user_add.php
index 108163340..d59b66d9e 100644
--- a/remoting_client/examples/sites_database_user_add.php
+++ b/remoting_client/examples/sites_database_user_add.php
@@ -22,7 +22,7 @@ try {
 		'database_password' => 'db_name2'
 	);
 
-	$database_id = $client->sites_database_user_add($session_id, $client_id, $params);
+	$database_user_id = $client->sites_database_user_add($session_id, $client_id, $params);
 
 	echo "Database ID: ".$database_user_id."<br>";
 
-- 
GitLab


From 1f59ad5268d8d28d355675ad12317a350a4561b0 Mon Sep 17 00:00:00 2001
From: Costin <manykc@yahoo.com>
Date: Tue, 13 Feb 2018 09:41:54 +0100
Subject: [PATCH 12/23] Fix typo in parent user related variable when creating
 new jailkit shell user. This bug was interfering with the correct functioning
 of the plugin.

---
 server/plugins-available/shelluser_jailkit_plugin.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 295112d42..9a29a10a6 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -399,7 +399,7 @@ class shelluser_jailkit_plugin {
 		if($this->data['new']['active'] != 'y') $shell = '/bin/false';
 		
 		$app->system->usermod($this->data['new']['username'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, $shell);
-		$app->system->usermod($this->data['new']['puser'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
+		$app->system->usermod($this->data['new']['puser'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_puserhome, '/usr/sbin/jk_chrootsh');
 
 		$this->app->log("Added jailkit user to chroot with command: ".$command, LOGLEVEL_DEBUG);
 
-- 
GitLab


From 8079c4243f55f08741963a67831ff88380b97034 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Tue, 13 Feb 2018 16:10:50 +0100
Subject: [PATCH 13/23] use pigz if available for tar-backups and add definable
 tmp-dir for zip-backups

---
 install/tpl/server.ini.master                 |  1 +
 .../web/admin/form/server_config.tform.php    | 14 +++++++++++
 .../web/admin/lib/lang/de_server_config.lng   |  3 +++
 .../web/admin/lib/lang/en_server_config.lng   |  3 +++
 .../templates/server_config_server_edit.htm   |  4 ++++
 server/lib/classes/cron.d/500-backup.inc.php  | 24 +++++++++++++++----
 .../classes/cron.d/500-backup_mail.inc.php    | 24 +++++++++++++++----
 7 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 2f4d7db3a..41cb03c4f 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -16,6 +16,7 @@ firewall=bastille
 loglevel=2
 admin_notify_events=1
 backup_dir=/var/backup
+backup_tmp=/tmp
 backup_dir_is_mount=n
 backup_mode=rootgz
 backup_time=0:00
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 70aac48e0..93094629a 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -183,6 +183,20 @@ $form["tabs"]['server'] = array(
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'backup_tmp' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '/tmp/',
+			'validators' => array(	0 => array('type' => 'NOTEMPTY',
+										'errmsg' => 'tmpdir_path_error_empty'),
+									1 => array ( 	'type' => 'REGEX',
+										'regex' => '/^\/[a-zA-Z0-9\.\-\_\/]{5,128}$/',
+										'errmsg'=> 'tmpdir_path_error_regex'),
+			),
+			'value' => '',
+			'width' => '40',
+			'maxlength' => '255'
+		),
 		'backup_dir_is_mount' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 2656243d6..ee55d43bb 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -81,6 +81,7 @@ $wb['awstats_data_dir_txt'] = 'AWStats Datenverzeichnis';
 $wb['awstats_pl_txt'] = 'AWStats awstats.pl Script';
 $wb['awstats_buildstaticpages_pl_txt'] = 'AWStats awstats_buildstaticpages.pl Script';
 $wb['backup_dir_txt'] = 'Backupverzeichnis';
+$wb['backup_tmp_txt'] = 'Backup tmp-Dir (zip)';
 $wb['named_conf_local_path_txt'] = 'BIND named.conf.local Pfad';
 $wb['php_ini_path_cgi_txt'] = 'CGI php.ini Pfad';
 $wb['php_ini_path_apache_txt'] = 'Apache php.ini Pfad';
@@ -103,6 +104,8 @@ $wb['nginx_user_txt'] = 'Nginx Benutzer';
 $wb['nginx_group_txt'] = 'Nginx Gruppe';
 $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
 $wb['backup_dir_error_empty'] = 'Backup Verzeichnis ist leer.';
+$wb['tmpdir_path_error_empty'] = 'Tmp-Dir Pfad ist leer.';
+$wb['tmpdir_path_error_regex'] = 'Invalid Tmp-Dir Pfad.';
 $wb['maildir_path_error_empty'] = 'Maildir Pfad ist leer.';
 $wb['homedir_path_error_empty'] = 'Homedir Pfad ist leer.';
 $wb['mailuser_uid_error_empty'] = 'Mail Benutzer UID ist leer.';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 80849cb5a..7f7e2c8f8 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -90,6 +90,7 @@ $wb["awstats_data_dir_txt"] = 'awstats data folder';
 $wb["awstats_pl_txt"] = 'awstats.pl script';
 $wb["awstats_buildstaticpages_pl_txt"] = 'awstats_buildstaticpages.pl script';
 $wb["backup_dir_txt"] = 'Backup directory';
+$wb["backup_tmp_txt"] = 'Backup tmp directory for zip';
 $wb["named_conf_local_path_txt"] = 'BIND named.conf.local path';
 $wb["php_ini_path_cgi_txt"] = 'CGI php.ini path';
 $wb["php_ini_path_apache_txt"] = 'Apache php.ini path';
@@ -101,6 +102,8 @@ $wb["fastcgi_config_syntax_txt"] = 'FastCGI config syntax';
 $wb["backup_mode_txt"] = 'Backup mode';
 $wb["backup_mode_userzip"] = 'Backup web files owned by web user as zip';
 $wb["backup_mode_rootgz"] = 'Backup all files in web directory as root user';
+$wb['tmpdir_path_error_empty'] = 'tmp-dir Path is empty.';
+$wb['tmpdir_path_error_regex'] = 'Invalid tmp-dir path.';
 $wb["backup_time_txt"] = 'Backup time';
 $wb["server_type_txt"] = 'Server Type';
 $wb["nginx_vhost_conf_dir_txt"] = 'Nginx Vhost config dir';
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 7868e8756..e034fa53b 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -63,6 +63,10 @@
                     {tmpl_var name='backup_mode'}
                 </select></div>
             </div>
+            <div class="form-group">
+                <label for="backup_tmp" class="col-sm-3 control-label">{tmpl_var name='backup_tmp_txt'}</label>
+                <div class="col-sm-9"><input type="text" name="backup_tmp" id="backup_tmp" value="{tmpl_var name='backup_tmp'}" class="form-control" /></div>
+			</div>
 			<div class="form-group">
                 <label for="backup_time" class="col-sm-3 control-label">{tmpl_var name='backup_time_txt'}</label>
                 <div class="col-sm-3"><select name="backup_time" id="backup_time" class="form-control">
diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php
index 5dcb2d5fc..fa5743111 100644
--- a/server/lib/classes/cron.d/500-backup.inc.php
+++ b/server/lib/classes/cron.d/500-backup.inc.php
@@ -54,6 +54,7 @@ class cronjob_backup extends cronjob {
 		$global_config = $app->getconf->get_global_config('sites');
 		$backup_dir = trim($server_config['backup_dir']);
 		$backup_mode = $server_config['backup_mode'];
+		$backup_tmp = trim($server_config['backup_tmp']);
 		if($backup_mode == '') $backup_mode = 'userzip';
 
 		$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
@@ -77,6 +78,15 @@ class cronjob_backup extends cronjob {
             if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $run_backups = false;
 			if($run_backups){
 				$web_array = array();
+
+				system('which pigz > /dev/null', $ret);
+				if($ret === 0) {
+					$use_pigz = true;
+					$zip_cmd = 'pigz'; // db-backups
+				} else {
+					$use_pigz = false;
+					$zip_cmd = 'gzip'; // db-backups
+				}
 				
 				//* backup only active domains
 				$sql = "SELECT * FROM web_domain WHERE server_id = ? AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'";
@@ -117,12 +127,16 @@ class cronjob_backup extends cronjob {
 							if($backup_mode == 'userzip') {
 								//* Create a .zip backup as web user and include also files owned by apache / nginx user
 								$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.zip';
-								exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print 2> /dev/null | zip -b /tmp --exclude=./backup\*'.$backup_excludes.' --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
-								if($retval == 0 || $retval == 12) exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -user '.escapeshellarg($http_server_user).' -print 2> /dev/null | zip -b /tmp --exclude=./backup\*'.$backup_excludes.' --update --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
+								exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -group '.escapeshellarg($web_group).' -print 2> /dev/null | zip -b '.escapeshellarg($backup_tmp).' --exclude=./backup\*'.$backup_excludes.' --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
+								if($retval == 0 || $retval == 12) exec('cd '.escapeshellarg($web_path).' && sudo -u '.escapeshellarg($web_user).' find . -user '.escapeshellarg($http_server_user).' -print 2> /dev/null | zip -b '.escapeshellarg($backup_tmp).' --exclude=./backup\*'.$backup_excludes.' --update --symlinks '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' -@', $tmp_output, $retval);
 							} else {
 								//* Create a tar.gz backup as root user
 								$web_backup_file = 'web'.$web_id.'_'.date('Y-m-d_H-i').'.tar.gz';
-								exec('tar pczf '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' --exclude=./backup\*'.$backup_excludes.' --directory '.escapeshellarg($web_path).' .', $tmp_output, $retval);
+								if ($use_pigz) {
+									exec('tar pcf - --directory '.escapeshellarg($web_path).' . --exclude=./backup\*'.$backup_excludes.' | pigz > '.escapeshellarg($web_backup_dir.'/'.$web_backup_file), $tmp_output, $retval);
+								} else {
+									exec('tar pczf '.escapeshellarg($web_backup_dir.'/'.$web_backup_file).' --exclude=./backup\*'.$backup_excludes.' --directory '.escapeshellarg($web_path).' .', $tmp_output, $retval);
+}
 							}
 							if($retval == 0 || ($backup_mode != 'userzip' && $retval == 1) || ($backup_mode == 'userzip' && $retval == 12)) { // tar can return 1, zip can return 12(due to harmless warings) and still create valid backups  
 								if(is_file($web_backup_dir.'/'.$web_backup_file)){
@@ -241,8 +255,8 @@ class cronjob_backup extends cronjob {
 							$command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --max_allowed_packet=512M --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'";
 							exec($command, $tmp_output, $retval);
 
-							//* Compress the backup with gzip
-							if($retval == 0) exec("gzip -c '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'", $tmp_output, $retval);
+							//* Compress the backup with gzip / pigz
+							if($retval == 0) exec("$zip_cmd -c '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file)."' > '".escapeshellcmd($db_backup_dir.'/'.$db_backup_file).".gz'", $tmp_output, $retval);
 
 							if($retval == 0){
 								if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')){
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
index 5e84fb341..a6807021d 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -59,6 +59,7 @@ class cronjob_backup_mail extends cronjob {
 
 		$backup_mode = $server_config['backup_mode'];
 		if($backup_mode == '') $backup_mode = 'userzip';
+		$backup_tmp = trim($server_config['backup_tmp']);
 
 		if($backup_dir != '') {
 			$run_backups = true;
@@ -72,7 +73,12 @@ class cronjob_backup_mail extends cronjob {
 				} else {
 					chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
 				}
-
+				system('which pigz > /dev/null', $ret);
+				if($ret === 0) {
+					$use_pigz = true;
+				} else {
+					$use_pigz = false;
+				}
 				foreach($records as $rec) {
 					//* Do the mailbox backup
 					$email = $rec['email'];
@@ -120,11 +126,15 @@ class cronjob_backup_mail extends cronjob {
 		
 							if($backup_mode == 'userzip') {
 								$mail_backup_file.='.zip';
-								exec('cd '.$this->tmp_backup_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r backup > /dev/null && rm -rf backup', $tmp_output, $retval);
+								exec('cd '.$this->tmp_backup_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b '.escapeshellarg($backup_tmp).' -r backup > /dev/null && rm -rf backup', $tmp_output, $retval);
 							}
 							else {
 								$mail_backup_file.='.tar.gz';
-								exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$this->tmp_backup_dir.' backup && rm -rf '.$this->tmp_backup_dir.'/backup'), $tmp_output, $retval);
+								if ($use_pigz) {
+									exec('tar pcf - --directory '.escapeshellarg($this->tmp_backup_dir).' backup | pigz > '.$mail_backup_dir.'/'.$mail_backup_file.' && rm -rf '.$this->tmp_backup_dir.'/backup', $tmp_output, $retval);
+								} else {
+									exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$this->tmp_backup_dir.' backup && rm -rf '.$this->tmp_backup_dir.'/backup'), $tmp_output, $retval);
+								}
 							}
 							
 							if ($retval != 0) {
@@ -144,11 +154,15 @@ class cronjob_backup_mail extends cronjob {
 							//* create archives
 							if($backup_mode == 'userzip') {
 								$mail_backup_file.='.zip';
-								exec('cd '.$domain_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r '.$source_dir.' > /dev/null', $tmp_output, $retval);
+								exec('cd '.$domain_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b '.escapeshellarg($backup_tmp).' -r '.$source_dir.' > /dev/null', $tmp_output, $retval);
 							} else {
 								/* Create a tar.gz backup */
 								$mail_backup_file.='.tar.gz';
-								exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$domain_dir.' '.$source_dir), $tmp_output, $retval);
+								if ($use_pigz) {
+									exec('tar pcf - --directory '.escapeshellarg($domain_dir).' '.escapeshellarg($source_dir).' | pigz > '.$mail_backup_dir.'/'.$mail_backup_file, $tmp_output, $retval);
+								} else {
+									exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$domain_dir.' '.$source_dir), $tmp_output, $retval);
+								}
 							}
 						}
 						
-- 
GitLab


From 66e7e7b9b1542cc335d5388743c9d2d725500d60 Mon Sep 17 00:00:00 2001
From: Costin <manykc@yahoo.com>
Date: Fri, 16 Feb 2018 00:26:48 +0100
Subject: [PATCH 14/23] Fix bug where in a multiserver setup, deleting a backup
 will not remove its details from the master database as well.

---
 server/plugins-available/backup_plugin.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 4eb8735f5..eda546dec 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -170,7 +170,7 @@ class backup_plugin {
 						
 						$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
 						$app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
-						if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
+						if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
 						$app->log('unlink '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
 					}
 				}
-- 
GitLab


From 770fe4fe8c1cca649da308a779671f1515bc89b8 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Sun, 18 Feb 2018 11:18:34 +0100
Subject: [PATCH 15/23] fixed regex for backup tmp dir

---
 interface/web/admin/form/server_config.tform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 93094629a..fbf23503c 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -190,7 +190,7 @@ $form["tabs"]['server'] = array(
 			'validators' => array(	0 => array('type' => 'NOTEMPTY',
 										'errmsg' => 'tmpdir_path_error_empty'),
 									1 => array ( 	'type' => 'REGEX',
-										'regex' => '/^\/[a-zA-Z0-9\.\-\_\/]{5,128}$/',
+										'regex' => "/(|^\\/{1,2}(?:[\\w-]+[.]?\\/?){5,128})$/",
 										'errmsg'=> 'tmpdir_path_error_regex'),
 			),
 			'value' => '',
-- 
GitLab


From b1c987a0cc452148a2134da32de9cbdc156ad991 Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Mon, 19 Feb 2018 11:29:57 +0100
Subject: [PATCH 16/23] update regex from last commit

---
 interface/web/admin/form/server_config.tform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index fbf23503c..4223ee451 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -190,7 +190,7 @@ $form["tabs"]['server'] = array(
 			'validators' => array(	0 => array('type' => 'NOTEMPTY',
 										'errmsg' => 'tmpdir_path_error_empty'),
 									1 => array ( 	'type' => 'REGEX',
-										'regex' => "/(|^\\/{1,2}(?:[\\w-]+[.]?\\/?){5,128})$/",
+										'regex' => "/^\/[a-zA-Z0-9\.\-\_\/]{4,128}$/",
 										'errmsg'=> 'tmpdir_path_error_regex'),
 			),
 			'value' => '',
-- 
GitLab


From 812e8df601d08d0275752da3805ecbd5f826f620 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 22 Feb 2018 13:19:02 +0100
Subject: [PATCH 17/23] - allow multiple email addresses in $to
 (functions->mail) separated by comma

---
 interface/lib/classes/functions.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index a646e1be0..57e5fdc64 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -58,6 +58,10 @@ class functions {
 		if($cc != '') $app->ispcmail->setHeader('Cc', $cc);
 		if($bcc != '') $app->ispcmail->setHeader('Bcc', $bcc);
 
+		if(is_string($to) && strpos($to, ',') !== false) {
+				$to = preg_split('/\s*,\s*/', $to);
+		}
+		
 		$app->ispcmail->send($to);
 		$app->ispcmail->finish();
 
-- 
GitLab


From 90ce11e0ff6e8de093666b630d2cd96e658ef430 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 22 Feb 2018 16:47:08 +0100
Subject: [PATCH 18/23] Improved dovecot config file editing.

---
 install/dist/lib/debian60.lib.php  | 5 ++++-
 install/dist/lib/fedora.lib.php    | 7 +++++++
 install/lib/installer_base.lib.php | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 57fb19344..0cd711656 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -111,7 +111,10 @@ class installer extends installer_base {
 			}
 			if(version_compare($dovecot_version,2.2) >= 0) {
 				// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
-				replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
 			}
 		} else {
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 8aa75c9d0..418c47c67 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -443,6 +443,13 @@ class installer_dist extends installer_base {
 			if(version_compare($dovecot_version,2.1) < 0) {
 				removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
 			}
+			if(version_compare($dovecot_version,2.2) >= 0) {
+				// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
+			}
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 		} else {
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 6db51c352..421afa3fc 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1292,7 +1292,10 @@ class installer_base {
 			}
 			if(version_compare($dovecot_version,2.2) >= 0) {
 				// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
-				replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
 			}
 		}
 
-- 
GitLab


From 04092a9936ad23b78280f0fe7b19939747ccd706 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 22 Feb 2018 16:48:13 +0100
Subject: [PATCH 19/23] Set default email sending mode in ISPConfig UI to smtp

---
 install/tpl/system.ini.master                    | 2 ++
 interface/web/admin/form/system_config.tform.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 535bed783..42a003b9c 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -14,6 +14,8 @@ mailbox_show_custom_rules_tab=y
 mailboxlist_webmail_link=y
 webmail_url=/webmail
 dkim_path=/var/lib/amavis/dkim
+smtp_enabled=y
+smtp_host=localhost
 
 [monitor]
 
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 681d166b3..449805f3c 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -311,7 +311,7 @@ $form["tabs"]['mail'] = array (
 		'smtp_enabled' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
-			'default' => 'n',
+			'default' => 'y',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'smtp_host' => array (
@@ -328,7 +328,7 @@ $form["tabs"]['mail'] = array (
 					'type' => 'STRIPNL')
 			),
 			'formtype' => 'TEXT',
-			'default' => '',
+			'default' => 'localhost',
 			'value'  => '',
 			'width'  => '30',
 			'maxlength' => '255'
-- 
GitLab


From cee6f9f9d14edcbdf389f977cfaaef1ef2bed4e8 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 22 Feb 2018 16:49:03 +0100
Subject: [PATCH 20/23] Removed numbers from PHP config tokens in apache vhost
 template.

---
 server/conf/vhost.conf.master | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 6a026d447..2ec0e153e 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -252,16 +252,16 @@
 </tmpl_if>
 <tmpl_if name='php' op='==' value='cgi'>
 		# php as cgi enabled
-		ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
-		Action php5-cgi /php5-cgi
+		ScriptAlias /php-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
+		Action php-cgi /php-cgi
 		<Directory {tmpl_var name='web_document_root_www'}>
 			<FilesMatch "\.php[345]?$">
-				SetHandler php5-cgi
+				SetHandler php-cgi
 			</FilesMatch>
 		</Directory>
 		<Directory {tmpl_var name='web_document_root'}>
 			<FilesMatch "\.php[345]?$">
-				SetHandler php5-cgi
+				SetHandler php-cgi
 			</FilesMatch>
 		</Directory>
 		<Directory {tmpl_var name='cgi_starter_path'}>
@@ -346,21 +346,21 @@
 			    </Directory>
 				<Directory {tmpl_var name='web_document_root_www'}>
 					<FilesMatch "\.php[345]?$">
-						SetHandler php5-fcgi
+						SetHandler php-fcgi
 					</FilesMatch>
 				</Directory>
 				<Directory {tmpl_var name='web_document_root'}>
 					<FilesMatch "\.php[345]?$">
-						SetHandler php5-fcgi
+						SetHandler php-fcgi
 					</FilesMatch>
 				</Directory>
-                Action php5-fcgi /php5-fcgi virtual
-				Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
+                Action php-fcgi /php-fcgi virtual
+				Alias /php-fcgi {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
 <tmpl_if name='use_tcp'>
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization  -pass-header Content-Type    
+                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization  -pass-header Content-Type    
 </tmpl_if>
 <tmpl_if name='use_socket'>
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization  -pass-header Content-Type
+                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization  -pass-header Content-Type
 </tmpl_if>
 		</IfModule>
 		<IfModule mod_proxy_fcgi.c>
@@ -468,7 +468,7 @@
 		</tmpl_if>
 <tmpl_if name="rewrite_is_url" op="==" value="n">
 		RewriteCond %{REQUEST_URI} !^/webdav/
-		RewriteCond %{REQUEST_URI} !^/php5-fcgi/
+		RewriteCond %{REQUEST_URI} !^/php-fcgi/
 		RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
 </tmpl_if>
 		
-- 
GitLab


From 386c93a72cebb869707632f4c7d156ce43ed99e8 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 23 Feb 2018 16:51:10 +0100
Subject: [PATCH 21/23] - fixed accidently deleting mysql r/o user completely
 when it is removed from a single database, fixes #4963

---
 server/plugins-available/mysql_clientdb_plugin.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index 35ade14c4..14052e5b7 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -504,7 +504,7 @@ class mysql_clientdb_plugin {
 							$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
 						} else {
 							// Find out users to drop and users to revoke
-							$drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
+							$drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list);
 							if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
 							if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
 						}
@@ -580,7 +580,7 @@ class mysql_clientdb_plugin {
 						$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
 					} else {
 						// Find out users to drop and users to revoke
-						$drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']);
+						$drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $data['old']['remote_ips']);
 						if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link);
 						if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link);
 					}
-- 
GitLab


From 6da26846ff5b7088da8bd19c51a5b7c60c60b9ee Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 26 Feb 2018 11:05:03 +0100
Subject: [PATCH 22/23] Fixes #4924 Email transport type disappeared . Thank's
 to Oliver for the fix.

---
 interface/web/mail/mail_transport_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index 65667726a..3923d9c48 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -107,7 +107,7 @@ class page_action extends tform_actions {
 			}
 		}
 		$rec["type"] = $type_select;
-		$app->tpl->setVar($rec, null, true);
+		$app->tpl->setVar($rec);
 		unset($type);
 		unset($types);
 
-- 
GitLab


From 87c0dde9b1b19600f4a6ecf32659601fe3859c05 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 26 Feb 2018 15:29:32 +0100
Subject: [PATCH 23/23] - fixed LE verification not working on nginx
 aliasdomains using rewriting, fixes #4618, #4746

---
 server/conf/nginx_vhost.conf.master | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 8cfdbcf8f..596662d8a 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -313,8 +313,19 @@ server {
         }
 </tmpl_loop>
 </tmpl_if>
+		## no redirect for acme
+		location ^~ /.well-known/acme-challenge/ {
+			access_log off;
+			log_not_found off;
+			root /usr/local/ispconfig/interface/acme/;
+			autoindex off;
+			index index.html;
+			try_files $uri $uri/ =404;
+        }
 <tmpl_if name='use_rewrite'>
-        rewrite ^ <tmpl_var name='rewrite_target'>$request_uri? <tmpl_var name='rewrite_type'>;
+		location / {
+			rewrite ^ <tmpl_var name='rewrite_target'>$request_uri? <tmpl_var name='rewrite_type'>;
+		}
 </tmpl_if>
 <tmpl_if name='use_proxy'>
         location / {
-- 
GitLab