X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_componentGeneric.inc;h=7d1e3fe86572a3603b9c44076cf66c70a631bfc3;hb=feaebb942db33bf1b0c39b4b1a633994b4992b21;hp=23c2428557f844e0adb633702645b2e72808b3c8;hpb=e81782537a12216cb0d91d5a0f6c750b63075f26;p=gosa.git

diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 23c242855..7d1e3fe86 100644
--- a/plugins/admin/systems/class_componentGeneric.inc
+++ b/plugins/admin/systems/class_componentGeneric.inc
@@ -34,7 +34,7 @@ class componentGeneric extends plugin
     } else {
       $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
     }
-    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
     /* Save dn for later references */
     $this->orig_dn= $this->dn;
   }
@@ -86,6 +86,7 @@ class componentGeneric extends plugin
       $smarty->assign("$attr", $this->$attr);
     }
     $smarty->assign("base_select", $this->base);
+    $smarty->assign("baseACL", chkacl($this->acl,"base"));
 
     /* Show main page */
     $smarty->assign("netconfig", $this->netConfigDNS->execute());
@@ -97,7 +98,7 @@ class componentGeneric extends plugin
     $ldap= $this->config->get_ldap_link();
     $this->netConfigDNS->remove_from_parent();
     $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing generic component failed"));
     $this->handle_post_events("remove");
 
     /* Delete references to object groups */
@@ -128,9 +129,9 @@ class componentGeneric extends plugin
   /* Check supplied data */
   function check()
   {
-    $message= array();
-
-    $message = array_merge($message,$this->netConfigDNS->check());
+    /* Call common method to give check the hook */
+    $message= plugin::check();
+    $message= array_merge($message,$this->netConfigDNS->check());
 
     $this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
 
@@ -138,6 +139,15 @@ class componentGeneric extends plugin
       $message[]= _("The required field 'Component name' is not set.");
     }
 
+    /* To check for valid ip*/
+    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.");
+      }
+    }
+
     $ui= get_userinfo();
     $acl= get_permissions ($this->dn, $ui->subtreeACL);
     $acl= get_module_permission($acl, "component", $this->dn);
@@ -180,6 +190,13 @@ class componentGeneric extends plugin
       $this->attrs= $attrs;
     }
 
+    /* If this is a new Object IP & Mac aren't set.
+         IP & Mac are msut attributes, so we set this values by here. */
+    if($this->orig_dn == 'new'){
+      $this->attrs['ipHostNumber'] = $this->netConfigDNS->ipHostNumber;
+      $this->attrs['macAddress']  = $this->netConfigDNS->macAddress;
+    }
+
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     if ($this->orig_dn == 'new'){
@@ -195,7 +212,7 @@ class componentGeneric extends plugin
 
       $ldap->cd($this->dn);
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
       $this->handle_post_events("modify");
     }
@@ -203,7 +220,7 @@ $ldap->modify ($this->attrs);
     $this->netConfigDNS->cn = $this->cn;
     $this->netConfigDNS->save($this->dn);
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving generic component failed"));
 
     /* Optionally execute a command after we're done */
     $this->postcreate();