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

diff --git a/gosa-core/plugins/admin/users/main.inc b/gosa-core/plugins/admin/users/main.inc
index f54272c9b..ce28ef574 100644
--- a/gosa-core/plugins/admin/users/main.inc
+++ b/gosa-core/plugins/admin/users/main.inc
@@ -20,43 +20,31 @@
  * 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);
-    session::un_set ('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)){
+  if (!session::is_set('userManagement')){
     $userManagement= new userManagement ($config, $ui);
-    $userManagement->set_acl_category("users");
     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);
     session::un_set ('userManagement');
   }