From 7dc88f6c3c49f564fbe8343c3136fe662661bd9a Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 29 Nov 2006 05:57:49 +0000
Subject: [PATCH] Fixed ) positioning

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5238 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/systems/class_printGeneric.inc |  2 +-
 plugins/admin/systems/class_termDNS.inc      | 21 ++++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 9b7d83051..1a37efb1a 100644
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -507,7 +507,7 @@ class printgeneric extends plugin
       $ppdManager= new ppdManager($path);
       if(!empty($this->gotoPrinterPPD)){
         if((!file_exists($path.$this->gotoPrinterPPD))){
-          $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD))."</b>";
+          $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD)."</b>");
         }else{
           $smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD));
         }
diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index 64f63615d..f73fe741f 100644
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -309,29 +309,20 @@ class termDNS extends plugin
     /* Check if ip must be given
      */  
     if(($this->IPisMust)||($this->DNS_is_account)){
-  
-      /* Check if ip is empty 
-       */
-      if ($this->ipHostNumber == "" && $this->acl_is_writeable("ipHostNumber")){
+      if (empty($this->ipHostNumber)){
         $message[]= _("The required field 'IP-address' is not set.");
       }
-    }
 
-     
-    /* check if given ip is valid ip */
-    if ($this->ipHostNumber != "" && !is_ip($this->ipHostNumber)){
-      $message[]= _("Wrong IP format in field IP-address.");
+      if (!is_ip($this->ipHostNumber)){
+        $message[]= _("Wrong IP format in field IP-address.");
+      }
     }
 
     /* Check if mac is empty 
      */
-    if ($this->macAddress == "" && $this->acl_is_writeable("macAddress")){
+    if ($this->macAddress == "" ){
       $message[]= _("The required field 'MAC-address' is not set.");
     }
-
-    /* Check if given mac is valid mac 
-     */
-    $tr = count(split(":",$this->macAddress));
     if(!is_mac($this->macAddress)){
       $message[]=(_("The given macaddress is invalid. There must be 6 2byte segments seperated by ':'."));
     }
@@ -342,7 +333,7 @@ class termDNS extends plugin
       $checkArray = array();
       $onlyOnce   = array();
 
-    //  $onlyOnce['cNAMERecord'] = 0;
+      //  $onlyOnce['cNAMERecord'] = 0;
 
       /* Walk through all entries and detect duplicates or mismatches
        */  
-- 
2.30.2