![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index d439e86366ec1e1553fe6f2184572edab82e6ed6..6f3630e6e54c2b8768198af0294f2bce6530a997 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'])){
$this->is_new =TRUE;
}
ksort($this->disks);
+
+ // Prepare lists
+ $this->diskList = new sortableListing();
+ $this->diskList->setDeleteable(true);
+ $this->diskList->setEditable(true);
+ $this->diskList->setWidth("100%");
+ $this->diskList->setHeight("400px");
+ $this->diskList->setColspecs(array('20px','*','*','40px'));
+ $this->diskList->setHeader(array(("?"),_("Name"),_("Description"),"#"));
+ $this->diskList->setDefaultSortColumn(1);
+
}
}
}
- /* New Listhandling */
- foreach($_POST as $name => $value){
- if(preg_match("/^edit_[^_]*_/",$name)){
- $s_entry = preg_replace("/^edit_/","",$name);
- $s_entry = base64_decode(preg_replace("/_.*/","",$s_entry));
- $s_action = "edit";
- break;
- }
- if (!preg_match("/freeze/i", $this->FAIstate) && preg_match("/^delete_[^_]*_/",$name)){
- $s_entry = preg_replace("/^delete_/","",$name);
- $s_entry = base64_decode(preg_replace("/_.*/","",$s_entry));
- $s_action = "remove";
- break;
- }
+ $this->diskList->save_object();
+ $action = $this->diskList->getAction();
+ if($action['action'] == 'edit'){
+ $s_entry = $this->diskList->getKey($action['targets'][0]);
+ $s_action ="edit";
+ }
+ if($action['action'] == 'delete'){
+ $s_entry = $this->diskList->getKey($action['targets'][0]);
+ $s_action ="remove";
}
-
/* Disk remove was requested.
* Now check if the disk is still in use, in this case
}
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;
}
}
$smarty->assign("addraid", "");
}
- /* Divlist containing disks */
- $divlist = new divSelectBox("FAItemplates");
- $divlist->setHeight(400);
+ $dn = $this->acl_base_for_current_object($this->dn);
+ $acl = $this->ui->get_permissions($dn,"fai/faiPartitionTableEntry");
+ $this->diskList->setAcl($acl);
+ $data = $lData = array();
foreach($this->disks as $key => $disk){
$act = "";
$dn = $this->acl_base_for_current_object($dn);
$acl = $this->ui->get_permissions($dn,"fai/faiPartitionTableEntry");
if(preg_match("/(r|w)/",$acl)) {
-
- $act .= "<input type='image' src='images/lists/edit.png' name='edit_%s' title='"._("edit")."' alt='"._("edit")."'>";
- if(preg_match("/d/",$acl) && !preg_match("/freeze/", $this->FAIstate)){
- $act .="<input type='image' src='images/lists/trash.png' name='delete_%s' title='"._("delete")."' alt='"._("delete")."'>";
- }
-
$cnt= count($disk['partitions']);
-
- $edit_link = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$key."'>".$key."</a>";
- $types= array("old" => "plugins/fai/images/fai_partitionTable.png", "disk" => "plugins/fai/images/fai_partitionTable.png",
+ $types= array(
+ "old" => "plugins/fai/images/fai_partitionTable.png",
+ "disk" => "plugins/fai/images/fai_partitionTable.png",
"raid" => "plugins/fai/images/raid.png", "lvm" => "plugins/ogroups/images/list_ogroup.png");
$type = isset($disk['FAIdiskType'])?$types[$disk['FAIdiskType']]:$types['old'];
- $divlist->AddEntry(array(
- array("string"=> "<img border='0' src='".$type."'>", "attach"=>"style='width:16px'"),
- array("string"=> $edit_link, "attach"=>"style='width:100px'"),
- array("string"=> $disk['description']),
- array("string"=> $cnt, "attach"=>"style='width:16px'"),
- array("string"=>str_replace("%s",base64_encode($key),$act),
- "attach"=>"style='border-right: 0px;width:50px;text-align:right;'")));
+ $data[$key] = $key;
+ $lData[$key] = array('data' => array(image($type),$key,$disk['description'],$cnt));
}
}
- $smarty->assign("Entry_divlist",$divlist->DrawList());
+ $this->diskList->setListData($data,$lData);
+ $this->diskList->update();
+ $smarty->assign("Entry_listing",$this->diskList->render());
$display.= $smarty->fetch(get_template_path('faiPartitionTable.tpl', TRUE));
return($display);
if(isset($_POST['FAIpartitionTablePosted'])){
if (preg_match("/freeze/", $this->FAIstate)) return;
plugin::save_object();
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
- }
- }
+# foreach($this->attributes as $attrs){
+# if(isset($_POST[$attrs])){
+# $this->$attrs = $_POST[$attrs];
+# }
+# }
if(!count($this->disks)){
if(isset($_POST['mode'])){
$this->FAIpartitionMethod = "setup-storage";
*/
if($this->is_new){
$release = $this->parent->parent->fai_release;
- $new_dn= 'cn='.$this->cn.",".get_ou('faiPartitionRDN').get_ou('faiBaseRDN').$release;
+ $new_dn= 'cn='.$this->cn.",".get_ou("faiPartitionTable", "faiPartitionRDN").get_ou('faiBaseRDN').$release;
$res = faiManagement::check_class_name("FAIpartitionTable",$this->cn,$new_dn);
if(isset($res[$this->cn])){
$message[] = msgPool::duplicated(_("Name"));
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;
}
"plPriority" => 26,
"plSection" => array("administration"),
"plCategory" => array("fai"),
+ "plProperties" =>
+ array(
+ array(
+ "name" => "faiPartitionRDN",
+ "type" => "rdn",
+ "default" => "ou=disk,",
+ "description" => "The 'faiPartitionRDN' statement defines the location where new fai-partitions will be created. The default is 'ou=disk,'.",
+ "check" => "gosaProperty::isRdn",
+ "migrate" => "",
+ "group" => "plugin",
+ "mandatory" => FALSE)),
+
"plProvidedAcls" => array(
"cn" => _("Name")." ("._("Read only").")",
"description" => _("Description"))