Merge branch 'master' into 'master'

Master



See merge request !598

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -31,7 +31,7 @@ CHANGE `warnbannedrecip` `warnbannedrecip` ENUM('N','Y') CHARACTER SET utf8 COLL
 CHANGE `warnbadhrecip` `warnbadhrecip` ENUM('N','Y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N';
 
 CREATE TABLE IF NOT EXISTS `dns_ssl_ca` (
-  `id` int(10) unsigned NOT AUTO_INCREMENT,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
   `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
   `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
@@ -42,8 +42,9 @@ CREATE TABLE IF NOT EXISTS `dns_ssl_ca` (
   `ca_issue` varchar(255) NOT NULL DEFAULT '',
   `ca_wildcard` enum('Y','N') NOT NULL DEFAULT 'N',
   `ca_iodef` text NOT NULL,
-  `ca_critical` tinyint(1) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  `ca_critical` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 INSERT 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', 'Comodo', 'comodoca.com', 'Y', '', 0),

install/sql/ispconfig3.sql

@@ -507,7 +507,7 @@ CREATE TABLE `dns_rr` (
 -- 
 
 CREATE TABLE IF NOT EXISTS `dns_ssl_ca` (
-  `id` int(10) unsigned NOT AUTO_INCREMENT,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
   `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
   `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
@@ -518,8 +518,9 @@ CREATE TABLE IF NOT EXISTS `dns_ssl_ca` (
   `ca_issue` varchar(255) NOT NULL DEFAULT '',
   `ca_wildcard` enum('Y','N') NOT NULL DEFAULT 'N',
   `ca_iodef` text NOT NULL,
-  `ca_critical` tinyint(1) NOT NULL DEFAULT '0'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  `ca_critical` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 INSERT 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', 'Comodo', 'comodoca.com', 'Y', '', 0),

interface/web/admin/form/system_config.tform.php

@@ -653,11 +653,11 @@
 	'fields'  => array (),
 	'plugins' => array (
 		'dns_ca' => array (
-			'class'   => 'plugin_dns_ca',
+			'class'   => 'plugin_system_config_dns_ca',
 			'options' => array()
 		),
 		'dns_ca_list' => array (
-			'class'   => 'plugin_dns_ca_list',
+			'class'   => 'plugin_system_config_dns_ca_list',
 			'options' => array()
 		)
 	)

server/plugins-available/bind_plugin.inc.php

@@ -271,9 +271,8 @@ function soa_update($event_name, $data) {
 						unset($temp[0]);
 						$records[$i]['data'] = implode(' ', $temp);
 						$data_new = str_replace(array('"', ' '), '', $records[$i]['data']);
-						//TODO: check if need \t and 00
-						$hex = unpack('H*', "\t$data_new");
-						$hex[1] = '00'.$hex[1];
+						$hex = unpack('H*', $data_new);
+						$hex[1] = '0005'.strtoupper($hex[1]);
 						$length = strlen($hex[1])/2;
 						$data_new = "\# $length $hex[1]";
 						$records[$i]['data'] = $data_new;