Merge branch 'stable-3.1'

Marius Burkard · Marius Burkard · commit a46fd60331ab · 2017-10-19T18:38:18.000+02:00
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/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/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/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`