Fixed locking

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

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 2a79cf9b64e7c4d045d127ee380c527c59db16f4..ff480bea78b3e5365e3b03679a7377afa3b95b1a 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -345,10 +345,24 @@ class userManagement extends plugin
           }
           /* Remove lock file after successfull deletion */
           del_lock ($dn);
+          unset($this->dns[$key]);
       }
     }
 
 
+    /********************
+      Delete MULTIPLE entries Canceled 
+     ********************/
+
+    /* Remove lock */
+    if(isset($_POST['delete_multiple_user_cancel'])){
+      foreach($this->dns as $key => $dn){
+        del_lock ($dn);
+        unset($this->dns[$key]);
+      }
+    }
+  
+
     /********************
       Delete entry requested, display confirm dialog
      ********************/

diff --git a/plugins/admin/users/remove.tpl b/plugins/admin/users/remove.tpl
index eb78a09b344cce495988267827d908e46a26e7a0..eb414716654e77f8ed0224cf391ed06ed1d6bc93 100644 (file)
--- a/plugins/admin/users/remove.tpl
+++ b/plugins/admin/users/remove.tpl
@@ -13,10 +13,11 @@
 <p class="plugbottom">
   {if $multiple}
   <input type=submit name="delete_multiple_user_confirm" value="{t}Delete{/t}">
+  <input type=submit name="delete_multiple_user_cancel" value="{t}Cancel{/t}">
   {else}
   <input type=submit name="delete_user_confirm" value="{t}Delete{/t}">
+  <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
   {/if}
   &nbsp;
-  <input type=submit name="delete_cancel" value="{t}Cancel{/t}">
 </p>