diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index e82838b291f3097ca640049ec46e334975d996f7..9ed849507a86cef41340c67ce77f003287dfcf89 100644 (file)
/* 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($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])){