From 3a94f3629aada7197caafc696a86eada598648f1 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Tue, 4 Apr 2017 16:11:03 +0200
Subject: [statistics_reporting] fixed clients/locations without offline-length
 entries not showing

---
 modules-available/statistics_reporting/inc/getdata.inc.php | 2 +-
 modules-available/statistics_reporting/inc/queries.inc.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules-available/statistics_reporting')

diff --git a/modules-available/statistics_reporting/inc/getdata.inc.php b/modules-available/statistics_reporting/inc/getdata.inc.php
index a167c2e5..da3a9a26 100644
--- a/modules-available/statistics_reporting/inc/getdata.inc.php
+++ b/modules-available/statistics_reporting/inc/getdata.inc.php
@@ -124,7 +124,7 @@ class GetData
 		return $data;
 	}
 
-	private function nullToZero(&$row)
+	private static function nullToZero(&$row)
 	{
 		foreach ($row as &$field) {
 			if (is_null($field)) {
diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index f00138ec..2269e764 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -11,13 +11,13 @@ class Queries
 		$res = Database::simpleQuery("SELECT t2.name AS clientName, timeSum, medianSessionLength, offlineSum, IFNULL(lastStart, 0) as lastStart, IFNULL(lastLogout, 0) as lastLogout, longSessions, shortSessions, t2.locId, t2.locName, MD5(CONCAT(t2.locId, :salt)) AS locHash, MD5(CONCAT(t2.uuid, :salt)) AS clientHash FROM (
 													SELECT machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianSessionLength', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions', MAX(sessionTable.endInBound) AS 'lastLogout'
 													FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable
-														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
+														RIGHT JOIN machine ON sessionTable.machineuuid = machine.machineuuid
 													GROUP BY machine.machineuuid
 												) 	t1 
 												RIGHT JOIN (
 													SELECT IF(machine.hostname = '', machine.clientip, machine.hostname) AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum', MAX(offlineTable.endInBound) AS 'lastStart', IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId'
 													FROM ".self::getBoundedTableQueryString('~offline-length', $from, $to, $lowerTimeBound, $upperTimeBound)." offlineTable
-														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid
+														RIGHT JOIN machine ON offlineTable.machineuuid = machine.machineuuid
 														LEFT JOIN location ON machine.locationid = location.locationid
 													GROUP BY machine.machineuuid
 												) 	t2 
@@ -33,14 +33,14 @@ class Queries
 		$res = Database::simpleQuery("SELECT t2.locId, t2.locName, MD5(CONCAT(t2.locId, :salt)) AS locHash, timeSum, medianSessionLength, offlineSum, longSessions, shortSessions FROM (
 													SELECT location.locationid AS 'locId', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianSessionLength', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
 													FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable
-												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
+												   	RIGHT JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
 													GROUP BY machine.locationid
 												) 	t1 
 												RIGHT JOIN (
 													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
 													FROM ".self::getBoundedTableQueryString('~offline-length', $from, $to, $lowerTimeBound, $upperTimeBound)." offlineTable
-														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
+														RIGHT JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
 													GROUP BY machine.locationid
 												) 	t2 
-- 
cgit v1.2.3-55-g7522