From: hickert Date: Thu, 29 Jun 2006 11:09:18 +0000 (+0000) Subject: Updated error msgs for gofon plugins X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ddb713e47f07aee4fd064c7b96bfe79dcebad1f;p=gosa.git Updated error msgs for gofon plugins git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3987 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc index 37d2c6483..e70057b05 100644 --- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc +++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc @@ -179,6 +179,7 @@ class conference extends plugin $ldap->cd ($this->dn); $ldap->recursive_remove(); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of goFonConference/generic with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ $this->handle_post_events('remove'); } @@ -506,7 +507,7 @@ class conference extends plugin $ldap->add($this->attrs); $this->handle_post_events('add'); } - show_ldap_error($ldap->get_error(), _("Saving phone conference failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of goFonConference/generic with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ $this->postcreate(); diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc index 5e0f5faf0..4837fbd36 100755 --- a/plugins/gofon/macro/class_gofonMacro.inc +++ b/plugins/gofon/macro/class_gofonMacro.inc @@ -191,7 +191,8 @@ class macro extends plugin } $ldap->rmDir($this->dn); - show_ldap_error($ldap->get_error(), _("Removing phone macro failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of goFonMacro/generic account with dn '%s' failed."),$this->dn)); + if(isset($this->orig_cn)){ $this->generate_mysql_entension_entries(false,true,$this->orig_cn); }else{ @@ -205,7 +206,7 @@ class macro extends plugin $og= new ogroup($this->config, $ldap->getDN()); unset($og->member[$this->dn]); $og->save (); - show_ldap_error($ldap->get_error(), _("Removing phone macro reverences failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of goFonMacro/generic account with dn '%s' failed."),$this->dn)); } } @@ -453,7 +454,7 @@ class macro extends plugin $ldap->add($this->attrs); $this->handle_post_events("add"); } - show_ldap_error($ldap->get_error(), _("Saving phone macro failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of goFonMacro/generic account with dn '%s' failed."),$this->dn)); } } diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc index d9d91bef6..4463afd70 100755 --- a/plugins/gofon/macro/class_gofonMacroParameters.inc +++ b/plugins/gofon/macro/class_gofonMacroParameters.inc @@ -393,7 +393,7 @@ class macroParameter extends plugin $ldap->add($this->attrs); $this->handle_post_events("add"); } - show_ldap_error($ldap->get_error(), _("Saving phone macro parameters failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of goFonMacro/generic account with dn '%s' failed."),$this->dn)); } } diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc index b38336fe9..64a390fb0 100644 --- a/plugins/gofon/phoneaccount/class_phoneAccount.inc +++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc @@ -961,7 +961,7 @@ class phoneAccount extends plugin $this->cleanup(); $ldap->modify ($this->attrs); - show_ldap_error($ldap->get_error(), _("Saving phone account failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/phone account with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ @@ -1122,7 +1122,7 @@ class phoneAccount extends plugin $this->cleanup(); $ldap->modify ($this->attrs); - show_ldap_error($ldap->get_error(), _("Removing phone account failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/phone account with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ @mysql_close($r_con);