From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo
---
server/plugins-available/bind_dlz_plugin.inc.php | 338 ++++++++++++++++++++++++++++---------------------------
1 files changed, 172 insertions(+), 166 deletions(-)
diff --git a/server/plugins-available/bind_dlz_plugin.inc.php b/server/plugins-available/bind_dlz_plugin.inc.php
index e1af955..89954cc 100644
--- a/server/plugins-available/bind_dlz_plugin.inc.php
+++ b/server/plugins-available/bind_dlz_plugin.inc.php
@@ -34,7 +34,7 @@
CREATE TABLE IF NOT EXISTS `records` (
`id` int(10) unsigned NOT NULL auto_increment,
`zone` varchar(255) NOT NULL,
- `ttl` int(11) NOT NULL default '86400',
+ `ttl` int(11) NOT NULL default '3600',
`type` varchar(255) NOT NULL,
`host` varchar(255) NOT NULL default '@',
`mx_priority` int(11) default NULL,
@@ -66,104 +66,106 @@
*/
class bind_dlz_plugin {
-
+
var $plugin_name = 'bind_dlz_plugin';
var $class_name = 'bind_dlz_plugin';
-
+
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall()
{
global $conf;
-
+
if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true) {
- return true;
+ // Temporarily disabled until the installer supports the automatic creation of the necessary
+ // database or at least to select between filebased nd db based bind, as not all bind versions
+ // support dlz out of the box. To enable this plugin manually, create a symlink from the plugins-enabled
+ // directory to this file in the plugins-available directory.
+ return false;
+ //return true;
} else {
return false;
}
-
+
}
-
+
/*
This function is called when the plugin is loaded
*/
-
- function onLoad()
+
+ function onLoad()
{
global $app;
-
+
/*
Register for the events
*/
-
+
//* SOA
- $app->plugins->registerEvent('dns_soa_insert',$this->plugin_name,'soa_insert');
- $app->plugins->registerEvent('dns_soa_update',$this->plugin_name,'soa_update');
- $app->plugins->registerEvent('dns_soa_delete',$this->plugin_name,'soa_delete');
-
+ $app->plugins->registerEvent('dns_soa_insert', $this->plugin_name, 'soa_insert');
+ $app->plugins->registerEvent('dns_soa_update', $this->plugin_name, 'soa_update');
+ $app->plugins->registerEvent('dns_soa_delete', $this->plugin_name, 'soa_delete');
+
//* RR
- $app->plugins->registerEvent('dns_rr_insert',$this->plugin_name,'rr_insert');
- $app->plugins->registerEvent('dns_rr_update',$this->plugin_name,'rr_update');
- $app->plugins->registerEvent('dns_rr_delete',$this->plugin_name,'rr_delete');
+ $app->plugins->registerEvent('dns_rr_insert', $this->plugin_name, 'rr_insert');
+ $app->plugins->registerEvent('dns_rr_update', $this->plugin_name, 'rr_update');
+ $app->plugins->registerEvent('dns_rr_delete', $this->plugin_name, 'rr_delete');
}
-
-
- function soa_insert($event_name,$data)
+
+
+ function soa_insert($event_name, $data)
{
global $app, $conf;
-
+
if($data["new"]["active"] != 'Y') return;
-
+
$origin = substr($data["new"]["origin"], 0, -1);
$ispconfig_id = $data["new"]["id"];
- $serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
+ $serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ?", $ispconfig_id);
$ttl = $data["new"]["ttl"];
-
- $_db = clone $app->db;
- $_db->dbName = 'named';
-
- $_db->query("INSERT INTO records (zone, ttl, type, primary_ns, resp_contact, serial, refresh, retry, expire, minimum, ispconfig_id) VALUES ".
- "('$origin', $ttl, 'SOA', '{$data["new"]["ns"]}', '{$data["new"]["mbox"]}', '{$serial["serial"]}', '{$serial["refresh"]}'," .
- "'{$serial["retry"]}', '{$serial["expire"]}', '{$serial["minimum"]}', $ispconfig_id)");
- unset($_db);
+
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
+
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, primary_ns, resp_contact, serial, refresh, retry, expire, minimum, ispconfig_id) VALUES ".
+ "(?, ?, 'SOA', ?, ?, ?, ?, ?, ?, ?, ?)", $origin, $ttl, $data["new"]["ns"], $data["new"]["mbox"], $serial["serial"], $serial["refresh"], $serial["retry"], $serial["expire"], $serial["minimum"], $ispconfig_id);
+ //unset($_db);
}
-
- function soa_update($event_name,$data)
+
+ function soa_update($event_name, $data)
{
global $app, $conf;
-
+
if($data["new"]["active"] != 'Y')
{
if($data["old"]["active"] != 'Y') return;
- $this->soa_delete($event_name,$data);
- }
- else
+ $this->soa_delete($event_name, $data);
+ }
+ else
{
if($data["old"]["active"] == 'Y')
{
$origin = substr($data["new"]["origin"], 0, -1);
$ispconfig_id = $data["new"]["id"];
- $serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
+ $serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ?", $ispconfig_id);
$ttl = $data["new"]["ttl"];
-
- $_db = clone $app->db;
- $_db->dbName = 'named';
-
- $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, primary_ns = '{$data["new"]["ns"]}', resp_contact = '{$data["new"]["mbox"]}', ".
- "serial = '{$serial["serial"]}', refresh = '{$serial["refresh"]}', retry = '{$serial["retry"]}', expire = '{$serial["expire"]}', ".
- "minimum = '{$serial["minimum"]}' WHERE ispconfig_id = ".$data["new"]["id"]." AND type = 'SOA'");
- unset($_db);
- }
- else
+
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
+
+ $app->db->query("UPDATE named.records SET zone = ?, ttl = ?, primary_ns = ?, resp_contact = ?, serial = ?, refresh = ?, retry = ?, expire = ?, minimum = ? WHERE ispconfig_id = ? AND type = 'SOA'", $origin, $ttl, $data["new"]["ns"], $data["new"]["mbox"], $serial["serial"], $serial["refresh"], $serial["retry"], $serial["expire"], $serial["minimum"], $data["new"]["id"]);
+ //unset($_db);
+ }
+ else
{
- $this->soa_insert($event_name,$data);
+ $this->soa_insert($event_name, $data);
$ispconfig_id = $data["new"]["id"];
-
- if ($records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = $ispconfig_id AND active = 'Y'"))
+
+ if ($records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ? AND active = 'Y'", $ispconfig_id))
{
- foreach($records as $record)
+ foreach($records as $record)
{
foreach ($record as $key => $val) {
$data["new"][$key] = $val;
@@ -173,175 +175,179 @@
}
}
}
-
+
}
-
- function soa_delete($event_name,$data)
+
+ function soa_delete($event_name, $data)
{
global $app, $conf;
-
- $_db = clone $app->db;
- $_db->dbName = 'named';
-
- $_db->query("DELETE FROM records WHERE ispconfig_id = {$data["old"]["id"]}");
- unset($_db);
+
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
+
+ $app->db->query( "DELETE FROM named.dns_records WHERE zone = ?", substr($data['old']['origin'], 0, -1));
+ //unset($_db);
}
-
- function rr_insert($event_name,$data)
+
+ function rr_insert($event_name, $data)
{
global $app, $conf;
if($data["new"]["active"] != 'Y') return;
-
- $zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]);
+
+ $zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ?", $data["new"]["zone"]);
$origin = substr($zone["origin"], 0, -1);
$ispconfig_id = $data["new"]["id"];
-
+
$type = $data["new"]["type"];
-
+
if (substr($data["new"]["name"], -1) == '.') {
$name = substr($data["new"]["name"], 0, -1);
} else {
$name = ($data["new"]["name"] == "") ? $name = '@' : $data["new"]["name"];
}
-
+
if ($name == $origin || $name == '') {
$name = '@';
}
-
- switch ($type)
+
+ switch ($type)
{
- case "CNAME":
- case "MX":
- case "NS":
- case "ALIAS":
- case "PTR":
- case "SRV":
- if(substr($data["new"]["data"], -1) != '.'){
- $content = $data["new"]["data"] . '.';
- } else {
- $content = $data["new"]["data"];
- }
- break;
- case "HINFO":
- $content = $data["new"]["data"];
- $quote1 = strpos($content, '"');
-
- if($quote1 !== FALSE) {
- $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
- }
-
- if ($quote1 !== FALSE && $quote2 !== FALSE) {
- $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
- $content = $text_between_quotes.substr($content, ($quote2 + 2));
- }
- break;
- default:
+ case "CNAME":
+ case "MX":
+ case "NS":
+ case "ALIAS":
+ case "PTR":
+ case "SRV":
+ if(substr($data["new"]["data"], -1) != '.'){
+ $content = $data["new"]["data"] . '.';
+ } else {
$content = $data["new"]["data"];
- }
-
- $ttl = $data["new"]["ttl"];
-
- $_db = clone $app->db;
- $_db->dbName = 'named';
-
- if ($type == 'MX') {
- $_db->query("INSERT INTO records (zone, ttl, type, host, mx_priority, data, ispconfig_id)".
- " VALUES ('$origin', $ttl, '$type', '$name', {$data["new"]["aux"]}, '$content', $ispconfig_id)");
- } else {
- $_db->query("INSERT INTO records (zone, ttl, type, host, data, ispconfig_id)".
- " VALUES ('$origin', $ttl, '$type', '$name', '$content', $ispconfig_id)");
+ }
+ break;
+ case "HINFO":
+ $content = $data["new"]["data"];
+ $quote1 = strpos($content, '"');
+
+ if($quote1 !== FALSE) {
+ $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
+ }
+
+ if ($quote1 !== FALSE && $quote2 !== FALSE) {
+ $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
+ $content = $text_between_quotes.substr($content, ($quote2 + 2));
+ }
+ break;
+ default:
+ $content = $data["new"]["data"];
}
- unset($_db);
+ $ttl = $data["new"]["ttl"];
+
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
+
+ if ($type == 'MX') {
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, host, mx_priority, data, ispconfig_id)".
+ " VALUES (?, ?, ?, ?, ?, ?, ?)", $origin, $ttl, $type, $name, $data["new"]["aux"], $content, $ispconfig_id);
+ } elseif ($type == 'SRV') {
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, data, ispconfig_id)".
+ " VALUES (?, ?, ?, ?, ?)", $origin, $ttl, $type, $data["new"]["aux"] . ' ' . $content, $ispconfig_id);
+ } else {
+ $app->db->query("INSERT INTO named.records (zone, ttl, type, host, data, ispconfig_id)".
+ " VALUES (?, ?, ?, ?, ?, ?)", $origin, $ttl, $type, $name, $content, $ispconfig_id);
+ }
+
+ //unset($_db);
}
-
- function rr_update($event_name,$data)
+
+ function rr_update($event_name, $data)
{
global $app, $conf;
-
+
if ($data["new"]["active"] != 'Y')
{
if($data["old"]["active"] != 'Y') return;
- $this->rr_delete($event_name,$data);
+ $this->rr_delete($event_name, $data);
}
else
{
if ($data["old"]["active"] == 'Y')
{
- $zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]);
+ $zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ?", $data["new"]["zone"]);
$origin = substr($zone["origin"], 0, -1);
$ispconfig_id = $data["new"]["id"];
-
- $type = $data["new"]["type"];
-
+
+ $type = $data["new"]["type"];
+
if (substr($data["new"]["name"], -1) == '.') {
$name = substr($data["new"]["name"], 0, -1);
} else {
$name = ($data["new"]["name"] == "") ? $name = '@' : $data["new"]["name"];
}
-
+
if ($name == $origin || $name == '') {
$name = '@';
}
- switch ($type)
+ switch ($type)
{
- case "CNAME":
- case "MX":
- case "NS":
- case "ALIAS":
- case "PTR":
- case "SRV":
- if(substr($data["new"]["data"], -1) != '.'){
- $content = $data["new"]["data"] . '.';
- } else {
- $content = $data["new"]["data"];
- }
- break;
- case "HINFO":
- $content = $data["new"]["data"];
- $quote1 = strpos($content, '"');
- if($quote1 !== FALSE){
- $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
- }
- if($quote1 !== FALSE && $quote2 !== FALSE){
- $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
- $content = $text_between_quotes.substr($content, ($quote2 + 2));
- }
- break;
- default:
+ case "CNAME":
+ case "MX":
+ case "NS":
+ case "ALIAS":
+ case "PTR":
+ case "SRV":
+ if(substr($data["new"]["data"], -1) != '.'){
+ $content = $data["new"]["data"] . '.';
+ } else {
$content = $data["new"]["data"];
+ }
+ break;
+ case "HINFO":
+ $content = $data["new"]["data"];
+ $quote1 = strpos($content, '"');
+ if($quote1 !== FALSE){
+ $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
+ }
+ if($quote1 !== FALSE && $quote2 !== FALSE){
+ $text_between_quotes = str_replace(' ', '_', substr($content, ($quote1 + 1), (($quote2 - $quote1))));
+ $content = $text_between_quotes.substr($content, ($quote2 + 2));
+ }
+ break;
+ default:
+ $content = $data["new"]["data"];
}
-
+
$ttl = $data["new"]["ttl"];
$prio = (int)$data["new"]["aux"];
-
- $_db = clone $app->db;
- $_db->dbName = 'named';
-
+
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
+
if ($type == 'MX') {
- $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', mx_priority = $prio, ".
- "data = '$content' WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
+ $app->db->query("UPDATE named.records SET zone = ?, ttl = ?, type = ?, host = ?, mx_priority = ?, data = ? WHERE ispconfig_id = ? AND type != 'SOA'", $origin, $ttl, $type, $name, $prio, $content, $ispconfig_id);
+ } elseif ($type == 'SRV') {
+ $app->db->query("UPDATE named.records SET zone = ?, ttl = ?, type = ?, data = ? WHERE ispconfig_id = ? AND type != 'SOA'", $origin, $ttl, $type, $prio . ' ' . $content, $ispconfig_id);
} else {
- $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', ".
- "data = '$content' WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
+ $app->db->query("UPDATE named.records SET zone = ?, ttl = ?, type = ?, host = ?, data = ? WHERE ispconfig_id = ? AND type != 'SOA'", $origin, $ttl, $type, $name, $content, $ispconfig_id);
}
-
- unset($_db);
+
+ //unset($_db);
} else {
- $this->rr_insert($event_name,$data);
+ $this->rr_insert($event_name, $data);
}
}
}
-
- function rr_delete($event_name,$data) {
+
+ function rr_delete($event_name, $data) {
global $app, $conf;
-
- $_db = clone $app->db;
- $_db->dbName = 'named';
-
- $_db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]} AND type != 'SOA'");
- unset($_db);
+
+ //$_db = clone $app->db;
+ //$_db->dbName = 'named';
+
+ $app->db->query( "DELETE FROM named.dns_records WHERE type != 'SOA' AND zone = ?", substr($data['old']['origin'], 0, -1));
+ //unset($_db);
}
+
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1