From c2affca145984d46056f91c0f7730275907cca0a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 20 Jan 2017 12:19:27 +0100 Subject: [locationinfo] Take lastboot into account when calcing pc state --- modules-available/locationinfo/page.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules-available/locationinfo/page.inc.php') diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index e9ce1159..20df023c 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -384,7 +384,7 @@ class Page_LocationInfo extends Page //TODO REMOVE FUNCTION. NOT NECCESSARY BUT AFTER TESTING pcSTATE private function ajaxShowLocation($id) { - $dbquery = Database::simpleQuery("SELECT machineuuid, clientip, position, logintime, lastseen FROM `machine` WHERE locationid = :id", array('id' => $id)); + $dbquery = Database::simpleQuery("SELECT machineuuid, clientip, position, logintime, lastseen, lastboot FROM `machine` WHERE locationid = :id", array('id' => $id)); $data = array(); @@ -392,7 +392,7 @@ class Page_LocationInfo extends Page $pc = array(); $pc['id'] = $dbdata['machineuuid']; $pc['ip'] = $dbdata['clientip']; - $pc['pcState'] = LocationInfo::getPcState($dbdata['logintime'], $dbdata['lastseen']); + $pc['pcState'] = LocationInfo::getPcState($dbdata); $position = json_decode($dbdata['position'], true); $pc['x'] = $position['gridRow']; -- cgit v1.2.3-55-g7522