X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fdepartments%2Fmain.inc;h=a59ca99a96ea470d3ec9555a4bceea884a340002;hb=bd9a633e2b1cee9f73ce1fcc3ca78d1438f891f8;hp=2d8a82dcb02676445767ee597aa00f13b3848b0c;hpb=7692f34a23250aa815f368cc9cd17064cf0af141;p=gosa.git

diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc
index 2d8a82dcb..a59ca99a9 100644
--- a/gosa-core/plugins/admin/departments/main.inc
+++ b/gosa-core/plugins/admin/departments/main.inc
@@ -20,40 +20,38 @@
  * 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();
-                del_lock ($ui->dn);
-                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();
+        session::un_set('departmentManagement');
+    }
+}
+
+/* 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('images/department.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('images/department.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:
 ?>