From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 4 Oct 2005 11:05:48 +0000 (+0000)
Subject: Terminals are shown again.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=da0c10076f80ae5fdfa918881ccffc6d9575d756;p=gosa.git

Terminals are shown again.


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

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index e9e5e7dfa..83c0468ce 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -833,8 +833,8 @@ 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, "(|$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, 
@@ -992,7 +992,6 @@ class systems extends plugin
       $this->terminals[]=$val;
     }
     reset ($this->terminals);
-
   }
 
   function remove_lock()