From 45f11e2be23676e9efc084b7c447993e58f5b670 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Mar 2007 16:20:39 -0500
Subject: [PATCH] Update of the mail and dns module.
---
interface/web/dns/rr_edit.php | 370 ++++++++++++++++++++++++++--------------------------
1 files changed, 185 insertions(+), 185 deletions(-)
diff --git a/interface/web/dns/rr_edit.php b/interface/web/dns/rr_edit.php
index 2686b2a..369183c 100644
--- a/interface/web/dns/rr_edit.php
+++ b/interface/web/dns/rr_edit.php
@@ -1,186 +1,186 @@
-<?php
-/*
-Copyright (c) 2005, Till Brehm, Falko Timme, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/rr.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
-}
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-
- function onSubmit() {
- global $app, $conf;
-
- if($this->dataRecord['id'] > 0){
- if(!$app->tform->checkPerm($this->dataRecord['id'],'u')) $app->error($app->tform->wordbook['error_no_permission']);
- } else {
- if(!$app->tform->checkPerm($this->dataRecord['id'],'i')) $app->error($app->tform->wordbook['error_no_permission']);
- }
-
- $this->dataRecord["zone"] = $_SESSION['s']['list']['rr']['parent_id'];
-
- $app->uses('validate_dns');
- $app->tform->errorMessage .= $app->validate_dns->validate_rr($this->dataRecord);
-
- $increased_serials[] = -1;
- if($app->tform->errorMessage == ''){
- // update serial
- $soa = $app->db->queryOneRecord("SELECT * FROM soa WHERE id = ".$this->dataRecord["zone"]);
- $serial = $soa['serial'];
- $update = 0;
- if($old_record = $app->db->queryOneRecord("SELECT * FROM rr WHERE id = ".$this->dataRecord["id"])){
- foreach($old_record as $key => $val){
- if($this->dataRecord[$key] != $val && isset($this->dataRecord[$key])) $update += 1;
- }
- } else { // new record
- $update = 1;
- }
-
- if($update > 0 && !in_array($soa['id'], $increased_serials)){
- $new_serial = $app->validate_dns->increase_serial($serial);
- $increased_serials[] = $soa['id'];
- $app->db->query("UPDATE soa SET serial = '".$new_serial."' WHERE id = ".$this->dataRecord["zone"]);
- }
-
- // PTR
- if($conf['auto_create_ptr'] == 1 && trim($conf['default_ns']) != '' && trim($conf['default_mbox']) != ''){
- if($this->dataRecord['type'] == 'A' || $this->dataRecord['type'] == 'AAAA'){
- list($a, $b, $c, $d) = explode('.', $this->dataRecord['data']);
- $ptr_soa = $c.'.'.$b.'.'.$a.'.in-addr.arpa.';
- if(substr($this->dataRecord['name'], -1) == '.'){
- $ptr_soa_rr_data = $this->dataRecord['name'];
- } else {
- $ptr_soa_rr_data = $this->dataRecord['name'].(trim($this->dataRecord['name']) == '' ? '' : '.').$soa['origin'];
- }
-
- if(!$ptr_soa_exist = $app->db->queryOneRecord("SELECT * FROM soa WHERE origin = '".$ptr_soa."'")){
- $app->db->query("INSERT INTO soa (origin, ns, mbox, serial, refresh, retry, expire, minimum, ttl, active, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other) VALUES ('".$ptr_soa."', '".trim($conf['default_ns'])."', '".trim($conf['default_mbox'])."', '".date("Ymd").'01'."', '".$conf['default_refresh']."', '".$conf['default_retry']."', '".$conf['default_expire']."', '".$conf['default_minimum_ttl']."', '".$conf['default_ttl']."', 'Y', '".$_SESSION['s']['user']['sys_userid']."', '".$_SESSION['s']['user']['sys_groupid']."', '".$_SESSION['s']['user']['sys_perm_user']."', '".$_SESSION['s']['user']['sys_perm_group']."', '".$_SESSION['s']['user']['sys_perm_other']."')");
- $ptr_soa_id = $app->db->insertID();
- $app->db->query("INSERT INTO rr (zone, name, type, data, aux, ttl, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other) VALUES ('".$ptr_soa_id."', '".$d."', 'PTR', '".$ptr_soa_rr_data."', '0', '".$conf['default_ttl']."', '".$_SESSION['s']['user']['sys_userid']."', '".$_SESSION['s']['user']['sys_groupid']."', '".$_SESSION['s']['user']['sys_perm_user']."', '".$_SESSION['s']['user']['sys_perm_group']."', '".$_SESSION['s']['user']['sys_perm_other']."')");
- } else {
- if($ptr_soa_exist['active'] != 'Y') $app->db->query("UPDATE soa SET active = 'Y' WHERE id = ".$ptr_soa_exist['id']);
- if(!$ptr_soa_rr_exist = $app->db->queryOneRecord("SELECT * FROM rr WHERE zone = '".$ptr_soa_exist['id']."' AND name = '".$d."' AND type = 'PTR'")){
- $app->db->query("INSERT INTO rr (zone, name, type, data, aux, ttl, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other) VALUES ('".$ptr_soa_exist['id']."', '".$d."', 'PTR', '".$ptr_soa_rr_data."', '0', '".$conf['default_ttl']."', '".$_SESSION['s']['user']['sys_userid']."', '".$_SESSION['s']['user']['sys_groupid']."', '".$_SESSION['s']['user']['sys_perm_user']."', '".$_SESSION['s']['user']['sys_perm_group']."', '".$_SESSION['s']['user']['sys_perm_other']."')");
- // increase serial of PTR SOA
- if(!in_array($ptr_soa_exist['id'], $increased_serials)){
- $ptr_soa_new_serial = $app->validate_dns->increase_serial($ptr_soa_exist['serial']);
- $increased_serials[] = $ptr_soa_exist['id'];
- $app->db->query("UPDATE soa SET serial = '".$ptr_soa_new_serial."' WHERE id = ".$ptr_soa_exist['id']);
- }
- }
- }
-
- // if IP address changes, delete/change old PTR record
- if(!empty($old_record)){
-
-
-
-
- list($oa, $ob, $oc, $od) = explode('.', $old_record['data']);
- $old_ptr_soa = $oc.'.'.$ob.'.'.$oa.'.in-addr.arpa.';
- $old_ptr_soa_exist = $app->db->queryOneRecord("SELECT * FROM soa WHERE origin = '".$old_ptr_soa."'");
- if(substr($old_record['name'], -1) == '.'){
- $old_ptr_soa_rr_data = $old_record['name'];
- } else {
- $old_ptr_soa_rr_data = $old_record['name'].(trim($old_record['name']) == '' ? '' : '.').$soa['origin'];
- }
- if(!$app->db->queryOneRecord("SELECT * FROM rr WHERE zone = '".$old_ptr_soa_exist['id']."' AND name = '".$od."' AND type = 'PTR' AND data = '".$old_ptr_soa_rr_data."'")){
- parent::onSubmit();
- return true;
- }
-
- if($old_record['data'] == $this->dataRecord['data']){
- $a_rr_with_same_ip = $this->dataRecord;
- $a_rr_with_same_ip['origin'] = $soa['origin'];
- } else {
- $a_rr_with_same_ip = $app->db->queryOneRecord("SELECT rr.*, soa.origin FROM rr, soa WHERE rr.type = 'A' AND rr.data = '".$old_record['data']."' AND rr.zone = soa.id AND soa.active = 'Y' AND rr.id != ".$this->dataRecord["id"]);
- }
-
- if($a_rr_with_same_ip){
- if(substr($a_rr_with_same_ip['name'], -1) == '.'){
- $new_ptr_soa_rr_data = $a_rr_with_same_ip['name'];
- } else {
- $new_ptr_soa_rr_data = $a_rr_with_same_ip['name'].(trim($a_rr_with_same_ip['name']) == '' ? '' : '.').$a_rr_with_same_ip['origin'];
- }
- $app->db->query("UPDATE rr SET data = '".$new_ptr_soa_rr_data."' WHERE zone = '".$old_ptr_soa_exist['id']."' AND name = '".$od."' AND type = 'PTR'");
- // increase serial
- if(!in_array($old_ptr_soa_exist['id'], $increased_serials)){
- $new_serial = $app->validate_dns->increase_serial($old_ptr_soa_exist['serial']);
- $increased_serials[] = $old_ptr_soa_exist['id'];
- $app->db->query("UPDATE soa SET serial = '".$new_serial."' WHERE id = ".$old_ptr_soa_exist['id']);
- }
- } else {
- $app->db->query("DELETE FROM rr WHERE zone = '".$old_ptr_soa_exist['id']."' AND name = '".$od."' AND type = 'PTR'");
- if(!$app->db->queryOneRecord("SELECT * FROM rr WHERE zone = '".$old_ptr_soa_exist['id']."'")){
- $app->db->query("DELETE FROM soa WHERE id = ".$old_ptr_soa_exist['id']);
- } else {
- // increase serial
- if(!in_array($old_ptr_soa_exist['id'], $increased_serials)){
- $new_serial = $app->validate_dns->increase_serial($old_ptr_soa_exist['serial']);
- $increased_serials[] = $old_ptr_soa_exist['id'];
- $app->db->query("UPDATE soa SET serial = '".$new_serial."' WHERE id = ".$old_ptr_soa_exist['id']);
- }
- }
- }
- }
-
- }
- }
- }
-
-
- parent::onSubmit();
- }
-
-}
-
-$app->tform_actions = new page_action;
-$app->tform_actions->onLoad();
-
+<?php
+/*
+Copyright (c) 2005, Till Brehm, Falko Timme, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$tform_def_file = "form/rr.tform.php";
+
+/******************************************
+* End Form configuration
+******************************************/
+
+require_once('../../lib/config.inc.php');
+require_once('../../lib/app.inc.php');
+
+// Checking module permissions
+if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
+ header("Location: ../index.php");
+ exit;
+}
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+$app->load('tform_actions');
+
+class page_action extends tform_actions {
+
+
+ function onSubmit() {
+ global $app, $conf;
+
+ if($this->dataRecord['id'] > 0){
+ if(!$app->tform->checkPerm($this->dataRecord['id'],'u')) $app->error($app->tform->wordbook['error_no_permission']);
+ } else {
+ if(!$app->tform->checkPerm($this->dataRecord['id'],'i')) $app->error($app->tform->wordbook['error_no_permission']);
+ }
+
+ $this->dataRecord["zone"] = $_SESSION['s']['list']['rr']['parent_id'];
+
+ $app->uses('validate_dns');
+ $app->tform->errorMessage .= $app->validate_dns->validate_rr($this->dataRecord);
+
+ $increased_serials[] = -1;
+ if($app->tform->errorMessage == ''){
+ // update serial
+ $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$this->dataRecord["zone"]);
+ $serial = $soa['serial'];
+ $update = 0;
+ if($old_record = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE id = ".$this->dataRecord["id"])){
+ foreach($old_record as $key => $val){
+ if($this->dataRecord[$key] != $val && isset($this->dataRecord[$key])) $update += 1;
+ }
+ } else { // new record
+ $update = 1;
+ }
+
+ if($update > 0 && !in_array($soa['id'], $increased_serials)){
+ $new_serial = $app->validate_dns->increase_serial($serial);
+ $increased_serials[] = $soa['id'];
+ $app->db->query("UPDATE dns_soa SET serial = '".$new_serial."' WHERE id = ".$this->dataRecord["zone"]);
+ }
+
+ // PTR
+ if($conf['auto_create_ptr'] == 1 && trim($conf['default_ns']) != '' && trim($conf['default_mbox']) != ''){
+ if($this->dataRecord['type'] == 'A' || $this->dataRecord['type'] == 'AAAA'){
+ list($a, $b, $c, $d) = explode('.', $this->dataRecord['data']);
+ $ptr_soa = $c.'.'.$b.'.'.$a.'.in-addr.arpa.';
+ if(substr($this->dataRecord['name'], -1) == '.'){
+ $ptr_soa_rr_data = $this->dataRecord['name'];
+ } else {
+ $ptr_soa_rr_data = $this->dataRecord['name'].(trim($this->dataRecord['name']) == '' ? '' : '.').$soa['origin'];
+ }
+
+ if(!$ptr_soa_exist = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE origin = '".$ptr_soa."'")){
+ $app->db->query("INSERT INTO dns_soa (origin, ns, mbox, serial, refresh, retry, expire, minimum, ttl, active, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other) VALUES ('".$ptr_soa."', '".trim($conf['default_ns'])."', '".trim($conf['default_mbox'])."', '".date("Ymd").'01'."', '".$conf['default_refresh']."', '".$conf['default_retry']."', '".$conf['default_expire']."', '".$conf['default_minimum_ttl']."', '".$conf['default_ttl']."', 'Y', '".$_SESSION['s']['user']['sys_userid']."', '".$_SESSION['s']['user']['sys_groupid']."', '".$_SESSION['s']['user']['sys_perm_user']."', '".$_SESSION['s']['user']['sys_perm_group']."', '".$_SESSION['s']['user']['sys_perm_other']."')");
+ $ptr_soa_id = $app->db->insertID();
+ $app->db->query("INSERT INTO dns_rr (zone, name, type, data, aux, ttl, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other) VALUES ('".$ptr_soa_id."', '".$d."', 'PTR', '".$ptr_soa_rr_data."', '0', '".$conf['default_ttl']."', '".$_SESSION['s']['user']['sys_userid']."', '".$_SESSION['s']['user']['sys_groupid']."', '".$_SESSION['s']['user']['sys_perm_user']."', '".$_SESSION['s']['user']['sys_perm_group']."', '".$_SESSION['s']['user']['sys_perm_other']."')");
+ } else {
+ if($ptr_soa_exist['active'] != 'Y') $app->db->query("UPDATE dns_soa SET active = 'Y' WHERE id = ".$ptr_soa_exist['id']);
+ if(!$ptr_soa_rr_exist = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = '".$ptr_soa_exist['id']."' AND name = '".$d."' AND type = 'PTR'")){
+ $app->db->query("INSERT INTO dns_rr (zone, name, type, data, aux, ttl, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other) VALUES ('".$ptr_soa_exist['id']."', '".$d."', 'PTR', '".$ptr_soa_rr_data."', '0', '".$conf['default_ttl']."', '".$_SESSION['s']['user']['sys_userid']."', '".$_SESSION['s']['user']['sys_groupid']."', '".$_SESSION['s']['user']['sys_perm_user']."', '".$_SESSION['s']['user']['sys_perm_group']."', '".$_SESSION['s']['user']['sys_perm_other']."')");
+ // increase serial of PTR SOA
+ if(!in_array($ptr_soa_exist['id'], $increased_serials)){
+ $ptr_soa_new_serial = $app->validate_dns->increase_serial($ptr_soa_exist['serial']);
+ $increased_serials[] = $ptr_soa_exist['id'];
+ $app->db->query("UPDATE dns_soa SET serial = '".$ptr_soa_new_serial."' WHERE id = ".$ptr_soa_exist['id']);
+ }
+ }
+ }
+
+ // if IP address changes, delete/change old PTR record
+ if(!empty($old_record)){
+
+
+
+
+ list($oa, $ob, $oc, $od) = explode('.', $old_record['data']);
+ $old_ptr_soa = $oc.'.'.$ob.'.'.$oa.'.in-addr.arpa.';
+ $old_ptr_soa_exist = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE origin = '".$old_ptr_soa."'");
+ if(substr($old_record['name'], -1) == '.'){
+ $old_ptr_soa_rr_data = $old_record['name'];
+ } else {
+ $old_ptr_soa_rr_data = $old_record['name'].(trim($old_record['name']) == '' ? '' : '.').$soa['origin'];
+ }
+ if(!$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = '".$old_ptr_soa_exist['id']."' AND name = '".$od."' AND type = 'PTR' AND data = '".$old_ptr_soa_rr_data."'")){
+ parent::onSubmit();
+ return true;
+ }
+
+ if($old_record['data'] == $this->dataRecord['data']){
+ $a_rr_with_same_ip = $this->dataRecord;
+ $a_rr_with_same_ip['origin'] = $soa['origin'];
+ } else {
+ $a_rr_with_same_ip = $app->db->queryOneRecord("SELECT dns_rr.*, dns_soa.origin FROM dns_rr, dns_soa WHERE dns_rr.type = 'A' AND dns_rr.data = '".$old_record['data']."' AND dns_rr.zone = dns_soa.id AND dns_soa.active = 'Y' AND dns_rr.id != ".$this->dataRecord["id"]);
+ }
+
+ if($a_rr_with_same_ip){
+ if(substr($a_rr_with_same_ip['name'], -1) == '.'){
+ $new_ptr_soa_rr_data = $a_rr_with_same_ip['name'];
+ } else {
+ $new_ptr_soa_rr_data = $a_rr_with_same_ip['name'].(trim($a_rr_with_same_ip['name']) == '' ? '' : '.').$a_rr_with_same_ip['origin'];
+ }
+ $app->db->query("UPDATE dns_rr SET data = '".$new_ptr_soa_rr_data."' WHERE zone = '".$old_ptr_soa_exist['id']."' AND name = '".$od."' AND type = 'PTR'");
+ // increase serial
+ if(!in_array($old_ptr_soa_exist['id'], $increased_serials)){
+ $new_serial = $app->validate_dns->increase_serial($old_ptr_soa_exist['serial']);
+ $increased_serials[] = $old_ptr_soa_exist['id'];
+ $app->db->query("UPDATE dns_soa SET serial = '".$new_serial."' WHERE id = ".$old_ptr_soa_exist['id']);
+ }
+ } else {
+ $app->db->query("DELETE FROM dns_rr WHERE zone = '".$old_ptr_soa_exist['id']."' AND name = '".$od."' AND type = 'PTR'");
+ if(!$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = '".$old_ptr_soa_exist['id']."'")){
+ $app->db->query("DELETE FROM dns_soa WHERE id = ".$old_ptr_soa_exist['id']);
+ } else {
+ // increase serial
+ if(!in_array($old_ptr_soa_exist['id'], $increased_serials)){
+ $new_serial = $app->validate_dns->increase_serial($old_ptr_soa_exist['serial']);
+ $increased_serials[] = $old_ptr_soa_exist['id'];
+ $app->db->query("UPDATE dns_soa SET serial = '".$new_serial."' WHERE id = ".$old_ptr_soa_exist['id']);
+ }
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+
+ parent::onSubmit();
+ }
+
+}
+
+$app->tform_actions = new page_action;
+$app->tform_actions->onLoad();
+
?>
\ No newline at end of file
--
Gitblit v1.9.1