Show more specific LDAP errors - part 1

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3297 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/TODO b/TODO
index 0f4f3978e2b7537aa8223a06657b305c54a57bd5..3b471aad2f38dbc9470bd2f0b912c8e5c7287b37 100644 (file)
--- a/TODO
+++ b/TODO
@@ -33,7 +33,6 @@ Target for 2.4.1:
 Now:
 * evaluate what effects a ldap->cat(..., $this->attributes)
   will have to other plugins in class_plugin.inc
-* Enhance show_ldap_error() with an additional programmer supplied message
 * Changing LDAP-Servers -> start tab! Actions?
 
 

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 69a537cff0390d85e1be89e08882e9e0ad6b5574..654a63896787a80d2ba578f7d5f5de56aa505919 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -949,7 +949,7 @@ class plugin
         }
         $ldap->cd($dn);
         $ldap->modify($nattrs);
-        show_ldap_error($ldap->get_error());
+        show_ldap_error($ldap->get_error(), _("Handle object tagging failed"));
       } else {
         @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "Not removing tag ($tag) $dn - seems to have moved away", "Tagging");
       }

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index 6b0638ace7cc74f5d99d037b3bf8db8f97c6e780..d891007ed67d922127d98e74fdc0c308a6cfc42b 100644 (file)
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -97,9 +97,9 @@ class intranetAccount extends plugin
                  @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
                                  $this->attributes, "Save");
                  $this->cleanup();
-$ldap->modify ($this->attrs); 
+                 $ldap->modify ($this->attrs); 
 
-                 show_ldap_error($ldap->get_error());
+                 show_ldap_error($ldap->get_error(), _("Removing intranet account failed"));
 
                  /* Optionally execute a command after we're done */
                  $this->postremove();
@@ -152,9 +152,9 @@ $ldap->modify ($this->attrs);
                  $ldap= $this->config->get_ldap_link();
                  $ldap->cd($this->dn);
                  $this->cleanup();
-$ldap->modify ($this->attrs); 
+                 $ldap->modify ($this->attrs); 
 
-                 show_ldap_error($ldap->get_error());
+                 show_ldap_error($ldap->get_error(), _("Saving intranet account failed"));
 
                  /* Optionally execute a command after we're done */
                  $this->postcreate();

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 114444cf942546324d7a9af3dbff6d24bf527f6a..16e23b9fa12cecc0176ba893c4eb4d04f112de33 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -320,9 +320,9 @@ class kolabAccount extends plugin
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving Kolab account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 77e38efb5ab75ad21ddc92096740bf3bbcf64837..40119ac487f4284e5bb51987f3b9a0913145e0dd 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -715,16 +715,16 @@ class oxchangeAccount extends plugin
 
     if($ldap->dn_exists("ou=addr,".$this->dn)){
        $ldap->rmdir_recursive("ou=addr,".$this->dn);
-       show_ldap_error($ldap->get_error());
+       show_ldap_error($ldap->get_error(), _("Removing of oxchange addressbook failed"));
     }
 
     $ldap->cd($this->dn);
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
+    show_ldap_error($ldap->get_error(), _("Removing oxchange account failed"));
 
-    show_ldap_error($ldap->get_error());
     /* Optionally execute a command after we're done */
     $this->postremove();
 
@@ -814,16 +814,16 @@ $ldap->modify ($this->attrs);
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving of oxchange account failed"));
 
     /* Optionally execute a command after we're done */
     $this->postcreate();
 
     if($needupdate){
       $ldap->create_missing_trees("ou=addr,".$this->dn);
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Creating oxchange addressbook tree failed"));
       /* Finally save data to postgresql server */
       pg_set_client_encoding ("UNICODE");
       $nv = "SELECT nextval ('serial_id')";

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 2bc1a0c67a3ecc98223858dfb028b103bfa64971..b70991a9610f9b68270a9f888dec6958ac0fc178 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -67,9 +67,9 @@ class phpgwAccount extends plugin
       @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
           $this->attributes, "Save");
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Removing PHPgw account failed"));
 
       /* Optionally execute a command after we're done */
       $this->handle_post_events('remove');
@@ -110,9 +110,9 @@ $ldap->modify ($this->attrs);
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Saving PHPgw account failed"));
 
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index 5f1e60ffb2e925a2b75be03d7320eaae6448c80e..63536b2c334876732a4760f9af6a9851a8c8d4bf 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -79,9 +79,8 @@ class phpscheduleitAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $this->cleanup();
-$ldap->modify ($this->attrs); 
-
-    show_ldap_error($ldap->get_error());
+    $ldap->modify ($this->attrs); 
+    show_ldap_error($ldap->get_error(), _("Removing PHPscheduleit account failed"));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events('remove');
@@ -120,9 +119,9 @@ $ldap->modify ($this->attrs);
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving PHPscheduleit account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index c7ed311e85213813ea2ee0acfab60c7822dbf74d..04ea2390c463ac95cfa63ed3dcd34f4fd0a775ac 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -79,9 +79,9 @@ class pptpAccount extends plugin
       @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
           $this->attributes, "Save");
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Removing PPTP account failed"));
 
       /* Optionally execute a command after we're done */
       $this->handle_post_events('remove');
@@ -122,9 +122,9 @@ $ldap->modify ($this->attrs);
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Saving PPTP account failed"));
 
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index d439a601ea37484af3bf2cbf49d1dbec12b0d649..de1cc587b75af73f351ff656f181a575699cf6ac 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -151,9 +151,9 @@ class proxyAccount extends plugin
         $this->attributes, "Save");
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing proxy account failed"));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove");
@@ -257,10 +257,9 @@ $ldap->modify ($this->attrs);
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving proxy account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index 41dc63e68b1c216cc6e2f97acb51b9d1aac1f430..aa55f5d26e70cc976f09b44819ed10beb246eeb6 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -91,9 +91,9 @@ class pureftpdAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing pureftpd account failed"));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events('remove');
@@ -170,9 +170,9 @@ $ldap->modify ($this->attrs);
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving pureftpd account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index 7ea80d9657e04a4944d31ec737e25cdd39db49b9..ba0c5ec206d2b42db64eb7d7aac8bec1b31fdc5b 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -63,9 +63,9 @@ class webdavAccount extends plugin
       @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
           $this->attributes, "Save");
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Removing webDAV account failed"));
 
       /* Optionally execute a command after we're done */
       $this->handle_post_events('remove');
@@ -106,9 +106,9 @@ $ldap->modify ($this->attrs);
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
       $this->cleanup();
-$ldap->modify ($this->attrs); 
+      $ldap->modify ($this->attrs); 
 
-      show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Saving webDAV account failed"));
 
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 6aa840bec5e5811f5c443f0417d38e2ba7580640..8582fce965c8250a46502d7277ca46991ae6bf14 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -713,8 +713,7 @@ class environment extends plugin
     $this->cleanup();
     $ldap->modify ($this->attrs); 
 
-
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing environment information failed"));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove");
@@ -1045,9 +1044,7 @@ $ldap->modify ($attrs);
     $ldap->cd($this->dn);
     $this->cleanup();
     $ldap->$mode($this->attrs);
-    if($ldap->get_error()!="Success"){
-      print_red($ldap->get_error());
-    }
+    show_ldap_error($ldap->get_error(), _("Adding environment information failed"));
     $this->handle_post_events($mode);
   }
 

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index e47078544a44f8fd8862f1af2fbdc18658323602..2141c2ec34891abe5fb420e33ec4369e9f03d486 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -541,6 +541,7 @@ class user extends plugin
   {
     $ldap= $this->config->get_ldap_link();
     $ldap->rmdir ($this->dn);
+    show_ldap_error($ldap->get_error(), _("Removing generic user account failed"));
 
     /* Delete references to groups */
     $ldap->cd ($this->config->current['BASE']);
@@ -829,7 +830,7 @@ class user extends plugin
     $this->cleanup();
     $ldap->cd ($this->dn);
     $ldap->$mode ($this->attrs);
-    if (show_ldap_error($ldap->get_error())){
+    if (show_ldap_error($ldap->get_error(), _("Saving generic user account failed"))){
       return (1);
     }
 

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 65686eeb4a572d5493951afe2d6316f603ea8412..08abd5fb17e5dbeca7091ab29f2662e0570b2b0b 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -567,9 +567,9 @@ class mailAccount extends plugin
         $this->attributes, "Save");
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing mail account failed"));
 
     /* Connect to IMAP server for account deletion */
     if ($this->gosaMailServer != ""){
@@ -672,7 +672,7 @@ $ldap->modify ($this->attrs);
     $this->cleanup();
     $ldap->modify ($this->attrs); 
   
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving mail account failed"));
 
     /* Only do IMAP actions if we are not a template */
     if (!$this->is_template){

diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc
index 1afde98f77f7d0150b7dc1cd9ddfa2c78d2123ee..fc6e04899671673f0d5283adafd873091b8b19f4 100644 (file)
--- a/plugins/personal/nagios/class_nagiosAccount.inc
+++ b/plugins/personal/nagios/class_nagiosAccount.inc
@@ -142,9 +142,9 @@ class nagiosAccount extends plugin
     /* Write back to ldap */
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving nagios account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){
@@ -221,9 +221,9 @@ $ldap->modify ($this->attrs);
         $this->attributes, "Save");
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing nagios account failed"));
 
     /* remove the entry from LDAP */
     unset ($this->attrs['uid']);

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 9c65c8c2ecee2a11b0209cd16facc57632abc907..7e66f6ce8584dc699110c6ff801019152cd59be9 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -253,7 +253,7 @@ class netatalk extends plugin {
     $this->cleanup();
     $ldap->modify($this->attrs);
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving Netatalk account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account) {
@@ -313,7 +313,7 @@ class netatalk extends plugin {
     $this->cleanup();
     $ldap->modify($this->attrs);
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing Netatalk account failed"));
 
     /* remove the entry from LDAP */
     unset ($this->attrs['uid']);

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index c61d6252f2bc300635d95d031edc7b39d9bb2e9e..47675b50349afa7bd241ef2adc96f6a7cf214f3b 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -592,9 +592,9 @@ class posixAccount extends plugin
         $this->attributes, "Save");
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing UNIX account failed"));
 
     /* Delete group only if cn is uid and there are no other
        members inside */
@@ -809,7 +809,7 @@ $ldap->modify ($this->attrs);
     unset($this->attrs['uid']);
     $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving UNIX account failed"));
 
     /* Remove lock needed for unique id generation */
     del_lock ("uidnumber");

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index e2335cca23675ddfdf9f231b88a120208d15ee63..31721d67b8eca443dc299a41699ed7b93ed39823 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -622,9 +622,9 @@ class sambaAccount extends plugin
         $this->attributes, "Save");
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing Samba account failed"));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events("remove");
@@ -969,9 +969,9 @@ $ldap->modify ($this->attrs);
     /* Write back to ldap */
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving Samba account failed"));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){