From 5dd6473d2f78d74c005ed20fb2a968f9bcae6ade Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Thu, 25 Jan 2024 14:47:37 +0100
Subject: [statistics_reporting] Consider all machines in DB

Don't limit on machines which booted at least once in the last 30 days.
Otherwise the number of machines in statistics_reporting doesn't match
the number of clients in rooms/locations or client-statistics which is
kinda irritating.

We still have the problem, that we don't know which clients still exist
in the real world. But that' another story.
---
 modules-available/statistics_reporting/inc/queries.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'modules-available/statistics_reporting')

diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index bafe80bc..6446a89b 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -15,7 +15,8 @@ class Queries
 
 	public static function getClientStatistics(int $from, int $to, int $lowerTimeBound = 0, int $upperTimeBound = 24): array
 	{
-		$fromCutoff = $from - 86400 * 30;
+		#$fromCutoff = $from - 86400 * 30;
+		$fromCutoff = 0;
 		$res = Database::simpleQuery("SELECT m.machineuuid, m.hostname, m.clientip,
 				m.locationid, m.firstseen -- , m.lastboot, m.logintime, m.state
  				FROM machine m WHERE firstseen <= $to AND lastseen > $fromCutoff"); // " WHERE lastseen >= :from", compact('from'));
@@ -30,7 +31,8 @@ class Queries
 
 	public static function getLocationStatistics(int $from, int $to, int $lowerTimeBound = 0, int $upperTimeBound = 24): array
 	{
-		$fromCutoff = $from - 86400 * 30;
+		#$fromCutoff = $from - 86400 * 30;
+		$fromCutoff = 0;
 		$res = Database::simpleQuery("SELECT m.machineuuid, m.hostname, m.clientip,
 				m.locationid, m.firstseen -- , m.lastboot, m.logintime, m.state
  				FROM machine m WHERE firstseen <= $to AND lastseen > $fromCutoff"); // " WHERE lastseen >= :from", compact('from'));
@@ -62,7 +64,8 @@ class Queries
 
 	public static function getOverallStatistics(int $from, int $to, $lowerTimeBound = 0, $upperTimeBound = 24)
 	{
-		$fromCutoff = $from - 86400 * 30;
+		#$fromCutoff = $from - 86400 * 30;
+		$fromCutoff = 0;
 		$res = Database::simpleQuery("SELECT m.machineuuid, m.hostname, m.clientip,
 				m.locationid, m.firstseen -- , m.lastboot, m.logintime, m.state
  				FROM machine m WHERE firstseen <= $to AND lastseen > $fromCutoff"); // " WHERE lastseen >= :from", compact('from'));
-- 
cgit v1.2.3-55-g7522