X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_phoneGeneric.inc;h=76718175b7e3a42f7933ce8ac1d0bf54b27b05e3;hb=7f51b7c557fe5fb3c73b5bde15856fbfdb08efbb;hp=0009690000dfa71b27037a04e1a6855778428a97;hpb=227c0f2f4832e113f7d0cb1d8251e6d98e8ef84f;p=gosa.git diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc index 000969000..76718175b 100644 --- a/plugins/admin/systems/class_phoneGeneric.inc +++ b/plugins/admin/systems/class_phoneGeneric.inc @@ -53,10 +53,10 @@ class phoneGeneric extends plugin var $objectclasses= array("top", "goFonHardware"); - function phonegeneric ($config, $dn= NULL) + function phonegeneric ($config, $dn= NULL, $parent= NULL) { - plugin::plugin ($config, $dn); - $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses); + plugin::plugin ($config, $dn, $parent); + $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 */ @@ -393,8 +394,8 @@ class phoneGeneric extends plugin } $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(); }