From 015dffdc589b396d72092583cc526674f0a9a8d5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 18 Nov 2013 07:36:00 -0500
Subject: [PATCH] Merge remote-tracking branch 'sebj/master' and tidied up merged code
---
interface/web/dns/dns_wizard.php | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index d4b07f7..2b657a1 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -46,14 +46,18 @@
$sys_groupid = (isset($_POST['client_group_id']))?$app->functions->intval($_POST['client_group_id']):0;
// get the correct server_id
-if($_SESSION['s']['user']['typ'] == 'admin') {
- $server_id = (isset($_POST['server_id']))?$app->functions->intval($_POST['server_id']):1;
-} else {
- $client_group_id = $_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");
- $server_id = $client["default_dnsserver"];
+if (isset($_POST['server_id'])) {
+ $server_id = $app->functions->intval($_POST['server_id']);
+ $post_server_id = true;
}
-
+else if (isset($_POST['server_id_value'])) {
+ $server_id = $app->functions->intval($_POST['server_id_value']);
+ $post_server_id = true;
+ }
+else {
+ $server_id = 1;
+ $post_server_id = false;
+}
// Load the templates
$records = $app->db->queryAllRecords("SELECT * FROM dns_template WHERE visible = 'Y' ORDER BY name ASC");
@@ -117,6 +121,33 @@
$app->tpl->setVar("client_group_id", $client_select);
}
+if($_SESSION["s"]["user"]["typ"] != 'admin')
+{
+ $client_group_id = $_SESSION["s"]["user"]["default_group"];
+ $client_dns = $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");
+
+ $client_dns['dns_servers_ids'] = explode(',', $client_dns['dns_servers']);
+
+ $only_one_server = count($client_dns['dns_servers_ids']) === 1;
+ $app->tpl->setVar('only_one_server', $only_one_server);
+
+ if ($only_one_server) {
+ $app->tpl->setVar('server_id_value', $client_dns['dns_servers_ids'][0]);
+ }
+
+ $sql = "SELECT server_id, server_name FROM server WHERE server_id IN (" . $client_dns['dns_servers'] . ");";
+ $dns_servers = $app->db->queryAllRecords($sql);
+
+ $options_dns_servers = "";
+
+ foreach ($dns_servers as $dns_server) {
+ $options_dns_servers .= "<option value='$dns_server[server_id]'>$dns_server[server_name]</option>";
+ }
+
+ $app->tpl->setVar("server_id", $options_dns_servers);
+ unset($options_dns_servers);
+
+}
$template_record = $app->db->queryOneRecord("SELECT * FROM dns_template WHERE template_id = '$template_id'");
$fields = explode(',', $template_record['fields']);
@@ -132,6 +163,23 @@
$error = '';
+ if ($post_server_id)
+ {
+ $client_group_id = $_SESSION["s"]["user"]["default_group"];
+ $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");
+
+ $client['dns_servers_ids'] = explode(',', $client['dns_servers']);
+
+ // Check if chosen server is in authorized servers for this client
+ if (!(is_array($client['dns_servers_ids']) && in_array($server_id, $client['dns_servers_ids'])) && $_SESSION["s"]["user"]["typ"] != 'admin') {
+ $error .= $app->lng('error_not_allowed_server_id').'<br />';
+ }
+ }
+ else
+ {
+ $error .= $app->lng('error_no_server_id').'<br />';
+ }
+
// apply filters
if(isset($_POST['domain']) && $_POST['domain'] != ''){
$_POST['domain'] = $app->functions->idn_encode($_POST['domain']);
--
Gitblit v1.9.1