Replaced in_array calls for gosa-plugins

[gosa.git] / gosa-plugins / fai / admin / fai / class_faiPartitionTable.inc

diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index f21e5e0127cc082ed513c5b68676dd8e2683fcb2..9ed849507a86cef41340c67ce77f003287dfcf89 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
@@ -181,7 +181,7 @@ class faiPartitionTable extends plugin
 
     /* New Listhandling */
     foreach($_POST as $name => $value){
-      if(preg_match("/^edit_[^_]*_/",$name)){
+      if(preg_match("/^edit_[^_]*_[xy]$/",$name)){
         $s_entry = preg_replace("/^edit_/","",$name);
         $s_entry = base64_decode(preg_replace("/_.*/","",$s_entry));
         $s_action = "edit"; 
@@ -217,7 +217,7 @@ class faiPartitionTable extends plugin
             }
             foreach($disk['partitions'] as $partkey => $part){
               if($disk['FAIdiskType'] == "raid"){
-                foreach(split(",",$part['FAIpartitionSize']) as $partname){
+                foreach(explode(",",$part['FAIpartitionSize']) as $partname){
                   $list[preg_replace("/:.*$/","",$partname)][] = $disk;
                 }
               }
@@ -270,7 +270,7 @@ class faiPartitionTable extends plugin
       if(isset($this->disks[$s_entry]['FAIdiskType'])){
         $type = $this->disks[$s_entry]['FAIdiskType'];
       }
-      if(in_array($type,array('raid','lvm','disk'))){
+      if(in_array_strict($type,array('raid','lvm','disk'))){
         $this->dialog = new faiDiskEntry(
             $this->config,$this->dn,$this,$this->disks[$s_entry], 
             $this->disks[$s_entry]['FAIdiskType']); 
@@ -554,7 +554,11 @@ class faiPartitionTable extends plugin
         if($disk['status'] == "new"){
           if(isset($disk_attrs[$attr])) unset($disk_attrs[$attr]);
           if(isset($disk[$attr]) && !empty($disk[$attr])){
-            $disk_attrs[$attr] = $disk[$attr];
+            if(is_array($disk[$attr])){
+              $disk_attrs[$attr] = array_values($disk[$attr]);
+            }else{
+              $disk_attrs[$attr] = $disk[$attr];
+            }
           }
         }else{
           if(isset($disk[$attr]) && !empty($disk[$attr])){
@@ -763,37 +767,13 @@ class faiPartitionTable extends plugin
 
     /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry)
      */
-    $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=FAIpartitionDisk))");
-    foreach($res as $obj){
 
-      /* Skip not relevant objects */
-      if(!preg_match("/".preg_quote($source['dn'], '/')."$/i",$obj['dn'])) continue;
-
-      $objects = array();
-      $objects['description']  = "";
-      $objects['dn']          = $obj['dn'];
-      $objects                = $this->get_object_attributes($objects,$this->subAttributes);
-      $this->disks[$objects['cn']] = $objects;
-      $this->disks[$objects['cn']]['partitions'] = array();
-    }
-
-    /* read all partitions for each disk
+    /* To be sure to copy disks and partitions correctly, just create a 
+     *  new PartitionTable object and use the 'disks' attribute 
+     *  from this it. This is much easier and less code.
      */
-    foreach($this->disks as $name => $disk){
-      $res = FAI::get_all_objects_for_given_base($disk['dn'],"(&(objectClass=FAIclass)(objectClass=FAIpartitionEntry))");
-      foreach($res as $obj){
-
-        /* Skip not relevant objects */
-        if(!preg_match("/".preg_quote($disk['dn'], '/')."$/i",$obj['dn'])) continue;
-
-        $objects = array();
-        $objects['dn']          = $obj['dn'];
-        $objects                = $this->get_object_attributes($objects,$this->subPartAttributes);
-        unset($objects['dn']);;
-        $this->disks[$name]['partitions'][$objects['FAIpartitionNr']] = $objects;
-      }
-    }
-    ksort($this->disks);
+    $obj = new faiPartitionTable($this->config, $source['dn']);
+    $this->disks = $obj->disks;
   }