From 02e7eaf2860f6f892eb32639940e97c76b65baad Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 15 Jun 2015 13:24:18 -0400
Subject: [PATCH] - backported patches
---
interface/web/dns/dns_soa_edit.php | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php
index 634a91d..d6a20df 100644
--- a/interface/web/dns/dns_soa_edit.php
+++ b/interface/web/dns/dns_soa_edit.php
@@ -273,16 +273,14 @@
//* Check if the server has been changed
// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($this->dataRecord['origin'])) {
//* We do not allow users to change a domain which has been created by the admin
$rec = $app->db->queryOneRecord("SELECT origin from dns_soa WHERE id = ?", $this->id);
- $drOrigin = (isset($this->dataRecord['origin']))
- ? $app->functions->idn_encode($this->dataRecord['origin'])
- : false;
+ $drOrigin = $app->functions->idn_encode($this->dataRecord['origin']);
if($rec['origin'] !== $drOrigin && $app->tform->checkPerm($this->id, 'u')) {
//* Add a error message and switch back to old server
- $app->tform->errorMessage .= $app->lng('The Zone (soa) can not be changed. Please ask your Administrator if you want to change the Zone name.');
+ $app->tform->errorMessage .= $app->tform->wordbook["soa_cannot_be_changed_txt"];
$this->dataRecord["origin"] = $rec['origin'];
}
unset($rec);
--
Gitblit v1.9.1