More LDAP fixes
authorJamie Cameron <jcameron@webmin.com>
Fri, 28 Nov 2008 19:48:11 +0000 (19:48 +0000)
committerJamie Cameron <jcameron@webmin.com>
Fri, 28 Nov 2008 19:48:11 +0000 (19:48 +0000)
ldap-useradmin/mass_delete_user.cgi
ldap-useradmin/save_user.cgi

index 1223e9f..6e9b951 100755 (executable)
@@ -225,7 +225,9 @@ else {
                                if ($config{'imap_host'}) {
                                        print "$text{'udel_imap'}<br>\n";
                                        $imap = &imap_connect();
-                                       $rv = $imap->delete("user.".$user->{'user'});
+                                       $rv = $imap->delete("user".
+                                               $config{'imap_foldersep'}.
+                                               $user->{'user'});
                                        $imap->logout();
                                        print "$text{'udel_done'}<p>\n";
                                        }
index e383cc8..fba4a2c 100755 (executable)
@@ -117,7 +117,8 @@ elsif ($in{'delete'}) {
                  if ($config{'imap_host'}) {
                        print "$text{'udel_imap'}<br>\n";
                        $imap = &imap_connect();
-                       $rv = $imap->delete("user.".$uinfo->get_value("uid"));
+                       $rv = $imap->delete("user".$config{'imap_foldersep'}.
+                                           $uinfo->get_value("uid"));
                        $imap->logout();
                        print "$text{'udel_done'}<p>\n";
                        }