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 e9e5e7dfaa2819e0fbcbbeb9db00824620a3ed21..83c0468ce4eb9a69a475df159519ac243fb1e2fc 100644 (file)
--- 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()