Merge branch 'master' of https://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal · Florian Schaal · commit 22011d1f4680 · 2017-11-05T09:35:12.000+01:00
diff --git a/docs/hardening/anti-bruteforce/jail.local b/docs/hardening/anti-bruteforce/jail.local
@@ -5,6 +5,6 @@
  enabled = true
  filter = wp-auth
  action = iptables-multiport[name=wp-auth, port="http,https"]
- logpath = /var/www/clients/client*/web*/log/*.log
+ logpath = /var/log/ispconfig/httpd/*/*.log
  bantime = 1200
- maxretry = 5
+ maxretry = 5
diff --git a/install/dist/conf/ubuntu1604.conf.php b/install/dist/conf/ubuntu1604.conf.php
@@ -187,7 +187,7 @@
 $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
-$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch';
+$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch /etc/localtime';
 $conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
 
 //* Squid
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
@@ -663,6 +663,7 @@ function ini_to_array($ini) {
 				$section = strtolower($matches[1]);
 			} elseif(preg_match("/^([\w\d_]+)=(.*)$/", $line, $matches) && $section != null) {
 				$item = trim($matches[1]);
+				if(!isset($config[$section])) $config[$section] = array();
 				$config[$section][$item] = trim($matches[2]);
 			}
 		}
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
@@ -27,7 +27,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-class db extends mysqli
+class db
 {
 	/**#@+
      * @access private
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
@@ -49,8 +49,9 @@ CREATE TABLE IF NOT EXISTS `dns_ssl_ca` (
 ALTER TABLE `dns_ssl_ca` ADD UNIQUE(`ca_issue`);
 
 UPDATE `dns_ssl_ca` SET `ca_issue` = 'comodo.com' WHERE `ca_issue` = 'comodoca.com';
-UPDATE `dns_ssl_ca` SET `ca_issue` = 'geotrust.com' WHERE `ca_issue` = 'symantec.com';
-UPDATE `dns_ssl_ca` SET `ca_issue` = 'thawte.com' WHERE `ca_issue` = 'symantec.com';
+DELETE FROM `dns_ssl_ca` WHERE `ca_issue` = 'geotrust.com';
+DELETE FROM `dns_ssl_ca` WHERE `ca_issue` = 'thawte.com';
+UPDATE `dns_ssl_ca` SET `ca_name` = 'Symantec / Thawte / GeoTrust' WHERE `ca_issue` = 'symantec.com';
 
 INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `active`, `ca_name`, `ca_issue`, `ca_wildcard`, `ca_iodef`, `ca_critical`) VALUES
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'AC Camerfirma', 'camerfirma.com', 'Y', '', 0),
@@ -75,7 +76,6 @@ INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Entrust', 'entrust.net', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Firmaprofesional', 'firmaprofesional.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'FNMT', 'fnmt.es', 'Y', '', 0),
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'GeoTrust (Symantec)', 'symantec.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'GlobalSign', 'globalsign.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'GoDaddy', 'godaddy.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Google Trust Services', 'pki.goog', 'Y', '', 0),
@@ -94,10 +94,9 @@ INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Sertifitseerimiskeskuse', 'sk.ee', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'StartCom', 'startcomca.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'SwissSign', 'swisssign.com', 'Y', '', 0),
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Symantec', 'symantec.com', 'Y', '', 0),
+(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Symantec / Thawte / GeoTrust', 'symantec.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'T-Systems', 'telesec.de', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Telia', 'telia.com', 'Y', '', 0),
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Thawte (Symantec)', 'symantec.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Trustwave', 'trustwave.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Web.com', 'web.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'WISeKey', 'wisekey.com', 'Y', '', 0),
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
@@ -546,7 +546,6 @@ INSERT INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `s
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Entrust', 'entrust.net', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Firmaprofesional', 'firmaprofesional.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'FNMT', 'fnmt.es', 'Y', '', 0),
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'GeoTrust (Symantec)', 'symantec.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'GlobalSign', 'globalsign.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'GoDaddy', 'godaddy.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Google Trust Services', 'pki.goog', 'Y', '', 0),
@@ -565,10 +564,9 @@ INSERT INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `s
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Sertifitseerimiskeskuse', 'sk.ee', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'StartCom', 'startcomca.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'SwissSign', 'swisssign.com', 'Y', '', 0),
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Symantec', 'symantec.com', 'Y', '', 0),
+(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Symantec / Thawte / GeoTrust', 'symantec.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'T-Systems', 'telesec.de', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Telia', 'telia.com', 'Y', '', 0),
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Thawte (Symantec)', 'symantec.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Trustwave', 'trustwave.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Web.com', 'web.com', 'Y', '', 0),
 (NULL, 1, 1, 'riud', 'riud', '', 'Y', 'WISeKey', 'wisekey.com', 'Y', '', 0),
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
@@ -27,8 +27,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-class db extends mysqli
-{
+class db {
 	/**#@+
      * @access private
      */
diff --git a/interface/lib/classes/remote.d/server.inc.php b/interface/lib/classes/remote.d/server.inc.php
@@ -228,7 +228,7 @@ public function server_get_functions($session_id, $server_id)
             return false;
 		}
 		if (!empty($session_id) && !empty($server_id)) { 
-			$sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, mirror_server_id FROM server WHERE server_id  = ?";
+			$sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, xmpp_server, mirror_server_id FROM server WHERE server_id  = ?";
 			$all = $app->db->queryOneRecord($sql, $server_id);
 			return $all;
 		} else {
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
@@ -348,8 +348,7 @@ function onAfterInsert() {
 		$sql = "SELECT * FROM client_message_template WHERE template_type = 'welcome' AND sys_groupid = ?";
 		$email_template = $app->db->queryOneRecord($sql, $client_group_id);
 		$client = $app->tform->getDataRecord($this->id);
-
-		if(is_array($email_template) && $client['email'] != '') {
+		if(is_array($email_template) && $email_template['subject'] != '' && $email_template['message'] != '' && $client['email'] != '') {
 			//* Parse client details into message
 			$message = $email_template['message'];
 			$subject = $email_template['subject'];
diff --git a/interface/web/client/form/message_template.tform.php b/interface/web/client/form/message_template.tform.php
@@ -78,6 +78,9 @@
 		'subject' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
+			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+				'errmsg'=> 'subject_error_empty'),
+			),
 			'default' => '',
 			'value'  => '',
 			'separator' => '',
@@ -89,6 +92,9 @@
 		'message' => array (
 			'datatype' => 'TEXT',
 			'formtype' => 'TEXTAREA',
+			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+				'errmsg'=> 'message_error_empty'),
+			),
 			'default' => '',
 			'value'  => '',
 			'separator' => '',
diff --git a/interface/web/client/lib/lang/de_client_message_template.lng b/interface/web/client/lib/lang/de_client_message_template.lng
@@ -8,4 +8,6 @@ $wb['Settings'] = 'Einstellung';
 $wb['variables_txt'] = 'Variable';
 $wb['variables_description_txt'] = '(Die Benutzername und Passwort Variable können nur in Willkommensnachrichten verwendet werden.)';
 $wb['duplicate_welcome_error'] = 'Es kann nur eine Standard Willkommensnachrichten Vorlage geben. Bitte bearbeiten Sie die bestehende Vorlage anstatt eine neue hinzuzufügen.';
+$wb['subject_error_empty'] = 'Betreff ist leer';
+$wb['message_error_empty'] = 'Nachricht ist leer';
 ?>
diff --git a/interface/web/client/lib/lang/en_client_message_template.lng b/interface/web/client/lib/lang/en_client_message_template.lng
@@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting';
 $wb['variables_txt'] = 'Variables';
 $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
 $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
-?>
+$wb['subject_error_empty'] = 'Subject is empty';
+$wb['message_error_empty'] = 'Message is empty';
+?>
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
@@ -37,9 +37,9 @@
 if(isset($_GET['hide'])) {
 	if($_GET['hide'] == 'donate') {
 		$timeout = time()+31536000;
-		$tmp = $app->db->queryOneRecord("SELECT value FROM sys_config WHERE group = 'interface' AND name = 'hide_donation_dashlet'");
+		$tmp = $app->db->queryOneRecord("SELECT `value` FROM `sys_config` WHERE `group` = 'interface' AND `name` = 'hide_donation_dashlet'");
 		if(is_array($tmp)) {
-			$app->db->query("UPDATE sys_config SET value = ? WHERE group = 'interface' AND name = 'hide_donation_dashlet')",$timeout);
+			$app->db->query("UPDATE `sys_config` SET `value` = ? WHERE `group` = 'interface' AND `name` = 'hide_donation_dashlet'",$timeout);
 		} else {
 			$app->db->query("INSERT INTO `sys_config` (`group`,`name`,`value`) VALUES ('interface','hide_donation_dashlet',?)",$timeout);
 		}
diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm
@@ -147,7 +147,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <div class="form-group">
                 <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-3">
-                    <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} />
+                    {tmpl_var name='active'}
                 </div>
             </div>
 
diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php
@@ -157,7 +157,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('' => 'DB-Default', 'latin1' => 'Latin 1', 'utf8' => 'UTF-8')
+			'value'  => array('' => 'DB-Default', 'latin1' => 'Latin 1', 'utf8' => 'UTF-8', 'utf8mb4' => 'UTF-8 4-Byte')
 		),
 		'remote_access' => array (
 			'datatype' => 'VARCHAR',
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
@@ -559,7 +559,7 @@ private function doInstallation($task, $sxe)
 			$shell_ret_str = implode("\n", $shell_ret);
 
 			// Although $shell_retcode might be 0, there can be PHP errors. Filter them:
-			if(substr_count($shell_ret_str, 'Warning: ') > 0) $shell_retcode = 1;
+			if(stripos($shell_ret_str,'error: ')!==false)$shell_retcode=1;
 
 			// If an error has occurred, the return code is != 0
 			if($shell_retcode != 0) throw new Exception($shell_ret_str);
diff --git a/server/lib/classes/cronjob.inc.php b/server/lib/classes/cronjob.inc.php
@@ -114,7 +114,7 @@ protected function onPrepare() {
 				$next_run = $app->cron->getNextRun(ISPConfigDateTime::dbtime());
 				$this->_next_run = $next_run;
 
-				$app->db->query("REPLACE INTO `sys_cron` (`name`, `last_run`, `next_run`, `running`) VALUES (?, ?, ?, ?)", get_class($this), ($this->_last_run ? $this->_last_run : "#NULL#"), ($next_run === false ? "#NULL#" : $next_run . "'"), ($this->_running == true ? "1" : "0"));
+				$app->db->query("REPLACE INTO `sys_cron` (`name`, `last_run`, `next_run`, `running`) VALUES (?, ?, ?, ?)", get_class($this), ($this->_last_run ? $this->_last_run : "#NULL#"), ($next_run === false ? "#NULL#" : $next_run), ($this->_running == true ? "1" : "0"));
 			}
 		}
 	}
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
@@ -27,7 +27,7 @@
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-class db extends mysqli
+class db
 {
 	/**#@+
      * @access private

Original file line number	Diff line number	Diff line change
`@@ -663,6 +663,7 @@ function ini_to_array($ini) {`
`663`	`663`	`$section = strtolower($matches[1]);`
`664`	`664`	`} elseif(preg_match("/^([\w\d_]+)=(.*)$/", $line, $matches) && $section != null) {`
`665`	`665`	`$item = trim($matches[1]);`
	`666`	`+ if(!isset($config[$section])) $config[$section] = array();`
`666`	`667`	`$config[$section][$item] = trim($matches[2]);`
`667`	`668`	`}`
`668`	`669`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.`
`28`	`28`	`*/`
`29`	`29`
`30`		`-class db extends mysqli`
	`30`	`+class db`
`31`	`31`	`{`
`32`	`32`	`/**#@+`
`33`	`33`	`* @access private`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public function server_get_functions($session_id, $server_id)`
`228`	`228`	`return false;`
`229`	`229`	`}`
`230`	`230`	`if (!empty($session_id) && !empty($server_id)) {`
`231`		`- $sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, mirror_server_id FROM server WHERE server_id = ?";`
	`231`	`+ $sql = "SELECT mail_server, web_server, dns_server, file_server, db_server, vserver_server, proxy_server, firewall_server, xmpp_server, mirror_server_id FROM server WHERE server_id = ?";`
`232`	`232`	`$all = $app->db->queryOneRecord($sql, $server_id);`
`233`	`233`	`return $all;`
`234`	`234`	`} else {`