Apply patch for #3716

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

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index c8b0cdc1439f56f376be3c1fd7706b26773e2ae7..596e4ba0e3394c04f8849b3a26440e30bffcd2c8 100644 (file)
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
@@ -38,12 +38,8 @@ 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($this->dn,"(&(objectClass=FAIclass)(objectClass=FAIpartitionDisk))");
+      $res = FAI::get_leaf_objects($this->dn, $this->cn, "FAIpartitionDisk", get_ou('faiPartitionRDN'));
       foreach($res as $obj){
-
-        /* Skip not relevant objects */
-        if(!preg_match("/".preg_quote($this->dn, '/')."$/i",$obj['dn'])) continue;
-
         $objects = array();
         $objects['description']  = "";
         $objects['status']      = "edited";
@@ -56,12 +52,9 @@ class faiPartitionTable extends plugin
       /* read all partitions for each disk 
        */
       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;
 
+        $res = FAI::get_leaf_objects($disk['dn'], $name, "FAIpartitionEntry", "cn=".$this->cn.",".get_ou('faiPartitionRDN'));
+        foreach($res as $obj){
           $objects = array();
           $objects['status']      = "edited";
           $objects['dn']          = $obj['dn'];
@@ -429,7 +422,8 @@ class faiPartitionTable extends plugin
       }
 
       /* Tag object */
-      $this->tag_attrs($disk_attrs, $disk_dn, $this->gosaUnitTag);
+      $ui= get_userinfo();
+      $this->tag_attrs($disk_attrs, $disk_dn, $ui->gosaUnitTag);
 
       if($disk['status'] == "delete"){
         FAI::prepare_to_save_FAI_object($disk_dn,array(),true);
@@ -474,7 +468,8 @@ class faiPartitionTable extends plugin
         }
 
         /* Tag object */
-        $this->tag_attrs($partition_attrs, $partition_dn, $this->gosaUnitTag);
+       $ui= get_userinfo();
+        $this->tag_attrs($partition_attrs, $partition_dn, $ui->gosaUnitTag);
 
         if($partition['status'] == "delete"){
           FAI::prepare_to_save_FAI_object($partition_dn,array(),true);