diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 9650956cb2935318d9481d2b1b1203a6ebe2f80f..7d1e3fe86572a3603b9c44076cf66c70a631bfc3 100644 (file)
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
} 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;
}
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
return($display);
}
return($display);
}
+ /* Base select dialog */
+ $once = true;
+ foreach($_POST as $name => $value){
+ if(preg_match("/^chooseBase/",$name) && $once){
+ $once = false;
+ $this->dialog = new baseSelectDialog($this->config);
+ $this->dialog->setCurrentBase($this->base);
+ }
+ }
+
+ /* Dialog handling */
+ if(is_object($this->dialog)){
+ /* Must be called before save_object */
+ $this->dialog->save_object();
+
+ if($this->dialog->isClosed()){
+ $this->dialog = false;
+ }elseif($this->dialog->isSelected()){
+ $this->base = $this->dialog->isSelected();
+ $this->dialog= false;
+ }else{
+ return($this->dialog->execute());
+ }
+ }
+
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("bases", $this->config->idepartments);
/* Fill templating stuff */
$smarty= get_smarty();
$smarty->assign("bases", $this->config->idepartments);
$smarty->assign("$attr", $this->$attr);
}
$smarty->assign("base_select", $this->base);
$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());
/* Show main page */
$smarty->assign("netconfig", $this->netConfigDNS->execute());
$ldap= $this->config->get_ldap_link();
$this->netConfigDNS->remove_from_parent();
$ldap->rmdir($this->dn);
$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 */
$this->handle_post_events("remove");
/* Delete references to object groups */
/* Check supplied data */
function check()
{
/* 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;
$this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
$message[]= _("The required field 'Component name' is not set.");
}
$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);
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
$acl= get_module_permission($acl, "component", $this->dn);
$this->attrs= $attrs;
}
$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'){
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
if ($this->orig_dn == 'new'){
}
$ldap->cd($this->dn);
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
$this->handle_post_events("modify");
}
$this->netConfigDNS->cn = $this->cn;
$this->netConfigDNS->save($this->dn);
$this->handle_post_events("modify");
}
$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();
/* Optionally execute a command after we're done */
$this->postcreate();