From f91a2995d99b8cae9e6880ad11d2cee49de92679 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 12 Dec 2012 07:07:45 -0500
Subject: [PATCH] - NS field in dns slave has to be a IP address - Added missing validator for xfer field in dns zone fom

---
 interface/lib/classes/tools_sites.inc.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
index 403f323..c501173 100644
--- a/interface/lib/classes/tools_sites.inc.php
+++ b/interface/lib/classes/tools_sites.inc.php
@@ -58,8 +58,8 @@
     function removePrefix($name, $currentPrefix, $globalPrefix) {
         if($name == "") return "";
         
-        if($currentPrefix == '#') return $name; // # = empty prefix, do not change name
-        if($currentPrefix === '') $currentPrefix = $globalPrefix; // entry has no prefix set, maybe it was created before this function was introduced
+        if($currentPrefix === '') return $name; // empty prefix, do not change name
+        if($currentPrefix === '#') $currentPrefix = $globalPrefix; // entry has no prefix set, maybe it was created before this function was introduced
         
         if($currentPrefix === '') return $name; // no current prefix and global prefix is empty -> nothing to remove here.
         
@@ -69,7 +69,7 @@
     function getPrefix($currentPrefix, $userPrefix, $adminPrefix = false) {
         global $app;
         
-        if($currentPrefix !== '') return ($currentPrefix == '#' ? '' : $currentPrefix); // return the currently set prefix for this entry (# = empty)
+        if($currentPrefix !== '#') return $currentPrefix; // return the currently set prefix for this entry (# = no prefix set yet)
         
         if($adminPrefix === false) $adminPrefix = $userPrefix;
         

--
Gitblit v1.9.1