From: hickert Date: Wed, 5 Nov 2008 07:43:58 +0000 (+0000) Subject: Updated FAI management/divlist X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cc894c674f957aea342076d36bdc1bad9317bde1;p=gosa.git Updated FAI management/divlist -Ensure that we check the correct dns for ACLs git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12911 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/fai/admin/fai/class_divListFai.inc b/gosa-plugins/fai/admin/fai/class_divListFai.inc index be5072f22..2fba97966 100644 --- a/gosa-plugins/fai/admin/fai/class_divListFai.inc +++ b/gosa-plugins/fai/admin/fai/class_divListFai.inc @@ -129,7 +129,7 @@ class divListFai extends MultiSelectWindow $add_sep = false; /* Get complete fai acls, to be able to check if we must show or hide the snapshot abilities */ - $acl_all = $ui->has_complete_category_acls($this->parent->fai_base,$this->module); + $acl_all = $ui->has_complete_category_acls($this->config->current['BASE'],$this->module); /* Add default header */ $listhead = MultiSelectWindow::get_default_header(false); @@ -143,7 +143,7 @@ class divListFai extends MultiSelectWindow $s .= "..|". " "._("Create")."|\n"; - $acl = $ui->get_permissions($this->parent->fai_base,"fai/faiProfile"); + $acl = $ui->get_permissions($this->config->current['BASE'],"fai/faiProfile"); if($this->parent->lock_type == "freeze" && !$this->parent->allow_freeze_object_attach){ $s.= "...|". " "._("Freezed")."|\n"; @@ -169,7 +169,7 @@ class divListFai extends MultiSelectWindow "Create_package" , _("PK") , "faiPackage")); foreach($arr as $ar){ - $acl = $ui->get_permissions($this->parent->fai_base,"fai/".$ar[4]); + $acl = $ui->get_permissions($this->config->current['BASE'],"fai/".$ar[4]); if(preg_match("/c/",$acl)){ $s.= "...|". " ".$ar[1]."|".$ar[2]."|\n"; @@ -269,7 +269,7 @@ class divListFai extends MultiSelectWindow /* Add copy & cut icons */ $ui = get_userinfo(); $action =""; - $acl_all = $ui->has_complete_category_acls($this->parent->fai_base,$this->module); + $acl_all = $ui->has_complete_category_acls($this->config->current['BASE'],$this->module); if(preg_match("/^opsi_/",$type)){ $editlink ="%NAME%"; diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc index b65e44764..35d5cb060 100644 --- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc +++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc @@ -81,7 +81,10 @@ class faiManagement extends plugin $this->CopyPasteHandler= new CopyPasteHandler($this->config); } - /* Set default release */ + /* Set default release + !! If you change the base here you have to update the base in + class_divListFai.inc too, all ACL checks use ($this->config->current['BASE']). + */ $this->fai_base = get_ou("faiBaseRDN").$this->config->current['BASE']; if(!session::is_set("fai_filter")){