Removed return. Where was it for?

[gosa.git] / plugins / admin / systems / class_phoneGeneric.inc

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 65cb290a52014a59e976f50664a76412e2f55787..24566d9f2ed296f5eb2ff12a1084b616e493bd68 100644 (file)
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -56,7 +56,7 @@ class phoneGeneric extends plugin
   function phonegeneric ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
-    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
 
     /* Set base */
     if ($this->dn == "new"){
@@ -220,6 +220,7 @@ class phoneGeneric extends plugin
       $smarty->assign($attr."ACL", chkacl($this->acl, $attr));
     }
     $smarty->assign("base_select", $this->base);
+    $smarty->assign("baseACL", chkacl($this->acl,"base"));
    
     $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
  
@@ -243,7 +244,7 @@ class phoneGeneric extends plugin
 
     $this->netConfigDNS->remove_from_parent();
     $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing phone failed"));
     $this->handle_post_events("remove");
 
     /* Delete references to object groups */
@@ -279,20 +280,13 @@ class phoneGeneric extends plugin
     $this->dn= "cn=".$this->cn.",ou=phones,ou=systems,".$this->base;
 
     /* To check for valid ip*/
-    $num="(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
-
-//    if(in_array("goFonDefaultIP",$this->usedattrs[$this->selected_categorie])){
-//      if (!preg_match("/^$num\\.$num\\.$num\\.$num$/", $this->goFonDefaultIP)){
-//       $message[]= _("Wrong IP format in field goFonDefaultIP.");
-//      }
-//    }
-    
-//    /* Check for valid number */
-//    if(in_array("goFonDefaultIP",$this->usedattrs[$this->selected_categorie])){
-//      if((strlen($this->goFonQualify))!=(strlen((int)($this->goFonQualify)))){
-//        $message[]= _("The given value for 'Response timeout' is not a valid number.");
-//      } 
-//    }
+    if($this->netConfigDNS->ipHostNumber == ""){
+       $message[]= _("The required field IP address is empty.");
+    } else {
+      if (!is_ip($this->netConfigDNS->ipHostNumber)){
+        $message[]= _("The field IP address contains an invalid address.");
+      }
+    }
 
     if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
       $message[]= _("The required field 'Phone name' is not set.");
@@ -385,7 +379,7 @@ class phoneGeneric extends plugin
 
       $ldap->cd($this->dn);
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
       // $user_phone_reload   
       $ldap->cd ($this->config->current['BASE']); 
@@ -400,8 +394,8 @@ $ldap->modify ($this->attrs);
     }
     $this->netConfigDNS->cn = $this->cn;    
     $this->netConfigDNS->save($this->dn);
+    show_ldap_error($ldap->get_error(), _("Saving phone failed"));
 
-    show_ldap_error($ldap->get_error());
     /* Optionally execute a command after we're done */
     $this->postcreate();
   }