From e253202995d188925fa4e9df4f6dea0523511eae Mon Sep 17 00:00:00 2001
From: oilyflutesalad <oilyflutesalad@ispconfig3>
Date: Mon, 18 Jan 2010 05:56:48 -0500
Subject: [PATCH] Fixed: FS#928 - System Load Averages should no longer show as zero on non-english linux distros
---
server/plugins-available/powerdns_plugin.inc.php | 54 +++++++++++++++++++++---------------------------------
1 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php
index 003a812..5627d55 100644
--- a/server/plugins-available/powerdns_plugin.inc.php
+++ b/server/plugins-available/powerdns_plugin.inc.php
@@ -140,8 +140,8 @@
if($ns == '') $ns = $origin;
$hostmaster = substr($data["new"]["mbox"], 0, -1);
- //$content = $ns.' '.$hostmaster.' 0';
- $content = $ns.' '.$hostmaster.' '.$serial_id.'';
+ $content = $ns.' '.$hostmaster.' 0';
+ //$content = $ns.' '.$hostmaster.' '.$serial_id.'';
$ttl = $data["new"]["ttl"];
$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$origin', 'SOA', '$content', $ttl, 0, ".time().", $ispconfig_id)");
@@ -160,7 +160,7 @@
$ispconfig_id = $data["new"]["id"];
$serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
$serial_id = $serial["serial"];
- $app->db->query("UPDATE powerdns.domains SET name = '$origin', notified_serial = $serial_id WHERE ispconfig_id = $ispconfig_id");
+ //$app->db->query("UPDATE powerdns.domains SET name = '$origin', notified_serial = $serial_id WHERE ispconfig_id = $ispconfig_id");
//$app->db->query("UPDATE powerdns.domains SET name = '$origin' WHERE ispconfig_id = $ispconfig_id");
if(substr($data["new"]["ns"], -1) == '.'){
@@ -213,22 +213,16 @@
$type = $data["new"]["type"];
- switch ($type) {
- case "PTR":
- $name = $data["new"]["name"];
- break;
- default:
- if(substr($data["new"]["name"], -1) == '.'){
- $name = substr($data["new"]["name"], 0, -1);
- } else {
- if($data["new"]["name"] == ""){
- $name = $origin;
- } else {
- $name = $data["new"]["name"].'.'.$origin;
- }
- }
- if($name == '') $name = $origin;
+ if(substr($data["new"]["name"], -1) == '.'){
+ $name = substr($data["new"]["name"], 0, -1);
+ } else {
+ if($data["new"]["name"] == ""){
+ $name = $origin;
+ } else {
+ $name = $data["new"]["name"].'.'.$origin;
+ }
}
+ if($name == '') $name = $origin;
switch ($type) {
case "CNAME":
@@ -282,22 +276,16 @@
$type = $data["new"]["type"];
- switch ($type) {
- case "PTR":
- $name = $data["new"]["name"];
- break;
- default:
- if(substr($data["new"]["name"], -1) == '.'){
- $name = substr($data["new"]["name"], 0, -1);
- } else {
- if($data["new"]["name"] == ""){
- $name = $origin;
- } else {
- $name = $data["new"]["name"].'.'.$origin;
- }
- }
- if($name == '') $name = $origin;
+ if(substr($data["new"]["name"], -1) == '.'){
+ $name = substr($data["new"]["name"], 0, -1);
+ } else {
+ if($data["new"]["name"] == ""){
+ $name = $origin;
+ } else {
+ $name = $data["new"]["name"].'.'.$origin;
+ }
}
+ if($name == '') $name = $origin;
switch ($type) {
case "CNAME":
--
Gitblit v1.9.1