Fixed hotplug device handling

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

diff --git a/gosa-plugins/goto/admin/devices/main.inc b/gosa-plugins/goto/admin/devices/main.inc
index 33f84118a824505869b449d0fd75d98f18f3f36e..d02004e449c545ccb3aca79ec26229d0f4f312ee 100644 (file)
--- a/gosa-plugins/goto/admin/devices/main.inc
+++ b/gosa-plugins/goto/admin/devices/main.inc
@@ -1,57 +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('DeviceManagement')){
-                               $DeviceManagement = session::get('DeviceManagement');
-                               $DeviceManagement->remove_lock();
-                               del_lock ($ui->dn);
-                               session::un_set ('DeviceManagement');
-               }
-} else {
-
-               /* Create DeviceManagement object on demand */
-               if (!session::is_set('DeviceManagement') || (isset($_GET['reset']) && $_GET['reset'] == 1)){
-                       session::set('DeviceManagement',new deviceManagement ($config));
-               }
-
-               /* Get object */
-               $DeviceManagement = session::get('DeviceManagement');
-               $DeviceManagement->save_object();
-               $output= $DeviceManagement->execute();
-
-               /* Page header*/
-               if (session::is_set('objectinfo')){
-                               $display= print_header(get_template_path('images/devices.png'), _("Hotplug device management"), "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".@LDAP::fix(session::get('objectinfo')));
-               } else {
-                               $display= print_header(get_template_path('images/devices.png'), _("Hotplug device management"));
-               }
-
-               /* Reset requested? */
-               if (isset($_GET['reset']) && $_GET['reset'] == 1){
-                               del_lock ($ui->dn);
-                               session::un_set ('DeviceManagement');
-               }
+  if(session::is_set('deviceManagement')){
+      $macl = session::get('deviceManagement');
+      $macl->remove_lock();
+  }
+}
 
-               /* Show and save dialog */
-               $display.= $output;
-               session::set('DeviceManagement',$DeviceManagement);
+/* Remove this plugin from session
+*/
+if ( $cleanup ){
+  session::un_set('deviceManagement');
+}else{
+
+  /* Create devicemanagement object on demand */
+  if (!session::is_set('deviceManagement')){
+    $deviceManagement= new deviceManagement ($config, $ui);
+    session::set('deviceManagement',$deviceManagement);
+  }
+  $deviceManagement = session::get('deviceManagement');
+  $display= $deviceManagement->execute();
+
+  /* Reset requested? */
+  if (isset($_GET['reset']) && $_GET['reset'] == 1){
+    session::un_set ('deviceManagement');
+  }
+
+  /* Show and save dialog */
+  session::set('deviceManagement',$deviceManagement);
 }
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>