From bdd5b39750999e759b7bb8ec1a99b178d4d67539 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 29 Jun 2006 12:05:13 +0000 Subject: [PATCH] Fixed error msgs for server - kolab,generic,dns git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3995 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_servDNS.inc | 8 ++++---- plugins/admin/systems/class_servGeneric.inc | 5 +++-- plugins/admin/systems/class_servKolab.inc | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc index e532daba3..fbd9c812c 100644 --- a/plugins/admin/systems/class_servDNS.inc +++ b/plugins/admin/systems/class_servDNS.inc @@ -285,7 +285,7 @@ class servdns extends plugin foreach($tmp['zoneUpdates'] as $dn => $attrs){ $ldap->cd($dn); $ldap->modify($attrs); - show_ldap_error("Zone:".$ldap->get_error(), _("Updating DNS service failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Updating of system server/dns with dn '%s' failed."),$this->dn)); } } @@ -294,7 +294,7 @@ class servdns extends plugin foreach($tmp['del'] as $dn => $del){ $ldap->cd($dn); $ldap->rmdir_recursive($dn); - show_ldap_error($ldap->get_error(), _("Removing DNS entries failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of system server/dns with dn '%s' failed."),$this->dn)); } /* move follwoing entries @@ -315,7 +315,7 @@ class servdns extends plugin $ldap->cd($dn); $ldap->add($attrs); } - show_ldap_error($ldap->get_error(), _("Saving DNS entries failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of system server/dns with dn '%s' failed."),$this->dn)); } } @@ -339,7 +339,7 @@ class servdns extends plugin $attrs[$flag] = $value; $this->$flag = $value; $ldap->modify($attrs); - show_ldap_error($ldap->get_error()); + show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for system server/dns with dn '%s' failed."),$this->dn)); $this->action_hook(); } } diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc index 1ab22f202..5a6f75271 100644 --- a/plugins/admin/systems/class_servGeneric.inc +++ b/plugins/admin/systems/class_servGeneric.inc @@ -108,7 +108,7 @@ class servgeneric extends plugin $ldap->cd($this->dn); $ldap->modify($attrs); - show_ldap_error($ldap->get_error()); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of system server/generic (FAIstate) with dn '%s' failed."),$this->dn)); } } } @@ -186,6 +186,7 @@ class servgeneric extends plugin $ldap= $this->config->get_ldap_link(); $ldap->rmdir($this->dn); show_ldap_error($ldap->get_error(), _("Removing server failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing of system server/generic with dn '%s' failed."),$this->dn)); /* Delete references to object groups */ $ldap->cd ($this->config->current['BASE']); @@ -297,7 +298,7 @@ class servgeneric extends plugin $mode= "modify"; } - show_ldap_error($ldap->get_error(), _("Saving server failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving of system server/generic with dn '%s' failed."),$this->dn)); $this->netConfigDNS->cn = $this->cn; $this->netConfigDNS->save($this->dn); diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc index d2f43dcbc..07ae9a588 100644 --- a/plugins/admin/systems/class_servKolab.inc +++ b/plugins/admin/systems/class_servKolab.inc @@ -188,7 +188,7 @@ class servkolab extends plugin { /* Remove complete entry */ $ldap->rmdir ($this->dn); - show_ldap_error($ldap->get_error(), _("Removing kolab host entry failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing host entry from system server/kolab with dn '%s' failed."),$this->dn)); gosa_log("k=kolab entry removed, ".$this->hostname." was the last kolabHost entry."); } else { @@ -204,7 +204,7 @@ class servkolab extends plugin { $ldap->cd($this->dn); $this->cleanup(); $ldap->modify ($attrs); - show_ldap_error($ldap->get_error(), _("Removing server from kolab object failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Removing host entry from system server/kolab with dn '%s' failed."),$this->dn)); gosa_log("Removing ".$this->hostname." from list of kolabHosts"); } @@ -329,7 +329,7 @@ class servkolab extends plugin { $ldap->cd($this->dn); $this->cleanup();; $ldap->$mode($this->attrs); - show_ldap_error($ldap->get_error(), _("Saving server to kolab object failed")); + show_ldap_error($ldap->get_error(), sprintf(_("Saving system server/kolab with dn '%s' failed."),$this->dn)); /* Optionally execute a command after we're done */ if ($this->initially_was_account == $this->is_account) { @@ -380,7 +380,7 @@ class servkolab extends plugin { $attrs[$flag] = $value; $this->$flag = $value; $ldap->modify($attrs); - show_ldap_error($ldap->get_error()); + show_ldap_error($ldap->get_error(), sprintf(_("Set status flag for system server/kolab with dn '%s' failed."),$this->dn)); $this->action_hook(); } } -- 2.30.2