From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 6 May 2009 09:37:36 +0000 (+0000)
Subject: Aplied changes from revision 12395.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7af43f23b5590b3e1b37d2ceee06128f3b4f924a;p=gosa.git

Aplied changes from revision 12395.
- Changes were partly missing (class_faiManagement.inc, class_faiTemplate.inc)
- ACL related modifications. The default ACL dn to check was modified.



git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13612 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index f48108b60..8e64e3b2a 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -880,7 +880,7 @@ class faiManagement extends plugin
       if(preg_match("/c/",$acl)){
         $a_setup= $this->get_type(array("objectClass"=>array("FAIprofile")));
         $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
-        $this->dialog->set_acl_base($this->base);
+        $this->dialog->set_acl_base($this->acl_base);
         $this->dialog->parent = &$this;
 
         $this->is_dialog = false;
@@ -907,7 +907,7 @@ class faiManagement extends plugin
 
         if(class_exists($a_setup[0])){
           $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
-          $this->dialog->set_acl_base($this->base);
+          $this->dialog->set_acl_base($this->acl_base);
           $this->dialog->by_object[$a_setup[1]]->cn = $name;
           $this->dialog->parent = &$this;
           $this->is_dialog = true;
diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index 1a46f050d..5e60e4f80 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
@@ -186,7 +186,7 @@ class faiTemplate extends plugin
 
     /* Add new sub object */
     if(isset($_POST['AddSubObject']) && !preg_match("/freeze/",$this->FAIstate)){
-      $acl_dn = $this->acl_base_for_current_object($this->dn);
+      $acl_dn = "cn=dummy,".$this->acl_base_for_current_object($this->dn);
       $acl    = $this->ui->get_permissions($acl_dn,"fai/faiTemplateEntry");
 
       if(preg_match("/c/",$acl)){