From 0ab6b484a445a93a17b6cfb5d7a94850c6fe73e8 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 22 Feb 2008 12:18:00 +0000 Subject: [PATCH] Updated system listing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9067 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/systems/class_systemManagement.inc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index 1a7c6a3ef..9e1fd2cb5 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -1000,14 +1000,6 @@ class systems extends plugin /* Attributes to fetch */ $sys_attrs = array("cn", "description", "macAddress", "objectClass", "sambaDomainName","gotoMode"); $sys_categories = array("terminal", "workstation", "server", "phone" ,"printer","incoming"); - $sys_bases = array( - get_ou("terminalou"), - get_ou("workstationou"), - get_ou("serverou"), - get_ou("phoneou"), - get_ou("printerou"), - get_ou("incomingou"), - get_ou("componentou")); /* Add FAIstate to attributes if FAI is activated */ $tmp = $this->config->search("faiManagement", "CLASS",array('menu','tabs')); @@ -1021,14 +1013,8 @@ class systems extends plugin if($this->DivListSystem->$checkBox){ if($this->DivListSystem->SubSearch){ if($oc['CLASS'] != ""){ - $new_res = get_sub_list($filter, $sys_categories ,$sys_bases, $base,$sys_attrs, GL_SUBSEARCH | GL_SIZELIMIT); - - /* Remove all objects that are not in the expected sub department */ - foreach($new_res as $key => $obj){ - if(preg_match("/^[^,]+,".normalizePreg($oc['TREE'])."/",$obj['dn'])){ - $res[$obj['dn']] = $obj; - } - } + $new_res = get_sub_list($filter, $sys_categories ,$oc['TREE'], $base,$sys_attrs, GL_SUBSEARCH | GL_SIZELIMIT); + $res = array_merge($res,$new_res); } }else{ /* User filter? */ -- 2.30.2