X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fdepartments%2Fmain.inc;h=da3b8bd15de6b220faae9c3addc6dfbc44994176;hb=0a4b05f6f0e6c2a8238e003baa7398024af44851;hp=290c67df10f611f20315f7defa5c9cdde27393bc;hpb=049d82cc1f343b829bcfdcb751a0b2222d3d7f15;p=gosa.git

diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc
index 290c67df1..da3b8bd15 100644
--- a/gosa-core/plugins/admin/departments/main.inc
+++ b/gosa-core/plugins/admin/departments/main.inc
@@ -20,39 +20,37 @@
  * 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('department')){
-                $department = session::get('department');
-                $department->remove_lock();
-                session::un_set ('department');
-        }
-} else {
-	/* Create usermanagement object on demand */
-	if (!session::is_set('department') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-		session::set('department',new departmentManagement($config, $ui));
-	}
-	$department = session::get('department');
-	
-	/* Show and save dialog */
-	$department->save_object();
-	$output= $department->execute();
+  if(session::is_set('departmentManagement')){
+      $macl = session::get('departmentManagement');
+      $macl->remove_lock();
+  }
+}
+
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('departmentManagement');
+}else{
 
-	/* Page header*/
-	if (session::is_set('objectinfo')){
-		$display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/locked.png')."\"> ".LDAP::fix(session::get('objectinfo')));
-	} else {
-		$display= print_header(get_template_path('plugins/departments/images/plugin.png'), _("Department management"));
-	}
+  /* Create usermanagement object on demand */
+  if (!session::is_set('departmentManagement')){
+    $departmentManagement= new departmentManagement ($config, $ui);
+    session::set('departmentManagement',$departmentManagement);
+  }
+  $departmentManagement = session::get('departmentManagement');
+  $display= $departmentManagement->execute();
 
-	/* Reset requested? */
-	if (isset($_GET['reset']) && $_GET['reset'] == 1){
-		del_lock ($ui->dn);
-		session::un_set ('department');
-	}
+  /* Reset requested? */
+  if (isset($_GET['reset']) && $_GET['reset'] == 1){
+    session::un_set ('departmentManagement');
+  }
 
-	$display.= $output;
-	session::set('department',$department);
-	$config = $department->config;
+  /* Show and save dialog */
+  session::set('departmentManagement',$departmentManagement);
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>