From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 14 Jun 2007 09:31:58 +0000 (+0000)
Subject: Fixed subsearch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5e877dd323d8fe6b9cffd1e3580f0ef12ca79ee;p=gosa.git

Fixed subsearch


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

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 1a5db9bca..5e3e121d3 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -408,9 +408,16 @@ class ogroup extends plugin
     foreach($p_f as $post_name => $data){
 
       if($ogfilter[$post_name] == "checked"){
+
+        if($ogfilter['subtrees']){
+          $base =  $ogfilter['dselect'];
+        }else{
+          $base =  $data['DN'].$ogfilter['dselect'];
+        }
+    
         $filter = "(&(objectClass=".$data['CLASS'].")(|(uid=$regex)(cn=$regex)(ou=$regex)))";
-        $res    = get_list($filter, $data['ACL']  , $data['DN'].$ogfilter['dselect'], 
-                    array("description", "objectClass", "sn", "givenName", "uid","ou","cn"));
+        $res    = get_list($filter, $data['ACL']  , $base, 
+                    array("description", "objectClass", "sn", "givenName", "uid","ou","cn"),$Get_list_flags);
 
         /* fetch results and append them to the list */
         foreach($res as $attrs){