Updated list

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4378 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/functions.inc b/include/functions.inc
index 5f1d386f75cfc8497e0e47f3486b28ee0c93017c..6dad0634d3ba2862b894e77f142d4af8f64af05e 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -582,7 +582,7 @@ function get_lock ($object)
 }
 
 
-function get_list($filter, $object, $base= "", $attributes= array(), $flags= GL_SUBSEARCH)
+function get_list($filter, $category, $base= "", $attributes= array(), $flags= GL_SUBSEARCH)
 {
   global $config, $ui;
 
@@ -616,9 +616,9 @@ function get_list($filter, $object, $base= "", $attributes= array(), $flags= GL_
     $dn= $ldap->getDN();
 
     /* Sort in every value that fits the permissions */
-    if (is_array($object)){
-      foreach ($object as $o){
-        if ($ui->get_permissions($dn, $o, "") != ""){
+    if (is_array($category)){
+      foreach ($category as $o){
+        if ($ui->get_category_permissions($dn, $o) != ""){
           if ($flags & GL_CONVERT){
             $attrs["dn"]= convert_department_dn($dn);
           } else {
@@ -630,7 +630,7 @@ function get_list($filter, $object, $base= "", $attributes= array(), $flags= GL_
         }
       }
     } else {
-      if ($ui->get_permissions($dn, $object, "") != ""){
+      if ($ui->get_category_permissions($dn, $category) != ""){
         if ($flags & GL_CONVERT){
           $attrs["dn"]= convert_department_dn($dn);
         } else {

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 8e7f6415f5d3211649881503dfbdf87600bf5d9c..0c2e864a5a82fc7fc97574b901ddf0f89d1f8911 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -717,11 +717,11 @@ class userManagement extends plugin
     $ldap= $this->config->get_ldap_link(TRUE);
 
     if ($SubSearch){
-      $ListTemp =  get_list($filter, "users", $base,
+      $ListTemp =  get_list($filter, "user", $base,
                             array("uid", "givenName", "sn", "objectClass"), GL_SUBSEARCH | GL_SIZELIMIT);
     } else {
       $base= get_people_ou().$base;
-      $ListTemp = get_list($filter, "users", $base, 
+      $ListTemp = get_list($filter, "user", $base, 
                             array("uid", "givenName", "sn", "objectClass"), GL_SIZELIMIT);
     }
     $SortTemp = array();