Code

Fixed subsearch
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 14 Jun 2007 09:31:58 +0000 (09:31 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 14 Jun 2007 09:31:58 +0000 (09:31 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6587 594d385d-05f5-0310-b6e9-bd551577e9d8

plugins/admin/ogroups/class_ogroup.inc

index 1a5db9bca3162789803ffcf7918338b605357f0f..5e3e121d32383a177ab79866d74e882034835434 100644 (file)
@@ -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){