From 93ca5e2c69340e9cabdbaa1b0ecc609b5f54eec7 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 6 Nov 2008 12:50:47 +0000
Subject: [PATCH] Updated some plugins -Do not check for dummy entries like
 ('cn=dummy,ou..'), this doesn't work with user filter settings.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12939 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../plugins/admin/departments/class_divListDepartment.inc     | 2 +-
 gosa-core/plugins/admin/users/class_userManagement.inc        | 4 ++--
 gosa-core/plugins/personal/generic/class_user.inc             | 2 +-
 gosa-plugins/fai/admin/fai/class_faiTemplate.inc              | 2 +-
 gosa-plugins/goto/admin/devices/class_divListDevices.inc      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
index a959b972a..bcbaae300 100644
--- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc
+++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
@@ -97,7 +97,7 @@ class divListDepartment extends MultiSelectWindow
      */
     $types = $this->parent->get_support_departments();
     foreach($types as $type){
-      if(preg_match("/c/",$ui->get_permissions("ou=dummy,".$this->selectedBase  ,"department/".$type['ACL']))){
+      if(preg_match("/c/",$ui->get_permissions($this->selectedBase  ,"department/".$type['ACL']))){
       $s.= "...|<input class='center' type='image' src='".$type['IMG']."' alt='".$type['ATTR']."'>".
         "&nbsp;".$type['TITLE']."&nbsp;(".$type['ATTR'].")|dep_new_".$type['ATTR']."|\n";
       }
diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 2fa0cfc62..a8ea272ec 100644
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -473,7 +473,7 @@ class userManagement extends plugin
       foreach ($this->config->departments as $key => $value){
     
         /* Get acls from different ou's */
-        $acl = $this->ui->get_permissions("cn=dummy,".get_people_ou().$value,"users/user")       ; 
+        $acl = $this->ui->get_permissions($value,"users/user")       ; 
  
         /* If creation of a new user is allowed, append this template */
         if (preg_match("/c/",$acl)){
@@ -808,7 +808,7 @@ class userManagement extends plugin
       /* Create new usertab object */
       $this->usertab= new usertabs($this->config,$this->config->data['TABS']['USERTABS'], $this->dn);
       $this->usertab->by_object['user']->base= $this->DivListUsers->selectedBase;
-      $this->usertab->set_acl_base('dummy,'.$this->DivListUsers->selectedBase);
+      $this->usertab->set_acl_base($this->DivListUsers->selectedBase);
 
       /* Take care about templates */
       if ($s_action=="new_tpl"){
diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 8f658bef4..ec47df24b 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1477,7 +1477,7 @@ class user extends plugin
   function saveCopyDialog()
   {
     /* Set_acl_base */
-    $this->set_acl_base("cn=dummy,".get_people_ou().$this->base);
+    $this->set_acl_base($this->base);
 
     if((isset($_FILES['picture_file']['tmp_name'])) && ($_FILES['picture_file']['size'] > 0)){
       $this->set_picture($_FILES['picture_file']['tmp_name']);
diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
index b25f018c0..0c2dca46d 100644
--- a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc
+++ b/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 = "cn=dummy,".$this->acl_base_for_current_object($this->dn);
+      $acl_dn = $this->acl_base_for_current_object($this->dn);
       $acl    = $this->ui->get_permissions($acl_dn,"fai/faiTemplateEntry");
 
       if(preg_match("/c/",$acl)){
diff --git a/gosa-plugins/goto/admin/devices/class_divListDevices.inc b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
index d81ebd460..c4c11b25a 100644
--- a/gosa-plugins/goto/admin/devices/class_divListDevices.inc
+++ b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
@@ -71,7 +71,7 @@ class divListDevices extends MultiSelectWindow
 
     /* Get acls */
     $ui       = get_userinfo();
-    $acl      = $ui->get_permissions("cn=dummy,".get_ou('deviceRDN').$this->selectedBase,"devices/deviceGeneric");
+    $acl      = $ui->get_permissions($this->selectedBase,"devices/deviceGeneric");
     $acl_all  = $ui->has_complete_category_acls($this->selectedBase,"devices") ;
 
 
-- 
2.30.2