From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
interface/web/dns/dns_soa_edit.php | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index a94cf01..e836025 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -50,6 +50,16 @@
class page_action extends tform_actions {
+ function onShow() {
+ global $app;
+ //* Reset the page number of the list form for the dns
+ //* records to 0 if we are on the first tab of the soa form.
+ if($app->tform->getNextTab() == 'dns_soa') {
+ $_SESSION['search']['dns_a']['page'] = 0;
+ }
+ parent::onShow();
+ }
+
function onShowNew() {
global $app, $conf;
@@ -93,7 +103,8 @@
// Fill the client select field
$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
$clients = $app->db->queryAllRecords($sql);
- $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
+ $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
+ $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>';
$tmp_data_record = $app->tform->getDataRecord($this->id);
if(is_array($clients)) {
foreach( $clients as $client) {
@@ -153,7 +164,12 @@
if(stristr($this->dataRecord["mbox"],'@')) {
$this->dataRecord["mbox"] = str_replace('@','.',$this->dataRecord["mbox"]);
}
-
+
+ //* Check if a secondary zone with the same name already exists
+ $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_slave WHERE origin = \"".$this->dataRecord["origin"]."\" AND server_id = \"".$this->dataRecord["server_id"]."\"");
+ if($tmp["number"] > 0) {
+ $app->error($app->tform->wordbook["origin_error_unique"]);
+ }
parent::onSubmit();
}
@@ -218,4 +234,4 @@
$page = new page_action;
$page->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1