Unified unlocking of plugins (main.inc)

[gosa.git] / gosa-core / plugins / admin / acl / main.inc

diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc
index edfd23da33783036af3e85b96ff006f1acb4d5e9..8f55ab8400c5c1796571450d577e5842e578097e 100644 (file)
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -20,23 +20,25 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* Remove classes and variables from session
- */
-if ( $cleanup ){
-  session::un_set('macl');
+/* Remove locks created by this plugin
+*/
+if ($remove_lock){
+  if(session::is_set('macl')){
+         $macl = session::get('macl');
+         $macl->remove_lock();
+  }
 }
 
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('macl');
+}else{
 
-if ($remove_lock){
-        if(session::is_set('macl')){
-                $macl = session::get('macl');
-                $macl->remove_lock();
-        }
-} else {
        $display= "No headpage yet for this module";
 
        /* Create usermanagement object on demand */
-if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+       if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
                session::set('macl',new aclManagement($config, $ui));
        }
        $macl = session::get('macl');