Added \$this->cleanup before all calls of $ldap->modify

It is still missing for $ldap->$mode ( ... ) ;

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

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index be7001e95b67a621c0cc7cad99fb4a9451a976a9..a61e7994bbfcb076122bea1da11e77eb29555aff 100644 (file)
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -333,7 +333,9 @@ class application extends plugin
         $a= $ldap->fetch();
         if (count($a)){
                $ldap->cd($this->dn);
-                       $ldap->modify($this->attrs);
+                       $this->cleanup();
+$ldap->modify ($this->attrs); 
+
                        $this->handle_post_events("modify");
         } else {
                        $ldap->cd($this->config->current['BASE']);

diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc
index da2bc67ccda9a92b266141c5739d828f2c780ce3..69ccc8f03dbd1b48749addefecbd0e981e8f6d28 100644 (file)
--- a/plugins/admin/applications/class_applicationParameters.inc
+++ b/plugins/admin/applications/class_applicationParameters.inc
@@ -120,7 +120,9 @@ class applicationParameters extends plugin
         $ldap->cd($this->dn);
         @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
                 $this->attributes, "Save");
-       $ldap->modify($this->attrs);
+       $this->cleanup();
+$ldap->modify ($this->attrs); 
+
        show_ldap_error($ldap->get_error());
 
        /* Optionally execute a command after we're done */
@@ -179,7 +181,9 @@ class applicationParameters extends plugin
        $ldap->cd($this->dn);
         @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
                 $this->attributes, "Save");
-       $ldap->modify($this->attrs);
+       $this->cleanup();
+$ldap->modify ($this->attrs); 
+
        show_ldap_error($ldap->get_error());
 
        /* Optionally execute a command after we're done */

diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index 5dbb830c8b0424ba3145a5ecf900b36e959a9174..62ceff1262dc8e1e1850980263c897e35acd512c 100644 (file)
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -197,7 +197,9 @@ class department extends plugin
        $a= $ldap->fetch();
        $ldap->cd($this->dn);
        if (count($a)){
-               $ldap->modify($this->attrs);
+               $this->cleanup();
+$ldap->modify ($this->attrs); 
+
                $this->handle_post_events('modify');
        } else {
                $ldap->add($this->attrs);

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index aaf7f74e0c86d5d6ecf05b3615d3c5532bd5ae85..4dbff3b898e37c1444c83e2d89c6b71f53d5f0aa 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -273,7 +273,9 @@ class faiHook extends plugin
     if($ldap->count()!=0){     
       /* Write FAIscript to ldap*/ 
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     }else{
       /* Write FAIscript to ldap*/ 
       $ldap->cd($this->config->current['BASE']);
@@ -335,7 +337,9 @@ class faiHook extends plugin
         $this->handle_post_events("remove");
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
-        $ldap->modify($tmp);
+        $this->cleanup();
+$ldap->modify ($tmp); 
+
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
         if($tmp['description']==array()){

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index e98f721e431ccb79c58dc616c9e22bde87661b0f..1540bb748111efaf31edc3213d17a608367517cf 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -386,7 +386,9 @@ class faiPackage extends plugin
     if($ldap->count()!=0){
       /* Write FAIscript to ldap*/
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     }else{
       /* Write FAIscript to ldap*/
       $ldap->cd($this->config->current['BASE']);
@@ -416,7 +418,9 @@ class faiPackage extends plugin
         $ldap->cat($pkgdn);
         if($ldap->count()!=0){
           $ldap->cd($pkgdn);
-          $ldap->modify($pkgattrs);
+          $this->cleanup();
+$ldap->modify ($pkgattrs); 
+
         }else{
           $ldap->cd($this->config->current['BASE']);
           $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $pkgdn));

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index f6adfeb34f8aae34c3072253f33598490213b228..77b2e76e83075ce9da883a78eb31e6cc7e1d5739 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -303,7 +303,9 @@ class faiPartitionTable extends plugin
       /* Add partition table to ldap
        */
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
     }
   
@@ -343,7 +345,9 @@ class faiPartitionTable extends plugin
           $disk_attrs['description']=array();
         }
         $ldap->cd($disk_dn);
-        $ldap->modify($disk_attrs);
+        $this->cleanup();
+$ldap->modify ($disk_attrs); 
+
       }elseif($disk['status']== "new"){
         if(empty($disk_attrs['description'])){
           unset($disk_attrs['description']);
@@ -404,7 +408,9 @@ class faiPartitionTable extends plugin
             $partition_attrs['description']=array();
           }
           $ldap->cd($partition_dn);
-          $ldap->modify($partition_attrs);
+          $this->cleanup();
+$ldap->modify ($partition_attrs); 
+
         } 
       show_ldap_error($ldap->get_error());
       }

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index 8e56ddfb6d3978818496a06704702b51d5f17007..d416b06027d965b640cbfd65db2f92974d5c8cb6 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -385,7 +385,9 @@ class faiProfile extends plugin
     if($ldap->count()!=0){
       /* Write FAIscript to ldap*/
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     }else{
       /* Write FAIscript to ldap*/
       $ldap->cd($this->config->current['BASE']);

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index b7e122058979700046a0fcd98573d80916ba0316..51b674c3810819cc3fa5329bf1379f85c8f8e1f3 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -252,7 +252,9 @@ class faiScript extends plugin
     if($ldap->count()!=0){
       /* Write FAIscript to ldap*/
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     }else{
       /* Write FAIscript to ldap*/
       $ldap->cd($this->config->current['BASE']);
@@ -318,7 +320,9 @@ class faiScript extends plugin
         $this->handle_post_events("remove");
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
-        $ldap->modify($tmp);
+        $this->cleanup();
+$ldap->modify ($tmp); 
+
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
         if($tmp['description']==array()){

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index cfe0f41e8e5cb1c9f9e732c3029fa0c8236f7f87..10f81c719542047b246f5f68c7dd0987689b1538 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -253,7 +253,9 @@ class faiTemplate extends plugin
     if($ldap->count()!=0){
       /* Write FAIscript to ldap*/
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     }else{
       /* Write FAIscript to ldap*/
       $ldap->cd($this->config->current['BASE']);
@@ -310,7 +312,9 @@ class faiTemplate extends plugin
         $this->handle_post_events("remove");
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
-        $ldap->modify($tmp);
+        $this->cleanup();
+$ldap->modify ($tmp); 
+
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
 

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 2d2e581bf16e3d71a5d00ec568bf6dd4ac1b9798..f6c4a5562658d6e832de1c1d3d5d1dc7c93c3d56 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -256,7 +256,9 @@ class faiVariable extends plugin
     if($ldap->count()!=0){
       /* Write FAIscript to ldap*/
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     }else{
       /* Write FAIscript to ldap*/
       $ldap->cd(preg_replace('/^[^,]+,[^,]+,/', '', $this->dn));
@@ -314,7 +316,9 @@ class faiVariable extends plugin
         $this->handle_post_events("remove");
       }elseif($obj['status'] == "edited"){
         $ldap->cd($sub_dn);
-        $ldap->modify($tmp);
+        $this->cleanup();
+$ldap->modify ($tmp); 
+
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
 

diff --git a/plugins/admin/groups/class_groupAcl.inc b/plugins/admin/groups/class_groupAcl.inc
index 706edc95a1753f4c951769670c2a54b576a30200..79c28d043e02932ef844d1e0807a79ee34434a8b 100644 (file)
--- a/plugins/admin/groups/class_groupAcl.inc
+++ b/plugins/admin/groups/class_groupAcl.inc
@@ -94,7 +94,9 @@ class acl extends plugin
 
        $ldap= $this->config->get_ldap_link();
        $ldap->cd($this->dn);
-       $ldap->modify($this->attrs);
+       $this->cleanup();
+$ldap->modify ($this->attrs); 
+
        show_ldap_error($ldap->get_error());
   }
 
@@ -189,7 +191,9 @@ class acl extends plugin
 
        /* Modify class */
        $ldap->cd($this->dn);
-       $ldap->modify($this->attrs);
+       $this->cleanup();
+$ldap->modify ($this->attrs); 
+
        show_ldap_error($ldap->get_error());
   }
 

diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc
index 05c1160e498545005e44e40f08e595ad7c17ed84..8cee62bab47e4e76fcaf1bc6e550886cd91a9673 100644 (file)
--- a/plugins/admin/groups/class_groupApplication.inc
+++ b/plugins/admin/groups/class_groupApplication.inc
@@ -630,7 +630,9 @@ class appgroup extends plugin
 
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -673,7 +675,9 @@ class appgroup extends plugin
     /* Write back to LDAP */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index f759f74357bf8fa70cff38a486f9090bb86df315..383b513614b490e132ea0bc9c26bcc91a8338830 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -543,7 +543,9 @@ class mailgroup extends plugin
     /* Keep uid */
     unset ($this->attrs['uid']);
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Connect to IMAP server for account deletion */
@@ -630,7 +632,9 @@ class mailgroup extends plugin
 
   /*  
       Backup for function save 
-      Änderungen :  fixAttributesOnStore($this) wurde erst nach dem ldap->modify
+      Änderungen :  fixAttributesOnStore($this) wurde erst nach dem this->cleanup();
+$ldap->modify  
+
                     Ausgeführt, deshalb wurden die gemappten Attribute auch nicht 
                     gespeichert.
 
@@ -665,7 +669,9 @@ class mailgroup extends plugin
 
     /* Save data to LDAP * /
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Only do IMAP actions if we are not a template * /
@@ -785,7 +791,9 @@ class mailgroup extends plugin
 
     /* Save data to LDAP */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/admin/ogroups/class_mailogroup.inc b/plugins/admin/ogroups/class_mailogroup.inc
index 74a2902182a77bc4c49014ac691cd7bcf0076ec7..b99206146a930cede0354d27a5708ad654a3ebd4 100644 (file)
--- a/plugins/admin/ogroups/class_mailogroup.inc
+++ b/plugins/admin/ogroups/class_mailogroup.inc
@@ -91,7 +91,9 @@ class mailogroup extends plugin
 
     /* Save data to LDAP */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -122,7 +124,9 @@ class mailogroup extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
   }
 

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index e5861b8a7a2932905ad8ecc6f0dcff3e28570226..c0e669b03843521b43eb1c69fa7efeb1018336b1 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -579,7 +579,9 @@ class phonequeue extends plugin
 
     /* Save data to LDAP */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
 
     show_ldap_error($ldap->get_error());
 
@@ -675,7 +677,9 @@ class phonequeue extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
   }
 

diff --git a/plugins/admin/systems/class_componentGeneric.inc b/plugins/admin/systems/class_componentGeneric.inc
index 9650956cb2935318d9481d2b1b1203a6ebe2f80f..250261b2c7e7b6a4b9a0a76162f3249ac240133c 100644 (file)
--- a/plugins/admin/systems/class_componentGeneric.inc
+++ b/plugins/admin/systems/class_componentGeneric.inc
@@ -169,7 +169,9 @@ class componentGeneric extends plugin
       }
 
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $this->handle_post_events("modify");
     }
 

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 86696b0b9b12c020d4006746fb4dc3b668cfcd5f..ee1916c5803aa7a7187e8dfc07b804a70509cf27 100644 (file)
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -353,7 +353,9 @@ class phoneGeneric extends plugin
       }
 
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       // $user_phone_reload   
       $ldap->cd ($this->config->current['BASE']); 
       $user_phone_assignment = $ldap->fetch($ldap->search("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))",array("uid")));

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index b06b878c2fc5b667d01ac3a67d2b1eae7d23132d..bc732438676cce172781bb4f65c1ce9f22202021 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -615,7 +615,9 @@ class printgeneric extends plugin
       }
 
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $this->handle_post_events("modify");
     }
     show_ldap_error($ldap->get_error());

diff --git a/plugins/admin/systems/class_servDB.inc b/plugins/admin/systems/class_servDB.inc
index de62146352b771630dc1d21bb810415ef51eea58..65e0f9df5419260db5f885977bc81db0f9dc628a 100644 (file)
--- a/plugins/admin/systems/class_servDB.inc
+++ b/plugins/admin/systems/class_servDB.inc
@@ -238,7 +238,9 @@ class servdb extends plugin
     /* Write to LDAP */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 13c2956007036ade69e71bf3cef73de14f1d76d7..aa34030714e28a7ca0902b76ff32ccdee024cf4d 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -388,7 +388,9 @@ class servdns extends plugin
     /* Update existing entries */
     foreach($actions['update'] as $dn => $attrs){
       $ldap->cd($dn);
-      $ldap->modify($attrs);
+      $this->cleanup();
+$ldap->modify ($attrs); 
+
     }
     show_ldap_error($ldap->get_error());
   }

diff --git a/plugins/admin/systems/class_servGeneric.inc b/plugins/admin/systems/class_servGeneric.inc
index 883c3989ded756b89a570b92eb9f9f944c5d65ac..9252d16a969a181f0935a791947f6c4aee1069a5 100644 (file)
--- a/plugins/admin/systems/class_servGeneric.inc
+++ b/plugins/admin/systems/class_servGeneric.inc
@@ -234,7 +234,9 @@ class servgeneric extends plugin
       }
   
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $mode= "modify";
     }
     $this->netConfigDNS->cn = $this->cn;

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index f3bd4ef46e876abd7f0458484dc8c174282ecf63..87c65e76539247f46fcc64763d87c134a7a76cc3 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -185,7 +185,9 @@ class servkolab extends plugin {
       }
       $attrs= array('kolabHost' => $hosts);
       $ldap->cd($this->dn);
-      $ldap->modify($attrs);
+      $this->cleanup();
+$ldap->modify ($attrs); 
+
       show_ldap_error($ldap->get_error());
     }
 

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index 6f75496ac74ffd65550705d3107460eb5672518c..0d4453468a2a10005a8013036b32de4067e62b2d 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -237,7 +237,9 @@ class servrepository extends plugin
     
     if($ldap->count()){
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);      
+      $this->cleanup();
+$ldap->modify ($this->attrs);       
+
       $this->handle_post_events("modify");
     }
   }
@@ -289,7 +291,9 @@ class servrepository extends plugin
     
     if($ldap->count()){
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);      
+      $this->cleanup();
+$ldap->modify ($this->attrs);       
+
       $this->handle_post_events("modify");
     }else{
       $ldap->cd ($this->config->current['BASE']);

diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index 627cb5a95d82761ebcf50177a666ad19dcb18892..281fd789796b9af4020c5e57a74796635a1cb62b 100644 (file)
--- a/plugins/admin/systems/class_servService.inc
+++ b/plugins/admin/systems/class_servService.inc
@@ -312,7 +312,9 @@ class servservice extends plugin
     /* Write to LDAP */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
     
     /* Optionally execute a command after we're done */

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index d7d254fbde18afd1fa27bf08b02fe687270c33ca..b525f7b9d61622bdacc96c4031ec4906d1416932 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -316,7 +316,9 @@ class termDNS extends plugin
 
     /* Write back to ldap */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
 
     /****************/ 
     /* DNS HANDLING */
@@ -360,7 +362,9 @@ class termDNS extends plugin
         
         if(count($ldap->fetch())){
           $ldap->cd($dn);
-          $ldap->modify($attrs);
+          $this->cleanup();
+$ldap->modify ($attrs); 
+
         }else{
           $ldap->cd($dn);
           $ldap->add($attrs);

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index bfa881a31a4e46c06fe8eed0a923e2cde896faed..75556b63ddd9e4f04f3ad60366c5054d6b2d5a40 100644 (file)
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -315,7 +315,9 @@ class termgeneric extends plugin
         $this->move($this->orig_dn, $this->dn);
       }
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $this->handle_post_events("modify");
     }
     $this->netConfigDNS->cn = $this->cn;

diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index 6cce41a472e530ac7f8f8f0ecd40881c50561157..a09473e3a55d5a37c852610e6c356fc0ccfaf2ef 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -293,7 +293,9 @@ class termservice extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
     $this->handle_post_events("modify");
   }

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 6a80c0de5786968a146b954f092c94394105cf5b..f1bf0d3ddac92e9ab98805cdd8ee8acdffb4aaa8 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -297,7 +297,9 @@ class termstartup extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
     $this->handle_post_events("modify");
   }

diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index b2002b79e4b089946054f4984192c6c80102fa47..089c096ac955be2fca4c46c40a991efbd500742f 100644 (file)
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -186,7 +186,9 @@ class wingeneric extends plugin
       }
 
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $this->handle_post_events("modify");
     }
 

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 1c81a6c1ffb47df3221d2bf850999fc636a6dbf6..f34e55a8c41dea7e1c8a38cbf6fcafe8e5e3d7dd 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -276,7 +276,9 @@ class workgeneric extends plugin
         $this->move($this->orig_dn, $this->dn);
       }
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       if(!$this->didAction){
         $this->handle_post_events("modify");
       }

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index c80b799fba8e8fe22e1027895e2573d1265df4e1..f8cd526a72500bf12a4820de350d4c06bc0709e7 100644 (file)
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -290,7 +290,9 @@ class workservice extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
     $this->handle_post_events("modify");
   }

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 07a925b61fed2d0d44e97c36b1ccb5ff5f66c9ac..0eeb89220cc556f29d8aca27d424eefff726e52d 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -633,7 +633,9 @@ class workstartup extends plugin
 
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
     $this->handle_post_events("modify");
   }

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 8e29d57cb38c3dd4e477ce09d7e0c0e528cdb320..a8658b2ed137f02b386157d6c180be8df2cd0642 100644 (file)
--- a/plugins/gofax/faxaccount/class_gofaxAccount.inc
+++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc
@@ -618,7 +618,9 @@ class gofaxAccount extends plugin
 
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -735,7 +737,9 @@ class gofaxAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index f56e30a1a71751dc53814d8785f962be20eb8f78..fea75e73dea50a54a50c8823dc0edc65f86eef2a 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -472,7 +472,9 @@ class conference extends plugin
     $a= $ldap->fetch();
     $ldap->cd($this->dn);
     if (count($a)){
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $this->handle_post_events('modify');
     } else {
       $ldap->add($this->attrs);

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index d33f8a605fdc047cae8482c1a6aab9c4cdac6fee..d358ef900dcd9cd9c6a6ab1083c2e85cc0af77de 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -411,7 +411,9 @@ class macro extends plugin
     if($this->generate_mysql_entension_entries()){
       if (count($a)){
         $ldap->cd($this->dn);
-        $ldap->modify($this->attrs);
+        $this->cleanup();
+$ldap->modify ($this->attrs); 
+
         $this->handle_post_events("modify");
       } else {
         $ldap->cd($this->config->current['BASE']);

diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index e7e7b0d0a15bfeab095903c38754a14b6f574d93..451462083ba21aaae0a79850d84e14b2d200abdc 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -378,7 +378,9 @@ class macroParameter extends plugin
 
     if (count($a)){
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       $this->handle_post_events("modify");
     } else {
       if(count($this->attrs['goFonMacroParameter']==0)){

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index db1c304c2ff7a753dd94e03d75991e91e5cfb469..d2016b629940a9a63ed670f9ae2f9f32f6f7141e 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -956,7 +956,9 @@ class phoneAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -1109,7 +1111,9 @@ class phoneAccount extends plugin
       }
     }
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index 067b3ed07d143fc1dbf2ef40551a3aa74fb89ed4..6b0638ace7cc74f5d99d037b3bf8db8f97c6e780 100644 (file)
--- a/plugins/personal/connectivity/class_intranetAccount.inc
+++ b/plugins/personal/connectivity/class_intranetAccount.inc
@@ -96,7 +96,9 @@ class intranetAccount extends plugin
                  $ldap->cd($this->dn);
                  @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
                                  $this->attributes, "Save");
-                 $ldap->modify($this->attrs);
+                 $this->cleanup();
+$ldap->modify ($this->attrs); 
+
                  show_ldap_error($ldap->get_error());
 
                  /* Optionally execute a command after we're done */
@@ -149,7 +151,9 @@ class intranetAccount extends plugin
                  /* Write back to ldap */
                  $ldap= $this->config->get_ldap_link();
                  $ldap->cd($this->dn);
-                 $ldap->modify($this->attrs);
+                 $this->cleanup();
+$ldap->modify ($this->attrs); 
+
                  show_ldap_error($ldap->get_error());
 
                  /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 7596ec118580cf4af6382610259cec1b9a9a6f1e..3f9e952d63e37ce17fe8d7c0e716fc29f13ef551 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -318,7 +318,9 @@ class kolabAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index e88ac8fd81335571202ba5e8a79bd0df689abd0c..317506027c0dbb300b15c25635ebd5ba33e665e0 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -719,7 +719,9 @@ class oxchangeAccount extends plugin
     $ldap->cd($this->dn);
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
     /* Optionally execute a command after we're done */
     $this->postremove();
@@ -804,7 +806,9 @@ class oxchangeAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 4e79a2f12b9a2b518a0c7834b88b431baa5892c2..2bc1a0c67a3ecc98223858dfb028b103bfa64971 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -66,7 +66,9 @@ class phpgwAccount extends plugin
       $ldap->cd($this->dn);
       @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
           $this->attributes, "Save");
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */
@@ -107,7 +109,9 @@ class phpgwAccount extends plugin
       /* Write back to ldap */
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
index 775773261726530cfb4b912bdafb21bbf6bb7d25..5f1e60ffb2e925a2b75be03d7320eaae6448c80e 100644 (file)
--- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc
+++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc
@@ -78,7 +78,9 @@ class phpscheduleitAccount extends plugin
     $ldap->cd($this->dn);
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -117,7 +119,9 @@ class phpscheduleitAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 6e1076dacef2c9defe7f3a05e345ae18f216fedc..c7ed311e85213813ea2ee0acfab60c7822dbf74d 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -78,7 +78,9 @@ class pptpAccount extends plugin
       $ldap->cd($this->dn);
       @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
           $this->attributes, "Save");
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */
@@ -119,7 +121,9 @@ class pptpAccount extends plugin
       /* Write back to ldap */
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index bc50bb78e2fd46cf397e996f61c151a5e2fa98ba..1c2596582ec66e285f201a3e98140bc11d387de0 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -150,7 +150,9 @@ class proxyAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -253,7 +255,9 @@ class proxyAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
 
     show_ldap_error($ldap->get_error());
 

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index bd996fbf94acad004e39a4ef37e48166389d668c..733428ac7774c77f6aa049e4ecb4b5de06da153e 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -90,7 +90,9 @@ class pureftpdAccount extends plugin
     $ldap->cd($this->dn);
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -166,7 +168,9 @@ class pureftpdAccount extends plugin
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index c917e2bd6d3aa6eed323142cdbacd66e37c71e47..7ea80d9657e04a4944d31ec737e25cdd39db49b9 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -62,7 +62,9 @@ class webdavAccount extends plugin
       $ldap->cd($this->dn);
       @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
           $this->attributes, "Save");
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */
@@ -103,7 +105,9 @@ class webdavAccount extends plugin
       /* Write back to ldap */
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+$ldap->modify ($this->attrs); 
+
       show_ldap_error($ldap->get_error());
 
       /* Optionally execute a command after we're done */

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 059b35c20859f9bcb51100c4108e58d9e94e036d..3c97e19a68e9332f3bae7a606594e429bad10162 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -686,7 +686,9 @@ class environment extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,$this->attributes, "Save");
 
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
 
     show_ldap_error($ldap->get_error());
 
@@ -875,7 +877,9 @@ class environment extends plugin
       /* Save changes */
       $ldap->cd($attr['dn']);
       unset($attr['dn']);
-      $ldap->modify($attr);
+      $this->cleanup();
+$ldap->modify ($attr); 
+
       if($ldap->get_error()!="Success"){
         print_red(_("Error while writing printer")." : ".$ldap->get_error());
       }
@@ -945,7 +949,9 @@ class environment extends plugin
 
       $ldap->cd($attrs['dn']);
       unset($attrs['dn']);
-      $ldap->modify($attrs);
+      $this->cleanup();
+$ldap->modify ($attrs); 
+
       if($ldap->get_error()!="Success"){
         print_red(_("Error while writing printer settings")." : ".$ldap->get_error());
       }

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 1f02e8c1e2eebe74b42d94001f7b242caccd32fb..25e866bc9960aeddee318f0dd3dade8bc6c9b4f5 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -555,7 +555,9 @@ class mailAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Connect to IMAP server for account deletion */
@@ -654,7 +656,9 @@ class mailAccount extends plugin
 
     /* Save data to LDAP */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Only do IMAP actions if we are not a template */

diff --git a/plugins/personal/nagios/class_nagiosAccount.inc b/plugins/personal/nagios/class_nagiosAccount.inc
index 9465e97e73245e331f49da1e13051e0c5de28f87..ba64598dc4fd215fa2b5b43f658ba3387d6bb05b 100644 (file)
--- a/plugins/personal/nagios/class_nagiosAccount.inc
+++ b/plugins/personal/nagios/class_nagiosAccount.inc
@@ -141,7 +141,9 @@ class nagiosAccount extends plugin
 
     /* Write back to ldap */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -216,7 +218,9 @@ class nagiosAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* remove the entry from LDAP */

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index ca2dcb5e49fd7ed37e1a0ee4deb1bc6c5c220679..5ae6f0dddfa91cc6dfe99966d7320419e403c4a6 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -595,7 +595,9 @@ class posixAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Delete group only if cn is uid and there are no other
@@ -807,7 +809,9 @@ class posixAccount extends plugin
 
     /* Save data to LDAP */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Remove lock needed for unique id generation */

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 5a8cab0553bf96f3c0bcf3134501d9c24a8875b7..d0032add21f8c32333c30c973b223a591f338bd1 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -619,7 +619,9 @@ class sambaAccount extends plugin
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */
@@ -963,7 +965,9 @@ class sambaAccount extends plugin
 
     /* Write back to ldap */
     $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
+    $this->cleanup();
+$ldap->modify ($this->attrs); 
+
     show_ldap_error($ldap->get_error());
 
     /* Optionally execute a command after we're done */