X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fmain.inc;h=ce28ef5745810f7a3476926769e5a0bb312058d5;hb=fd502045bc521d9a1f93b681f06ce3fd8160bf5b;hp=ab7f48e363c31e396ab5f61574b07d72114f2ab4;hpb=42219fa478e91ed1ba3d6b41c9b7988bcb4ec66f;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc
index ab7f48e36..ce28ef574 100644
--- a/gosa-core/plugins/admin/users/main.inc
+++ b/gosa-core/plugins/admin/users/main.inc
@@ -1,61 +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('userManagement')){
-    $userManagement = session::get('userManagement');
-    $userManagement->remove_lock();
-    del_lock ($ui->dn);
-    sess_del ('userManagement');
+      $macl = session::get('userManagement');
+      $macl->remove_lock();
   }
-} else {
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('userManagement');
+}else{
+
   /* Create usermanagement object on demand */
-  if (!session::is_set('userManagement') ||
-     (isset($_GET['reset']) && $_GET['reset'] == 1)){
-    $userManagement= new userManagement ($config, session::get('ui'));
-    $userManagement->set_acl_category("users");
+  if (!session::is_set('userManagement')){
+    $userManagement= new userManagement ($config, $ui);
     session::set('userManagement',$userManagement);
   }
   $userManagement = session::get('userManagement');
-  $userManagement->save_object();
-  $output= $userManagement->execute();
-
-  /* Page header*/
-  if (session::is_set('objectinfo')){
-    $display= print_header(get_template_path('images/user.png'),
-                           _("User administration"),
-                           "<img alt=\"\" class=\"center\" src=\"".
-                           get_template_path('images/closedlock.png').
-                           "\"> ".@LDAP::fix(session::get('objectinfo')));
-  } else {
-    $display= print_header(get_template_path('images/user.png'),
-                          _("User administration"));
-  }
-
-  /* Generate dialog output */
-  $display.= $output;
+  $display= $userManagement->execute();
 
   /* Reset requested? */
   if (isset($_GET['reset']) && $_GET['reset'] == 1){
-    del_lock ($ui->dn);
-    sess_del ('userManagement');
+    session::un_set ('userManagement');
   }
 
   /* Show and save dialog */