From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 19 Feb 2009 08:45:48 +0000 (+0000)
Subject: Merge revision 12939 from trunk:
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=293a8da6987154bb1dc14d0d473c1d36bbe75c4b;p=gosa.git

Merge revision 12939 from trunk:
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/branches/2.6-lhm@13431 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
index 5104c9ee4..49732cc95 100644
--- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc
+++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
@@ -153,7 +153,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 bd26203f9..a115f3691 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 577744197..b26783089 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -1445,7 +1445,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/goto/admin/devices/class_divListDevices.inc b/gosa-plugins/goto/admin/devices/class_divListDevices.inc
index c5adfd07a..366b5e1b9 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('deviceou').$this->selectedBase,"devices/deviceGeneric");
+    $acl      = $ui->get_permissions($this->selectedBase,"devices/deviceGeneric");
     $acl_all  = $ui->has_complete_category_acls($this->selectedBase,"devices") ;