diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index d439e86366ec1e1553fe6f2184572edab82e6ed6..9ed849507a86cef41340c67ce77f003287dfcf89 100644 (file)
} else {
$objects['FAIdiskType'] = $obj['FAIdiskType'];
}
- $objects['FAIdiskOption'] = $obj['FAIdiskOption'];
+
+ // Get disk options, without 'count' index.
+ $objects['FAIdiskOption'] = array();
+ if (isset($obj['FAIdiskOption'])){
+ for($i=0;$i<$obj['FAIdiskOption']['count'];$i++){
+ $objects['FAIdiskOption'][] = $obj['FAIdiskOption'][$i];
+ }
+ }
// Transform potential lvm information
if (isset($obj['FAIlvmDevice'])){
/* 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";
}
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;
}
}
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']);
if($this->initially_was_account){
new log("modify","fai/".get_class($this),$this->dn,$this->attributes);
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$this->dn , "Saving disk: ");
}else{
new log("create","fai/".get_class($this),$this->dn,$this->attributes);
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$this->dn , "Adding disk: ");
}
// Prepare disks to be saved - The 'status' attribute is added here.
foreach($order as $cn=>$disk){
$disk_dn = "cn=".$disk['cn'].",".$this->dn;
+ $short_dn = "cn=".$disk['cn'].",...";
$disk_attrs['cn'] = $disk['cn'];
$disk_attrs['objectClass'] = array("top","FAIclass","FAIpartitionDisk");
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])){
$this->tag_attrs($disk_attrs, $disk_dn, $this->gosaUnitTag);
if($disk['status'] == "delete"){
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$short_dn , "Removing disk: ");
FAI::prepare_to_save_FAI_object($disk_dn,array(),true);
$this->handle_post_events("remove");
unset($this->disks[$cn]);
}elseif($disk['status'] == "edited"){
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$short_dn , "Updating disk: ");
FAI::prepare_to_save_FAI_object($disk_dn,$disk_attrs);
$this->handle_post_events("modify");
}elseif($disk['status']=="new"){
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$short_dn , "Adding disk: ");
FAI::prepare_to_save_FAI_object($disk_dn,$disk_attrs);
$this->handle_post_events("add");
}
}
}
- $partition_dn= "FAIpartitionNr=".$partition_attrs['FAIpartitionNr'].",".$disk_dn;
+ $partition_dn= "FAIpartitionNr=".$partition_attrs['FAIpartitionNr'].",".$disk_dn;
+ $short_dn= "FAIpartitionNr=".$partition_attrs['FAIpartitionNr'].",...";
+
$partition_attrs['objectClass']= array("top","FAIclass","FAIpartitionEntry");
unset($partition_attrs['status']);
/* Tag object */
$this->tag_attrs($partition_attrs, $partition_dn, $this->gosaUnitTag);
+
if($partition['status'] == "delete"){
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$short_dn , "Removing partition: ");
FAI::prepare_to_save_FAI_object($partition_dn,array(),true);
$this->handle_post_events("remove");
unset($this->disks[$cn]['partitions'][$pkey]);
}elseif($partition['status'] == "edited"){
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$short_dn , "Updating partition: ");
FAI::prepare_to_save_FAI_object($partition_dn,$partition_attrs);
$this->handle_post_events("modify");
}elseif($partition['status']=="new"){
+ @DEBUG (DEBUG_FAI, __LINE__, __FUNCTION__, __FILE__,$short_dn , "Adding partition: ");
FAI::prepare_to_save_FAI_object($partition_dn,$partition_attrs);
$this->handle_post_events("add");
}
/* 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;
}