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 f9dddcc165e6a2132006f2f2ab9191ba753bec73..8f55ab8400c5c1796571450d577e5842e578097e 100644 (file)
--- a/gosa-core/plugins/admin/acl/main.inc
+++ b/gosa-core/plugins/admin/acl/main.inc
@@ -20,18 +20,25 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/* Remove locks created by this plugin
+*/
 if ($remove_lock){
-        if(session::is_set('macl')){
-                $macl = session::get('macl');
-                $macl->remove_lock();
-                del_lock ($ui->dn);
-                session::un_set ('macl');
-        }
-} else {
+  if(session::is_set('macl')){
+         $macl = session::get('macl');
+         $macl->remove_lock();
+  }
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('macl');
+}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');
@@ -41,15 +48,14 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
        $output= $macl->execute();
 
        /* Page header*/
-       if (session::is_set('objectinfo')){
-               $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
+       if (get_object_info() != ""){
+               $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(get_object_info()));
        } else {
                $display= print_header(get_template_path('plugins/acl/images/plugin.png'), _("ACL management"));
        }
 
        /* Reset requested? */
        if (isset($_GET['reset']) && $_GET['reset'] == 1){
-               del_lock ($ui->dn);
                session::un_set ('macl');
        }