From 1fef4a59728ae58e81ba3c640268b7d14e133299 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Tue, 29 Oct 2013 20:19:03 -0400
Subject: [PATCH] - Fixed FS#3203 - Choice of "Default Secondary DNS Server" broken.
---
interface/web/dns/list/dns_slave.list.php | 6 +++---
interface/lib/classes/custom_datasource.inc.php | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php
index f309d01..44fee19 100644
--- a/interface/lib/classes/custom_datasource.inc.php
+++ b/interface/lib/classes/custom_datasource.inc.php
@@ -63,6 +63,28 @@
return $records_new;
}
+ function slave_dns_servers($field, $record) {
+ global $app, $conf;
+
+ if($_SESSION["s"]["user"]["typ"] == 'user') {
+ // Get the limits of the client
+ $client_group_id = $_SESSION["s"]["user"]["default_group"];
+ $client = $app->db->queryOneRecord("SELECT default_slave_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $sql = "SELECT server_id,server_name FROM server WHERE server_id = ".$client['default_slave_dnsserver'];
+ } else {
+ $sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name";
+ }
+ $records = $app->db->queryAllRecords($sql);
+ $records_new = array();
+ if(is_array($records)) {
+ foreach($records as $rec) {
+ $key = $rec['server_id'];
+ $records_new[$key] = $rec['server_name'];
+ }
+ }
+ return $records_new;
+ }
+
function webdav_domains($field, $record) {
global $app, $conf;
diff --git a/interface/web/dns/list/dns_slave.list.php b/interface/web/dns/list/dns_slave.list.php
index 5276557..f00d33b 100644
--- a/interface/web/dns/list/dns_slave.list.php
+++ b/interface/web/dns/list/dns_slave.list.php
@@ -64,9 +64,9 @@
'op' => "like",
'prefix' => "%",
'suffix' => "%",
- 'datasource'=> array ( 'type' => 'CUSTOM',
- 'class'=> 'custom_datasource',
- 'function'=> 'dns_servers'
+ 'datasource'=> array ( 'type' => 'CUSTOM',
+ 'class' => 'custom_datasource',
+ 'function' => 'slave_dns_servers'
),
'width' => "",
'value' => "");
--
Gitblit v1.9.1