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 37d2c6483f4ac5bca46e2d7fcb96e3f6b441d967..e70057b050aec996b733a38b8264acccd754005f 100644 (file)
--- 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 5e0f5faf0651b7b8ab1c24705e2e602e27874ad7..4837fbd36eeb1da43e86ba542509d5a5655ab8a8 100755 (executable)
--- 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 d9d91bef6d3148004616bd492f5dffe361a73529..4463afd706b59e6fb20edd7be894f60ab10021d7 100755 (executable)
--- 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 b38336fe90e1a65f25d0ed81968c0a774355b28e..64a390fb085a3ccc110f9d0a7c222047b2ed51ee 100644 (file)
--- 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);