X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fmain.inc;h=54f7ea3f468560b8301ae146b01ab57ef695ff18;hb=f2252a43aabe07717022b5154bfe5c348e29d250;hp=23976c113607bad8b61f5f043046d9aa716949c3;hpb=1e73841b2c486817aeb75934af3496b8bfd7a184;p=gosa.git

diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc
index 23976c113..54f7ea3f4 100644
--- a/gosa-core/plugins/admin/groups/main.inc
+++ b/gosa-core/plugins/admin/groups/main.inc
@@ -1,55 +1,51 @@
 <?php
 /*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2003  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * 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();
-    del_lock ($ui->dn);
-    sess_del ('groupManagement');
+      $macl = session::get('groupManagement');
+      $macl->remove_lock();
   }
-} else {
-  /* Create groupManagement object on demand */
-  if (!session::is_set('groupManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    $_SESSION['groupManagement']= new groupManagement ($config, $_SESSION['ui']);
-  }
-  $groupManagement = session::get('groupManagement');
-  $groupManagement->save_object();
-  $output= $groupManagement->execute();
+}
 
-  /* Page header*/
-  if (session::is_set('objectinfo')){
-    $display= print_header(get_template_path('images/group.png'),
-                           _("Group administration"), "<img alt=\"\" align=\"middle\" src=\"".
-                            get_template_path('images/closedlock.png')."\"> ".
-                            @LDAP::fix(session::get('objectinfo')));
-  } else {
-    $display= print_header(get_template_path('images/group.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){
-    del_lock ($ui->dn);
-    sess_del ('groupManagement');
+    session::un_set ('groupManagement');
   }
 
   /* Show and save dialog */