Fixed locking problems, we couldn´t edit anyway if an entry was locked.

[gosa.git] / gosa-plugins / goto / admin / applications / main.inc

diff --git a/gosa-plugins/goto/admin/applications/main.inc b/gosa-plugins/goto/admin/applications/main.inc
index f8233b272f252028ee8678a5dbf49d9b19784cb7..73fc090ade594faaa4ec615589056c3936b9196d 100644 (file)
--- a/gosa-plugins/goto/admin/applications/main.inc
+++ b/gosa-plugins/goto/admin/applications/main.inc
@@ -1,53 +1,56 @@
 <?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: main.inc 14740 2009-11-04 09:41:16Z hickert $$
+ *
+ * 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('applicationManagement')){
-                $applicationManagement = session::get('applicationManagement');
-                $applicationManagement->remove_lock();
-                session::un_set ('applicationManagement');
-        }
-} else {
-       /* Create applicationManagement object on demand */
-       if (!session::is_set('applicationManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-               session::set('applicationManagement',new applicationManagement ($config, $ui));
-       }
-       $applicationManagement = session::get('applicationManagement');
-       $applicationManagement->save_object();
-       $output= $applicationManagement->execute();
-
-       /* Page header*/
-       if (session::is_set('objectinfo')){
-               $display= print_header(get_template_path($applicationManagement->plIcon), _("Application 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($applicationManagement->plIcon), _("Application management"));
-       }
-
-       /* Reset requested? */
-       if (isset($_GET['reset']) && $_GET['reset'] == 1){
-               session::un_set ('applicationManagement');
-       }
+    if(session::is_set('applicationManagement')){
+        $macl = session::get('applicationManagement');
+        $macl->remove_lock();
+    }
+}
 
-       /* Show and save dialog */
-       $display.= $output;
-       session::set('applicationManagement',$applicationManagement);
+/* Remove this plugin from session
+ */
+if ( $cleanup ){
+    session::un_set('applicationManagement');
+}else{
+
+    /* Create applicationmanagement object on demand */
+    if (!session::is_set('applicationManagement')){
+        $applicationManagement= new applicationManagement ($config, $ui);
+        session::set('applicationManagement',$applicationManagement);
+    }
+    $applicationManagement = session::get('applicationManagement');
+    $display= $applicationManagement->execute();
+
+    /* Reset requested? */
+    if (isset($_GET['reset']) && $_GET['reset'] == 1){
+        session::un_set ('applicationManagement');
+    }
+
+    /* Show and save dialog */
+    session::set('applicationManagement',$applicationManagement);
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>