diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 4c850812879a4e54194c56de1bca65ee42ddda26..b0bb33486321b8056f09c42da943d62a71fe368c 100644 (file)
/* Needed values and lists */
var $base= "";
var $cn= "";
/* Needed values and lists */
var $base= "";
var $cn= "";
- var $macAddress= "";
- var $ipHostNumber= "";
var $description= "";
var $orig_dn= "";
/* attribute list for save action */
var $description= "";
var $orig_dn= "";
/* attribute list for save action */
- var $attributes= array("cn", "description", "macAddress", "ipHostNumber");
+ var $attributes= array("cn", "description");
var $objectclasses= array("top", "device", "ipHost", "ieee802Device");
var $objectclasses= array("top", "device", "ipHost", "ieee802Device");
+ var $netConfigDNS;
- function componentgeneric ($config, $dn= NULL)
+ function componentgeneric ($config, $dn= NULL, $parent= NULL)
{
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
/* Set base */
if ($this->dn == "new"){
/* Set base */
if ($this->dn == "new"){
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
}
-
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
function execute()
{
/* Save dn for later references */
$this->orig_dn= $this->dn;
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
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 */
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $this->netConfigDNS->cn= $this->cn;
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
return($smarty->fetch (get_template_path('component.tpl', TRUE)));
}
function remove_from_parent()
{
$ldap= $this->config->get_ldap_link();
return($smarty->fetch (get_template_path('component.tpl', TRUE)));
}
function remove_from_parent()
{
$ldap= $this->config->get_ldap_link();
+ $this->netConfigDNS->remove_from_parent();
$ldap->rmdir($this->dn);
$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 */
unset($og->member[$this->dn]);
$og->save ();
}
unset($og->member[$this->dn]);
$og->save ();
}
-
}
}
{
plugin::save_object();
{
plugin::save_object();
+ $this->netConfigDNS->save_object();
+
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
/* Check supplied data */
function check()
{
/* Check supplied data */
function check()
{
- $message= array();
+ /* 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;
- /* must: cn, macAddress, ipHostNumber */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
$message[]= _("The required field 'Component name' is not set.");
}
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
$message[]= _("The required field 'Component name' is not set.");
}
- if ($this->macAddress == "" && chkacl ($this->acl, "macAddress") == ""){
- $message[]= _("The required field 'MAC-address' is not set.");
- }
- if ($this->ipHostNumber == "" && chkacl ($this->acl, "ipHostNumber") == ""){
- $message[]= _("The required field 'IP-address' 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();
}
$ui= get_userinfo();
$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->handle_post_events("modify");
}
- show_ldap_error($ldap->get_error());
+
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+
+ 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();