From: cajus Date: Wed, 21 Sep 2005 14:23:28 +0000 (+0000) Subject: New terminals and workstations got dropped. Grrr. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ca7e1a8d3222ae9ebe7d8f9e2e9c379107189019;p=gosa.git New terminals and workstations got dropped. Grrr. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1405 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 5dfc195b2..d1afe0d43 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -833,6 +833,9 @@ class systems extends plugin $res= get_list($this->ui->subtreeACL, "(|$termfilter)", FALSE, "ou=terminals,ou=systems,".$base, array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE); + $res= get_list($this->ui->subtreeACL, "(|$termfilter)", FALSE, "ou=incoming,".$base, + array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE); + $res= array_merge($res, get_list($this->ui->subtreeACL, "(|$serverfilter)", FALSE, "ou=servers,ou=systems,".$base, array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE)); @@ -853,6 +856,10 @@ class systems extends plugin get_list($this->ui->subtreeACL, "(|$workfilter)", FALSE, "ou=workstations,ou=systems,".$base, array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE)); + $res= array_merge($res, + get_list($this->ui->subtreeACL, "(|$workfilter)", FALSE, "ou=incoming,".$base, + array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE)); + $res= array_merge($res, get_list($this->ui->subtreeACL, "(|$winfilter)", FALSE, "ou=winstations,ou=systems,".$base, array("cn", "description", "macAddress", "objectClass", "sambaDomainName"), FALSE));