X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_winGeneric.inc;h=fc0191a72fd502cea2a2735a87e62dd6f55f9571;hb=afecd435ef601ea27a281cc6667f94d7273b40e2;hp=5f250619cd9212478bb2eca9c44325eef0574dc6;hpb=e81782537a12216cb0d91d5a0f6c750b63075f26;p=gosa.git diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc index 5f250619c..fc0191a72 100644 --- a/plugins/admin/systems/class_winGeneric.inc +++ b/plugins/admin/systems/class_winGeneric.inc @@ -45,9 +45,9 @@ class wingeneric extends plugin var $objectclasses= array("posixAccount","person","organizationalPerson","inetOrgPerson","gosaAccount","shadowAccount","sambaSamAccount","top"); - function wingeneric ($config, $dn= NULL) + function wingeneric ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, $dn, $parent); $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); /* Set base */ if ($this->dn == "new"){ @@ -123,7 +123,7 @@ class wingeneric extends plugin $this->netConfigDNS->remove_from_parent(); $ldap= $this->config->get_ldap_link(); $ldap->rmdir($this->dn); - show_ldap_error($ldap->get_error()); + show_ldap_error($ldap->get_error(), _("Removing Samba workstation failed")); $this->handle_post_events("remove"); /* Delete references to object groups */ @@ -152,7 +152,9 @@ class wingeneric extends plugin /* Check supplied data */ function check() { - $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; $ui= get_userinfo(); @@ -212,14 +214,14 @@ class wingeneric extends plugin $ldap->cd($this->dn); $this->cleanup(); -$ldap->modify ($this->attrs); + $ldap->modify ($this->attrs); $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 Samba workstation failed")); /* Optionally execute a command after we're done */ $this->postcreate();