From 7bc0f15d860f669c5e84a04a643cb11f0fb5c7dd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Jan 2010 10:25:39 -0500
Subject: [PATCH] Fixed: FS#879 - Reseller cannot create database for himself, only for "c0" or subclients.
---
server/plugins-available/bind_plugin.inc.php | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 87c99a7..2438973 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -90,26 +90,28 @@
$dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');
//* Write the domain file
- $tpl = new tpl();
- $tpl->newTemplate("bind_pri.domain.master");
+ if(!empty($zone['id'])) {
+ $tpl = new tpl();
+ $tpl->newTemplate("bind_pri.domain.master");
- $zone = $data['new'];
- $tpl->setVar($zone);
+ $zone = $data['new'];
+ $tpl->setVar($zone);
- $records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'");
- $tpl->setLoop('zones',$records);
+ $records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'");
+ $tpl->setLoop('zones',$records);
- $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1));
- $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
- file_put_contents($filename,$tpl->grab());
- exec('chown '.escapeshellcmd($dns_config['bind_user']).':'.escapeshellcmd($dns_config['bind_group']).' '.$filename);
- unset($tpl);
- unset($records);
- unset($zone);
+ $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1));
+ $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
+ file_put_contents($filename,$tpl->grab());
+ exec('chown '.escapeshellcmd($dns_config['bind_user']).':'.escapeshellcmd($dns_config['bind_group']).' '.$filename);
+ unset($tpl);
+ unset($records);
+ unset($zone);
+ }
//* rebuild the named.conf file if the origin has changed or when the origin is inserted.
//if($this->action == 'insert' || $data['old']['origin'] != $data['new']['origin']) {
- $this->write_named_conf($data,$dns_config);
+ $this->write_named_conf($data,$dns_config);
//}
//* Delete old domain file, if domain name has been changed
@@ -134,7 +136,7 @@
$this->write_named_conf($data,$dns_config);
//* Delete the domain file
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.$data['old']['origin'];
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
if(is_file($filename)) unset($filename);
$app->log("Deleting BIND domain file: ".$filename,LOGLEVEL_DEBUG);
--
Gitblit v1.9.1