Make things a little bit more simple in lib/ldap/change_attrs.php3

diff --git a/Changelog b/Changelog
index 99da66ba235497923132df9b6c75000c7cf50149..11cfc3dcd5576ce11d65c90faa95a97f2cc07cce 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -29,6 +29,7 @@ Ver 1.62:
 * Add debug statements in the pg driver
 * In debug, output the sql queries in italic. Refer to enabling debugging in the FAQ
 * Don't include user_info.php3 in the user_test page.
+* Make things a little bit more simple in lib/ldap/change_attrs.php3
 Ver 1.61:
 * Add a string encoder for greek
 * If general_decode_normal_attributes is set then encode attributes in lib/ldap/change_info. In the near future

diff --git a/lib/ldap/change_attrs.php3 b/lib/ldap/change_attrs.php3
index 9e149458ace4c552986bb2679a416b02f4423be8..60b2f57ac67bff1637524a5c15e17b0cca5f6ec8 100644 (file)
--- a/lib/ldap/change_attrs.php3
+++ b/lib/ldap/change_attrs.php3
@@ -44,7 +44,7 @@ require_once('../lib/ldap/functions.php3');
 //
                                        else{
                                                if (isset($item_vals["$key"][$j])){
-                                                       $mod[$attrmap["$key"]][] = $item_vals["$key"][$j];
+                                                       $del[$attrmap["$key"]][] = $item_vals["$key"][$j];
                                                        $add_r[$attrmap["$key"]][] = $val;
                                                }
                                                else{
@@ -53,14 +53,14 @@ require_once('../lib/ldap/functions.php3');
                                        }
                                }
                        }
-                       if (isset($mod)){
+                       if (isset($del)){
                               if ($config[ldap_debug] == 'true'){
                                        print "<b>DEBUG(LDAP): ldap_mod_del(): DN='$dn'</b><br>\n";
                                        print "<b>DEBUG(LDAP): ldap_mod_del(): Data:";
-                                       print_r($mod);
+                                       print_r($del);
                                        print "</b><br>\n";
                                }
-                               @ldap_mod_del($ds,$dn,$mod);
+                               @ldap_mod_del($ds,$dn,$del);
                        }
                        if (isset($add_r)){
                               if ($config[ldap_debug] == 'true'){
@@ -71,15 +71,6 @@ require_once('../lib/ldap/functions.php3');
                                }
                                @ldap_mod_add($ds,$dn,$add_r);
                        }
-                       if (isset($del)){
-                              if ($config[ldap_debug] == 'true'){
-                                       print "<b>DEBUG(LDAP): ldap_mod_replace(): DN='$dn'</b><br>\n";
-                                       print "<b>DEBUG(LDAP): ldap_mod_replace(): Data:";
-                                       print_r($del);
-                                       print "</b><br>\n";
-                               }
-                               @ldap_mod_del($ds,$dn,$del);
-                       }
                }
                if (@ldap_error($ds) == 'Success')
                        echo "<b>The changes were successfully commited to the directory</b><br>\n";