From c9076d94e73be7e786ee9897fb0785a5b94c074c Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 13 Sep 2010 13:39:05 +0000 Subject: [PATCH] fixed plugin handling in case of GET_[reset] git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19634 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/ogroups/main.inc | 41 ++++++++++++------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc index e8df9c6bb..44d8f60c2 100644 --- a/gosa-core/plugins/admin/ogroups/main.inc +++ b/gosa-core/plugins/admin/ogroups/main.inc @@ -21,35 +21,36 @@ */ /* Remove locks created by this plugin -*/ + */ if ($remove_lock){ - if(session::is_set('ogroupManagement')){ - $macl = session::get('ogroupManagement'); - $macl->remove_lock(); - } + if(session::is_set('ogroupManagement')){ + $macl = session::get('ogroupManagement'); + $macl->remove_lock(); + session::un_set('ogroupManagement'); + } } /* Remove this plugin from session -*/ + */ if ( $cleanup ){ - session::un_set('ogroupManagement'); + session::un_set('ogroupManagement'); }else{ - /* Create ogroupmanagement object on demand */ - if (!session::is_set('ogroupManagement')){ - $ogroupManagement= new ogroupManagement ($config, $ui); - session::set('ogroupManagement',$ogroupManagement); - } - $ogroupManagement = session::get('ogroupManagement'); - $display= $ogroupManagement->execute(); + /* Create ogroupmanagement object on demand */ + if (!session::is_set('ogroupManagement')){ + $ogroupManagement= new ogroupManagement ($config, $ui); + session::set('ogroupManagement',$ogroupManagement); + } + $ogroupManagement = session::get('ogroupManagement'); + $display= $ogroupManagement->execute(); - /* Reset requested? */ - if (isset($_GET['reset']) && $_GET['reset'] == 1){ - session::un_set ('ogroupManagement'); - } + /* Reset requested? */ + if (isset($_GET['reset']) && $_GET['reset'] == 1){ + session::un_set ('ogroupManagement'); + } - /* Show and save dialog */ - session::set('ogroupManagement',$ogroupManagement); + /* Show and save dialog */ + session::set('ogroupManagement',$ogroupManagement); } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -- 2.30.2