Skip to content
Snippets Groups Projects
Commit 25618551 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '6524-dns-zone-list-server-column-empty' into 'develop'

Resolve "DNS Zone list server column empty"

Closes #6524

See merge request !1760
parents 5f1eb5f2 decf33d9
No related branches found
No related tags found
1 merge request!1760Resolve "DNS Zone list server column empty"
Pipeline #13550 passed with stage
in 6 seconds
......@@ -47,12 +47,12 @@ class custom_datasource {
if($_SESSION["s"]["user"]["typ"] == 'user') {
// Get the limits of the client
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
$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);
$sql = "SELECT server_id,server_name FROM server WHERE server_id = ?";
$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);
$sql = "SELECT server_id,server_name FROM server WHERE server_id in (?)";
} else {
$sql = "SELECT server_id,server_name FROM server WHERE dns_server = 1 ORDER BY server_name AND mirror_server_id = 0";
}
$records = $app->db->queryAllRecords($sql, $client['default_dnsserver']);
$records = $app->db->queryAllRecords($sql, $client['dns_servers']);
$records_new = array();
if(is_array($records)) {
foreach($records as $rec) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment