X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fmain.inc;h=54f7ea3f468560b8301ae146b01ab57ef695ff18;hb=ed78890a0b417c288d33f20487d35b57223451ff;hp=5cb881575c7b04a137f11501f3184e9a78c0967c;hpb=dc7547fdb80a615660085bd6fa7d168c727a59b6;p=gosa.git

diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index 5cb881575..54f7ea3f4 100644
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -20,32 +20,28 @@
  * 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('groupManagement')){
-    $groupManagement = session::get('groupManagement');
-    $groupManagement->remove_lock();
-    session::un_set ('groupManagement');
-  }
-} else {
-  /* Create groupManagement object on demand */
-  if (!session::is_set('groupManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    session::set('groupManagement',new groupManagement ($config, $ui));
+      $macl = session::get('groupManagement');
+      $macl->remove_lock();
   }
-  $groupManagement = session::get('groupManagement');
-  $groupManagement->save_object();
-  $output= $groupManagement->execute();
+}
 
-  /* Page header*/
-  if (get_object_info() != ""){
-    $display= print_header(get_template_path('plugins/groups/images/plugin.png'),
-                           _("Group administration"), "<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/groups/images/plugin.png'), _("Group administration"));
-  }
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('groupManagement');
+}else{
 
-  $display.= $output;
+  /* Create groupmanagement object on demand */
+  if (!session::is_set('groupManagement')){
+    $groupManagement= new groupManagement ($config, $ui);
+    session::set('groupManagement',$groupManagement);
+  }
+  $groupManagement = session::get('groupManagement');
+  $display= $groupManagement->execute();
 
   /* Reset requested? */
   if (isset($_GET['reset']) && $_GET['reset'] == 1){