Skip to content

Commit 2561855

Browse files
author
Till Brehm
committed
Merge branch '6524-dns-zone-list-server-column-empty' into 'develop'
Resolve "DNS Zone list server column empty" Closes #6524 See merge request ispconfig/ispconfig3!1760
2 parents 5f1eb5f + decf33d commit 2561855

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

interface/lib/classes/custom_datasource.inc.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ function dns_servers($field, $record) {
4747
if($_SESSION["s"]["user"]["typ"] == 'user') {
4848
// Get the limits of the client
4949
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
50-
$client = $app->db->queryOneRecord("SELECT default_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
51-
$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
50+
$client = $app->db->queryOneRecord("SELECT dns_servers FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
51+
$sql = "SELECT server_id,server_name FROM server WHERE server_id in (?)";
5252
} else {
5353
$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name AND mirror_server_id = 0";
5454
}
55-
$records = $app->db->queryAllRecords($sql, $client['default_dnsserver']);
55+
$records = $app->db->queryAllRecords($sql, $client['dns_servers']);
5656
$records_new = array();
5757
if(is_array($records)) {
5858
foreach($records as $rec) {

0 commit comments

Comments
 (0)