From 5a68ea106980a52850cc527da098f481223b07b1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 7 Dec 2016 13:18:23 +0100
Subject: [roomplanner] Tighten up computer list, better search result caching

---
 modules-available/roomplanner/page.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'modules-available/roomplanner/page.inc.php')

diff --git a/modules-available/roomplanner/page.inc.php b/modules-available/roomplanner/page.inc.php
index 1ddbdc30..a35023b9 100644
--- a/modules-available/roomplanner/page.inc.php
+++ b/modules-available/roomplanner/page.inc.php
@@ -94,7 +94,8 @@ class Page_Roomplanner extends Page
 				. 'WHERE machineuuid LIKE :query '
 				. ' OR macaddr  	 LIKE :query '
 				. ' OR clientip    LIKE :query '
-				. ' OR hostname	 LIKE :query ', ['query' => "%$query%"]);
+				. ' OR hostname	 LIKE :query '
+				. ' LIMIT 100', ['query' => "%$query%"]);
 
 			$returnObject = ['machines' => []];
 
@@ -268,8 +269,6 @@ class Page_Roomplanner extends Page
 		$machines = [];
 
 		while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-			// For searching
-			$row['combined'] = $row['machineuuid'] . ' ' . $row['macaddr'] . ' ' . $row['clientip'] . ' ' . $row['hostname'];
 			$machines[] = $row;
 		}
 
-- 
cgit v1.2.3-55-g7522