Reset array of dns to delete, before adding new dns

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

diff --git a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
index 9d216aa6a555f8d6ac43ce58ab259e00cf4a93bf..9560b34a3de0954b42c3e8785d735640f8c3a512 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
@@ -4,8 +4,8 @@ class deviceManagement extends plugin
 {
 
   /* Definitions */
-  var $plHeadline     = "Devices";
-  var $plDescription  = "Manage devices";
+  var $plHeadline     = "Hotplug devices";
+  var $plDescription  = "Manage hotplug devices";
 
   /* Dialog attributes */
   var $ui                             = NULL;
@@ -16,6 +16,7 @@ class deviceManagement extends plugin
   var $CopyPasteHandler               = NULL;
   var $start_pasting_copied_objects;
   var $dn ="";
+  var $dns = array();
 
   function deviceManagement(&$config, $dn= NULL)
   {
@@ -43,7 +44,7 @@ class deviceManagement extends plugin
 
     /* These vars will be stored if you try to open a locked device,
         to be able to perform your last requests after showing a warning message */
-    session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^device_edit_/",
+    session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^device_edit_/","/^menu_action/",
                                           "/^device_del_/","/^item_selected/","/^remove_multiple_devices/"));
 
     $smarty       = get_smarty();             // Smarty instance
@@ -143,8 +144,7 @@ class deviceManagement extends plugin
 
     /* Cancel dialogs */
     if (isset($_POST['edit_cancel']) && is_object($this->devicetabs)){
-      del_lock ($this->devicetabs->dn);
-      unset ($this->devicetabs);
+      $this->remove_lock();
       $this->devicetabs= NULL;
       session::un_set('objectinfo');
     }
@@ -166,17 +166,23 @@ class deviceManagement extends plugin
       if (count($message) == 0){
 
         /* Save data data to ldap */
-#        $this->devicetabs->set_release($this->DivListDevices->selectedRelease);
         $this->devicetabs->save();
 
         if (!isset($_POST['edit_apply'])){
+
           /* device type has been saved successfully, remove lock from LDAP. */
           if ($this->dn != "new"){
-            del_lock ($this->dn);
+            $this->remove_lock();
           }
           unset ($this->devicetabs);
           $this->devicetabs= NULL;
           session::un_set('objectinfo');
+        }else{
+
+          /* Reinitialize tab */
+          if($this->devicetabs instanceof tabs){
+            $this->devicetabs->re_init();
+          }
         }
       } else {
        /* Ok. There seem to be errors regarding to the tab data,
@@ -222,19 +228,22 @@ class deviceManagement extends plugin
 
       if(count($ids)){
 
+        /* collect entries */
+        $this->dns = array();
         foreach($ids as $id){
-          $dn = $this->devices[$id]['dn'];
-          if (($user= get_lock($dn)) != ""){
-            return(gen_locked_message ($user, $dn));
-          }
-          $this->dns[$id] = $dn;
+          $this->dns[$id] = $this->devices[$id]['dn'];
+        }
+
+        /* Check locks */
+        if ($user= get_multiple_locks($this->dns)){
+          return(gen_locked_message($user,$this->dns));
         }
 
         $dns_names = array();
         foreach($this->dns as $dn){
-          add_lock ($dn, $this->ui->dn);
           $dns_names[] =@LDAP::fix($dn);
         }
+        add_lock ($this->dns, $this->ui->dn);
 
         /* Lock the current entry, so nobody will edit it during deletion */
         $smarty->assign("intro", msgPool::deleteInfo($dns_names),_("device"));
@@ -272,10 +281,11 @@ class deviceManagement extends plugin
           msg_dialog::display(_("Permission error"), msgPool::permDelete(), INFO_DIALOG);
           new log("security","devices/".get_class($this),$dn,array(),"Tried to trick deletion.");
         }
-        /* Remove lock file after successfull deletion */
-        del_lock ($dn);
-        unset($this->dns[$key]);
       }
+
+      /* Remove lock file after successfull deletion */
+      $this->remove_lock();
+      $this->dns = array();
     }
 
 
@@ -285,10 +295,10 @@ class deviceManagement extends plugin
 
     /* Remove lock */
     if(isset($_POST['delete_multiple_device_cancel'])){
-      foreach($this->dns as $key => $dn){
-        del_lock ($dn);
-        unset($this->dns[$key]);
-      }
+
+      /* Remove lock file after successfull deletion */
+      $this->remove_lock();
+      $this->dns = array();
     }
 
 
@@ -358,7 +368,8 @@ class deviceManagement extends plugin
       }
 
       /* Remove lock file after successfull deletion */
-      del_lock ($this->dn);
+      $this->remove_lock();
+      $this->dns = array();
     }
 
 
@@ -368,9 +379,9 @@ class deviceManagement extends plugin
 
     /* Delete device canceled? */
     if (isset($_POST['delete_cancel'])){
-      del_lock ($this->dn);
+      $this->remove_lock();
       session::un_set('objectinfo');
-  }
+    }
 
     /* Show tab dialog if object is present */
     if (($this->devicetabs) && (isset($this->devicetabs->config))){
@@ -414,6 +425,9 @@ class deviceManagement extends plugin
 
   function save_object() {
     $this->DivListDevices->save_object();
+    if(is_object($this->CopyPasteHandler)){
+      $this->CopyPasteHandler->save_object();
+    }
   }
 
 
@@ -503,9 +517,15 @@ class deviceManagement extends plugin
     }
 
     /* Get results and create index */
-    $res= get_sub_list($Filter,"devices",get_ou('deviceou'), $base, array("cn","description","dn","objectClass"), $Flags);
+    $res= get_sub_list($Filter,"devices",get_ou('deviceou'), $base, array("cn","gotoHotplugDevice","description","dn","objectClass"), $Flags);
     $tmp2 = array();
     foreach ($res as $val){
+      if (!isset($val['description']) && isset($val['gotoHotplugDevice'][0])) {
+        $dsc= preg_replace("/\|.*$/", "", $val['gotoHotplugDevice'][0]);
+        if ($dsc != ""){
+          $val['description']= array("count" => 1, 0 => $dsc);
+        }
+      }
       $tmp2[strtolower($val['cn'][0]).$val['cn'][0].$val['dn']] = strtolower($val['cn'][0]).$val['cn'][0].$val['dn'];
       $tmp[strtolower($val['cn'][0]).$val['cn'][0].$val['dn']]=$val;
     }
@@ -522,8 +542,11 @@ class deviceManagement extends plugin
 
   function remove_lock()
   {
-    if (isset($this->devicetabs->dn)){
-      del_lock ($this->devicetabs->dn);
+    if (isset($this->dn) && !empty($this->dn)){
+      del_lock ($this->dn);
+    }
+    if(isset($this->dns) && is_array($this->dns) && count($this->dns)){
+      del_lock ($this->dns);
     }
   }