Merge branch 'dns-status' of git.ispconfig.org:darkalex/ispconfig3 into dns-status and fixed some small issues

Conflicts:
	install/lib/installer_base.lib.php
	install/sql/incremental/upd_dev_collection.sql
	interface/web/dns/list/dns_soa.list.php
	interface/web/dns/templates/dns_soa_admin_list.htm
	interface/web/dns/templates/dns_soa_list.htm
	server/plugins-available/bind_plugin.inc.php

Author: A. Täffner

install/lib/installer_base.lib.php

@@ -666,7 +666,7 @@ public function grant_master_database_rights($verbose = false) {
 				if(!$this->dbmaster->query($query, $value['db'] . '.mail_backup', $value['user'], $host)) {
 					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
 				}
-				
+
 				$query = "GRANT SELECT, UPDATE(`dnssec_initialized`, `dnssec_info`, `dnssec_last_signed`, `status`, `status_txt`) ON ?? TO ?@?";
 				if ($verbose){
 					echo $query ."\n";

install/sql/incremental/upd_dev_collection.sql

@@ -12,6 +12,6 @@ ALTER TABLE `mail_mailinglist` ADD `posting_policy` enum('closed','moderated','f
 ALTER TABLE `web_domain` CHANGE `folder_directive_snippets` `folder_directive_snippets` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL;
 ALTER TABLE `sys_user` ADD `last_login_ip` VARCHAR(50) NULL AFTER `lost_password_reqtime`;
 ALTER TABLE `sys_user` ADD `last_login_at` BIGINT(20) NULL AFTER `last_login_ip`;
+-- DNS-Status (2 lines)
 ALTER TABLE `dns_soa` ADD COLUMN `status` enum('OK','ERROR','PENDING') NOT NULL DEFAULT 'OK' AFTER `active`;
 ALTER TABLE `dns_soa` ADD COLUMN `status_txt` text AFTER `status`;
-

interface/web/dns/templates/dns_soa_admin_list.htm

@@ -57,7 +57,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <tbody>
                 <tmpl_loop name="records">
                     <tr>
-                        <td style="{tmpl_var name="status"}"><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='status_txt'}">{tmpl_var name="active"} {tmpl_var name='status_txt'}</td>
+                        <td style="{tmpl_var name="status"}"><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='status_txt'}">{tmpl_var name="active"}</td>
 						<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
                         <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
                         <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>

server/plugins-available/bind_plugin.inc.php

@@ -339,6 +339,7 @@ function soa_update($event_name, $data) {
 
 			if(is_file($filename)) unlink($filename);
 			if(is_file($filename.'.err')) unlink($filename.'.err');
+			if(is_file($filename.'.pending')) unlink($filename.'.pending');
 			if(is_file($filename.'.signed')) unlink($filename.'.signed');
 		}