From 8a7d2cdb4c8e1727474709706f4d9314cb82097a Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Tue, 22 Nov 2016 12:17:04 +0100
Subject: [statistics_reporting] new empty module

---
 .../statistics_reporting/page.inc.php              | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 modules-available/statistics_reporting/page.inc.php

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
new file mode 100644
index 00000000..ff73107a
--- /dev/null
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -0,0 +1,30 @@
+<?php
+
+class Page_LocationInfo extends Page
+{
+
+	/**
+	 * Called before any page rendering happens - early hook to check parameters etc.
+	 */
+	protected function doPreprocess()
+	{
+		User::load();
+
+		if (!User::isLoggedIn()) {
+			Message::addError('main.no-permission');
+			Util::redirect('?do=Main'); // does not return
+		}
+	}
+
+	/**
+	 * Menu etc. has already been generated, now it's time to generate page content.
+	 */
+	protected function doRender()
+	{
+		Render::addTemplate('_page', array(
+			'foo' => 'bar',
+			'now' => date('d.m.Y H:i:s')
+		));
+	}
+
+}
-- 
cgit v1.2.3-55-g7522


From e10ad1d38de5fa13781c3af17a4de8fe85644a0e Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 28 Nov 2016 15:41:15 +0100
Subject: login count and offline time database queries

---
 .../statistics_reporting/lang/de/module.json       |   4 +-
 .../lang/de/template-tags.json                     |  12 +-
 .../statistics_reporting/lang/en/module.json       |   4 +-
 .../lang/en/template-tags.json                     |  12 +-
 .../statistics_reporting/page.inc.php              | 103 ++++++++++++++-
 .../statistics_reporting/templates/_page.html      | 142 ++++++++++++++++++++-
 6 files changed, 262 insertions(+), 15 deletions(-)

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

diff --git a/modules-available/statistics_reporting/lang/de/module.json b/modules-available/statistics_reporting/lang/de/module.json
index 166909c3..bdbfe4fd 100644
--- a/modules-available/statistics_reporting/lang/de/module.json
+++ b/modules-available/statistics_reporting/lang/de/module.json
@@ -1,4 +1,4 @@
 {
-    "module_name": "Mein erstes Modul",
-    "page_title": "Mein erster Seitentitel"
+    "module_name": "Statistik Auswertung",
+    "page_title": "Statistik Auswertung"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index ce98ce38..d9b034b4 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -1,3 +1,13 @@
 {
-    "lang_hello": "Hallo"
+    "lang_user": "Nutzer",
+    "lang_countLogins": "Anzahl Logins",
+    "lang_client": "Client",
+    "lang_vm": "VM",
+    "lang_totalLogins": "Gesamt Logins",
+    "lang_overallOfftime": "Gesamtzeit Offline",
+    "lang_totalOffTime": "Gesamtzeit Offline",
+    "lang_clientLogout": "Letzter Logout",
+    "lang_clientStart": "Letzter Client Start",
+    "lang_room": "Raum",
+    "lang_offTime": "Zeit seit Logout"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/module.json b/modules-available/statistics_reporting/lang/en/module.json
index b2bcbb0c..6b3f98f6 100644
--- a/modules-available/statistics_reporting/lang/en/module.json
+++ b/modules-available/statistics_reporting/lang/en/module.json
@@ -1,4 +1,4 @@
 {
-    "module_name": "My first module",
-    "page_title": "My first page title"
+    "module_name": "Statistics Reporting",
+    "page_title": "Statistics Reporting"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index c30739e5..2f33eaf5 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -1,3 +1,13 @@
 {
-    "lang_hello": "Hello"
+    "lang_user": "User",
+    "lang_countLogins": "Number of Logins",
+    "lang_client": "Client",
+    "lang_vm": "VM",
+    "lang_totalLogins": "Total Logins",
+    "lang_overallOfftime": "Overall time offline",
+    "lang_totalOffTime": "Time offline",
+    "lang_clientLogout": "Last Logout",
+    "lang_clientStart": "Last Client Start",
+    "lang_room": "Room",
+    "lang_offTime": "Time since offline"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index ff73107a..3bd83034 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-class Page_LocationInfo extends Page
+class Page_Statistics_Reporting extends Page
 {
 
 	/**
@@ -21,10 +21,103 @@ class Page_LocationInfo extends Page
 	 */
 	protected function doRender()
 	{
-		Render::addTemplate('_page', array(
-			'foo' => 'bar',
-			'now' => date('d.m.Y H:i:s')
-		));
+		//counting the total  number of logins
+		$res = Database::simpleQuery("SELECT COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name'");
+		$row = $res->fetch(PDO::FETCH_ASSOC);
+		$datax = array('totalLogins' => $row['count']);
+
+		//counting logins per vm/event
+		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY data ORDER BY 2 DESC");
+		$datax[] = array('vmLogins' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datax['vmLogins'][] = array('vmname' => $row['data'], 'numLogins' => $row['count']);
+		}
+
+		//counting the logins per user
+		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY username ORDER BY 2 DESC");
+		$datax[] = array('userLogins' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datax['userLogins'][] = array('username' => $row['username'], 'numLogins' => $row['count']);
+		}
+
+		// TODO: got empty machine with alot of logins. isn't shown in the inner-join hostname query below.
+		// $res = Database::simpleQuery("SELECT machineuuid as 'hostname', COUNT(*) AS 'count' FROM statistic WHERE typeid='~session-length' GROUP BY machineuuid ORDER BY 2 DESC");
+
+		// TODO: session-length liefert 3000 Einträge mehr als vmchooser-session?
+		//counting the logins per client
+		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', COUNT(*) AS 'count' FROM statistic 
+											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
+												WHERE typeid='~session-length' GROUP BY machine.hostname ORDER BY 2 DESC");
+		$datax[] = array('machineLogins' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datax['machineLogins'][] = array('client' => $row['hostname'], 'numLogins' => $row['count']);
+		}
+
+
+
+		//total time offline overall
+		$res = Database::simpleQUery("SELECT sum(cast(data AS UNSIGNED)) AS totalOfftime FROM statistic WHERE typeid='~offline-length'");
+		$row = $res->fetch(PDO::FETCH_ASSOC);
+		$datay= array('totalOfftime' => $row['totalOfftime']);
+
+		//total offline time per client
+		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', statistic.data as time FROM statistic 
+											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
+												WHERE typeid='~offline-length' GROUP BY machine.hostname ORDER BY cast(time AS UNSIGNED) DESC");
+		$datay[] = array('totalOfflineTimeClient' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datay['totalOfflineTimeClient'][] = array('client' => $row['hostname'], 'offTime' => $row['time']);
+		}
+
+		// last logout of client
+		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', max(statistic.dateline) as datetime, statistic.data as loginTime
+												FROM statistic INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
+												WHERE typeid='~session-length' GROUP BY machine.hostname ORDER BY datetime DESC");
+		$datay[] = array('lastLogout' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datay['lastLogout'][] = array('client' => $row['hostname'], 'lastlogout' => date(DATE_RSS,$row['datetime']+$row['loginTime']), 'howLongOff' => (time() - ($row['datetime']+$row['loginTime'])));
+		}
+
+		// last start of client
+		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', max(statistic.dateline) as datetime FROM statistic 
+											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
+												WHERE typeid='~offline-length' GROUP BY machine.hostname ORDER BY datetime DESC");
+		$datay[] = array('lastLogin' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datay['lastLogin'][] = array('client' => $row['hostname'], 'lastlogin' => date(DATE_RSS,$row['datetime']));
+		}
+
+		//total time offline per room
+		$res = Database::simpleQuery("SELECT location.locationname AS 'room', statistic.data as time FROM statistic 
+											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
+											 	INNER JOIN location ON machine.locationid=location.locationid
+												WHERE typeid='~offline-length' GROUP BY room ORDER BY cast(time AS UNSIGNED) DESC");
+		$datay[] = array('offTimeRoom' => array());
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$datay['offTimeRoom'][] = array('room' => $row['room'], 'offTime' => $this->formatSeconds($row['time']));
+		}
+
+		$data = array_merge($datax, $datay);
+		Render::addTemplate('_page', $data);
 	}
 
+
+
+	function formatSeconds($seconds) {
+		$seconds = $seconds * 1;
+
+		$minutes = floor($seconds / 60);
+		$hours = floor($minutes / 60);
+		$days = floor($hours / 24);
+
+		$seconds = $seconds % 60;
+		$minutes = $minutes % 60;
+		$hours = $hours % 24;
+
+		$format = '%u:%u:%02u:%02u';
+		$time = sprintf($format, $days, $hours, $minutes, $seconds);
+		return rtrim($time, '0');
+	}
+
+
 }
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
index dfc941ae..101a124e 100644
--- a/modules-available/statistics_reporting/templates/_page.html
+++ b/modules-available/statistics_reporting/templates/_page.html
@@ -1,4 +1,138 @@
-<div style="border:5px solid red">
-	<h1>{{lang_hello}}, {{foo}}</h1>
-	** {{now}} **
-</div>
\ No newline at end of file
+<div>
+	<table class="table table-condensed table-striped">
+		<tr>
+			<th>{{lang_totalLogins}}</th>
+		</tr>
+		<tr>
+			<td>{{totalLogins}}</td>
+		</tr>
+	</table>
+</div>
+
+<div>
+	<table class="table table-condensed table-striped">
+		<tr>
+			<th>{{lang_overallOfftime}}</th>
+		</tr>
+		<tr>
+			<td>{{totalOfftime}}</td>
+		</tr>
+	</table>
+</div>
+
+
+
+<div class="row">
+	<div class="col-md-3">
+		<table class="table table-condensed">
+			<tr>
+				<th>{{lang_client}}</th>
+				<th>{{lang_totalOffTime}}</th>
+			</tr>
+			{{#totalOfflineTimeClient}}
+			<tr>
+				<td>{{client}}</td>
+				<td>{{offTime}}</td>
+			</tr>
+			{{/totalOfflineTimeClient	}}
+		</table>
+	</div>
+
+	<div class="col-md-3">
+		<table class="table table-condensed">
+			<tr>
+				<th>{{lang_client}}</th>
+				<th>{{lang_clientLogout}}</th>
+				<th>{{lang_offTime}}</th>
+			</tr>
+			{{#lastLogout}}
+			<tr>
+				<td>{{client}}</td>
+				<td>{{lastlogout}}</td>
+				<td>{{howLongOff}}</td>
+			</tr>
+			{{/lastLogout}}
+		</table>
+	</div>
+
+	<div class="col-md-3">
+		<table class="table table-condensed">
+			<tr>
+				<th>{{lang_client}}</th>
+				<th>{{lang_clientStart}}</th>
+			</tr>
+			{{#lastLogin}}
+			<tr>
+				<td>{{client}}</td>
+				<td>{{lastlogin}}</td>
+			</tr>
+			{{/lastLogin}}
+		</table>
+	</div>
+
+	<div class="col-md-3">
+		<table class="table table-condensed">
+			<tr>
+				<th>{{lang_room}}</th>
+				<th>{{lang_totalOffTime}}</th>
+			</tr>
+			{{#offTimeRoom}}
+			<tr>
+				<td>{{room}}</td>
+				<td>{{offTime}}</td>
+			</tr>
+			{{/offTimeRoom}}
+		</table>
+	</div>
+</div>
+
+
+
+
+<div class="row">
+	<div class="col-md-4">
+		<table class="table table-condensed">
+			<tr>
+				<th>{{lang_vm}}</th>
+				<th>{{lang_countLogins}}</th>
+			</tr>
+			{{#vmLogins}}
+			<tr>
+				<td>{{vmname}}</td>
+				<td>{{numLogins}}</td>
+			</tr>
+			{{/vmLogins}}
+		</table>
+	</div>
+
+	<div class="col-md-4">
+		<table class="table table-condensed table-striped">
+			<tr>
+				<th>{{lang_client}}</th>
+				<th>{{lang_countLogins}}</th>
+			</tr>
+			{{#machineLogins}}
+			<tr>
+				<td>{{client}}</td>
+				<td>{{numLogins}}</td>
+			</tr>
+			{{/machineLogins}}
+		</table>
+	</div>
+
+	<div class="col-md-4">
+		<table class="table table-condensed table-striped">
+			<tr>
+				<th>{{lang_user}}</th>
+				<th>{{lang_countLogins}}</th>
+			</tr>
+			{{#userLogins}}
+			<tr>
+				<td>{{username}}</td>
+				<td>{{numLogins}}</td>
+			</tr>
+			{{/userLogins}}
+		</table>
+	</div>
+</div>
+
-- 
cgit v1.2.3-55-g7522


From b87930137acf88936fb541f53ab4dab1697e4d03 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Mon, 28 Nov 2016 18:27:32 +0100
Subject: new ui

---
 .../lang/de/template-tags.json                     |  11 +-
 .../lang/en/template-tags.json                     |  11 +-
 .../statistics_reporting/page.inc.php              | 139 +++++-------
 modules-available/statistics_reporting/style.css   |   3 +
 .../statistics_reporting/templates/_page.html      | 247 ++++++++++-----------
 .../templates/columnChooser.html                   |  47 ++++
 6 files changed, 246 insertions(+), 212 deletions(-)
 create mode 100644 modules-available/statistics_reporting/style.css
 create mode 100644 modules-available/statistics_reporting/templates/columnChooser.html

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

diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index d9b034b4..2a9688b2 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -9,5 +9,14 @@
     "lang_clientLogout": "Letzter Logout",
     "lang_clientStart": "Letzter Client Start",
     "lang_room": "Raum",
-    "lang_offTime": "Zeit seit Logout"
+    "lang_offTime": "Zeit seit Logout",
+    "lang_total": "Gesamt",
+    "lang_perlocation": "Pro Raum",
+    "lang_perclient": "Pro Client",
+    "lang_peruser": "Pro Benutzer",
+    "lang_pervm": "Pro VM",
+    "lang_hostname": "Client Name",
+    "lang_location": "Raum",
+    "lang_avgSessionLength": "Durchschnittliche Sitzungsdauer",
+    "lang_totalTime": "Gesamte Zeit"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 2f33eaf5..cfbf3ad8 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -9,5 +9,14 @@
     "lang_clientLogout": "Last Logout",
     "lang_clientStart": "Last Client Start",
     "lang_room": "Room",
-    "lang_offTime": "Time since offline"
+    "lang_offTime": "Time since offline",
+    "lang_total": "Total",
+    "lang_perlocation": "Per Location",
+    "lang_perclient": "Per Client",
+    "lang_peruser": "Per User",
+    "lang_pervm": "Per VM",
+    "lang_hostname": "Client Name",
+    "lang_location": "Location",
+    "lang_avgSessionLength": "Average Session Length",
+    "lang_totalTime": "Total Time"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 3bd83034..6d3c2ae3 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -21,103 +21,82 @@ class Page_Statistics_Reporting extends Page
 	 */
 	protected function doRender()
 	{
-		//counting the total  number of logins
-		$res = Database::simpleQuery("SELECT COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name'");
-		$row = $res->fetch(PDO::FETCH_ASSOC);
-		$datax = array('totalLogins' => $row['count']);
-
-		//counting logins per vm/event
-		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY data ORDER BY 2 DESC");
-		$datax[] = array('vmLogins' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datax['vmLogins'][] = array('vmname' => $row['data'], 'numLogins' => $row['count']);
-		}
-
-		//counting the logins per user
-		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY username ORDER BY 2 DESC");
-		$datax[] = array('userLogins' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datax['userLogins'][] = array('username' => $row['username'], 'numLogins' => $row['count']);
-		}
-
 		// TODO: got empty machine with alot of logins. isn't shown in the inner-join hostname query below.
 		// $res = Database::simpleQuery("SELECT machineuuid as 'hostname', COUNT(*) AS 'count' FROM statistic WHERE typeid='~session-length' GROUP BY machineuuid ORDER BY 2 DESC");
 
 		// TODO: session-length liefert 3000 Einträge mehr als vmchooser-session?
-		//counting the logins per client
-		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', COUNT(*) AS 'count' FROM statistic 
-											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
-												WHERE typeid='~session-length' GROUP BY machine.hostname ORDER BY 2 DESC");
-		$datax[] = array('machineLogins' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datax['machineLogins'][] = array('client' => $row['hostname'], 'numLogins' => $row['count']);
-		}
-
-
-
-		//total time offline overall
-		$res = Database::simpleQUery("SELECT sum(cast(data AS UNSIGNED)) AS totalOfftime FROM statistic WHERE typeid='~offline-length'");
-		$row = $res->fetch(PDO::FETCH_ASSOC);
-		$datay= array('totalOfftime' => $row['totalOfftime']);
 
-		//total offline time per client
-		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', statistic.data as time FROM statistic 
-											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
-												WHERE typeid='~offline-length' GROUP BY machine.hostname ORDER BY cast(time AS UNSIGNED) DESC");
-		$datay[] = array('totalOfflineTimeClient' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datay['totalOfflineTimeClient'][] = array('client' => $row['hostname'], 'offTime' => $row['time']);
+		// TODO change AVG to median
+
+
+		// total time online, average time online, total  number of logins
+		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)), AVG(CAST(data AS UNSIGNED)), COUNT(*) FROM statistic WHERE typeid = '~session-length'");
+		$row = $res->fetch(PDO::FETCH_NUM);
+		$data = array('time' =>  $this->formatSeconds($row[0]), 'avgTime' =>  $this->formatSeconds($row[1]), 'totalLogins' => $row[2]);
+		//total time offline
+		$res = Database::simpleQUery("SELECT SUM(CAST(data AS UNSIGNED)) FROM statistic WHERE typeid='~offline-length'");
+		$row = $res->fetch(PDO::FETCH_NUM);
+		$data = array_merge($data, array('totalOfftime' => $this->formatSeconds($row[0])));
+
+		// per location
+		$res = Database::simpleQuery("SELECT t1.ln, timeSum, avgTime, offlineSum, loginCount FROM (
+													SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
+																		INNER JOIN location ON machine.locationid = location.locationid 
+													WHERE statistic.typeid = '~session-length' GROUP By location.locationname
+												) t1 INNER JOIN (
+											 		SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
+																		INNER JOIN location ON machine.locationid = location.locationid 
+													WHERE statistic.typeid = '~offline-length' GROUP By location.locationname
+												) t2 ON t1.ln = t2.ln");
+		$data[] = array('perLocation' => array());
+		while ($row = $res->fetch(PDO::FETCH_NUM)) {
+			$data['perLocation'][] = array('location' => $row[0], 'time' => $this->formatSeconds($row[1]), 'timeInSeconds' => $row[1],
+				'avgTime' => $this->formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => $this->formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4]);
 		}
 
-		// last logout of client
-		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', max(statistic.dateline) as datetime, statistic.data as loginTime
-												FROM statistic INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
-												WHERE typeid='~session-length' GROUP BY machine.hostname ORDER BY datetime DESC");
-		$datay[] = array('lastLogout' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datay['lastLogout'][] = array('client' => $row['hostname'], 'lastlogout' => date(DATE_RSS,$row['datetime']+$row['loginTime']), 'howLongOff' => (time() - ($row['datetime']+$row['loginTime'])));
+		// per client
+		$res = Database::simpleQuery("SELECT t1.name, timeSum, avgTime, offlineSum, loginCount, lastLogout, lastStart FROM (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(statistic.dateline) AS 'lastLogout'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
+													WHERE typeid = '~session-length' GROUP BY machine.machineuuid
+												) t1 INNER JOIN (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum', MAX(statistic.dateline) AS 'lastStart'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
+													WHERE typeid = '~offline-length' GROUP BY machine.machineuuid
+												) t2 ON t1.uuid = t2.uuid");
+		$data[] = array('perClient' => array());
+		while ($row = $res->fetch(PDO::FETCH_NUM)) {
+			$data['perClient'][] = array('hostname' => $row[0], 'time' => $this->formatSeconds($row[1]), 'timeInSeconds' => $row[1],
+				'avgTime' => $this->formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => $this->formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
+				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6]);
 		}
 
-		// last start of client
-		$res = Database::simpleQuery("SELECT machine.hostname AS 'hostname', max(statistic.dateline) as datetime FROM statistic 
-											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
-												WHERE typeid='~offline-length' GROUP BY machine.hostname ORDER BY datetime DESC");
-		$datay[] = array('lastLogin' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datay['lastLogin'][] = array('client' => $row['hostname'], 'lastlogin' => date(DATE_RSS,$row['datetime']));
+		// per user
+		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY username ORDER BY 2 DESC");
+		$data[] = array('perUser' => array());
+		while ($row = $res->fetch(PDO::FETCH_NUM)) {
+			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
 		}
 
-		//total time offline per room
-		$res = Database::simpleQuery("SELECT location.locationname AS 'room', statistic.data as time FROM statistic 
-											 	INNER JOIN machine ON statistic.machineuuid=machine.machineuuid
-											 	INNER JOIN location ON machine.locationid=location.locationid
-												WHERE typeid='~offline-length' GROUP BY room ORDER BY cast(time AS UNSIGNED) DESC");
-		$datay[] = array('offTimeRoom' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$datay['offTimeRoom'][] = array('room' => $row['room'], 'offTime' => $this->formatSeconds($row['time']));
+		// per vm
+		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY data ORDER BY 2 DESC");
+		$data[] = array('perVM' => array());
+		while ($row = $res->fetch(PDO::FETCH_NUM)) {
+			$data['perVM'][] = array('vm' => $row[0], 'loginCount' => $row[1]);
 		}
 
-		$data = array_merge($datax, $datay);
-		Render::addTemplate('_page', $data);
-	}
-
 
 
-	function formatSeconds($seconds) {
-		$seconds = $seconds * 1;
 
-		$minutes = floor($seconds / 60);
-		$hours = floor($minutes / 60);
-		$days = floor($hours / 24);
-
-		$seconds = $seconds % 60;
-		$minutes = $minutes % 60;
-		$hours = $hours % 24;
-
-		$format = '%u:%u:%02u:%02u';
-		$time = sprintf($format, $days, $hours, $minutes, $seconds);
-		return rtrim($time, '0');
+		Render::addTemplate('columnChooser');
+		Render::addTemplate('_page', $data);
 	}
 
 
+	protected function formatSeconds($seconds)
+	{
+		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
+	}
 }
diff --git a/modules-available/statistics_reporting/style.css b/modules-available/statistics_reporting/style.css
new file mode 100644
index 00000000..f0ee4fd3
--- /dev/null
+++ b/modules-available/statistics_reporting/style.css
@@ -0,0 +1,3 @@
+.top-row {
+    margin-bottom: 20px;
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
index 101a124e..720fb37a 100644
--- a/modules-available/statistics_reporting/templates/_page.html
+++ b/modules-available/statistics_reporting/templates/_page.html
@@ -1,138 +1,125 @@
-<div>
-	<table class="table table-condensed table-striped">
-		<tr>
-			<th>{{lang_totalLogins}}</th>
-		</tr>
-		<tr>
-			<td>{{totalLogins}}</td>
-		</tr>
-	</table>
-</div>
-
-<div>
-	<table class="table table-condensed table-striped">
-		<tr>
-			<th>{{lang_overallOfftime}}</th>
-		</tr>
-		<tr>
-			<td>{{totalOfftime}}</td>
-		</tr>
-	</table>
-</div>
-
-
-
-<div class="row">
-	<div class="col-md-3">
-		<table class="table table-condensed">
-			<tr>
-				<th>{{lang_client}}</th>
-				<th>{{lang_totalOffTime}}</th>
-			</tr>
-			{{#totalOfflineTimeClient}}
-			<tr>
-				<td>{{client}}</td>
-				<td>{{offTime}}</td>
-			</tr>
-			{{/totalOfflineTimeClient	}}
-		</table>
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-12">
+			<table id="table-total" class="table table-condensed table-striped">
+				<thead>
+					<tr>
+						<th class="text-left col-md-2"></th>
+						<th class="text-left column-totaltime">{{lang_totalTime}}</th>
+						<th class="text-left column-avgtime">{{lang_avgSessionLength}}</th>
+						<th class="text-left column-logincount">{{lang_totalLogins}}</th>
+						<th class="text-left column-timeoffline">{{lang_overallOfftime}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<th class="text-left">{{lang_total}}</th>
+						<td class="text-left column-totaltime">{{time}}</td>
+						<td class="text-left column-avgtime">{{avgTime}}</td>
+						<td class="text-left column-logincount">{{totalLogins}}</td>
+						<td class="text-left column-timeoffline">{{totalOfftime}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
 	</div>
-
-	<div class="col-md-3">
-		<table class="table table-condensed">
-			<tr>
-				<th>{{lang_client}}</th>
-				<th>{{lang_clientLogout}}</th>
-				<th>{{lang_offTime}}</th>
-			</tr>
-			{{#lastLogout}}
-			<tr>
-				<td>{{client}}</td>
-				<td>{{lastlogout}}</td>
-				<td>{{howLongOff}}</td>
-			</tr>
-			{{/lastLogout}}
-		</table>
+	<div class="row">
+		<div class="col-md-12">
+			<table id="table-perlocation" class="table table-condensed table-striped">
+				<thead>
+					<tr>
+						<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-avgtime">{{lang_avgSessionLength}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#perLocation}}
+					<tr>
+						<td class="text-left">{{location}}</td>
+						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
+						<td data-sort-value="{{avgTimeInSeconds}}" class="text-left column-avgtime">{{avgTime}}</td>
+						<td class="text-left column-logincount">{{loginCount}}</td>
+						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
+					</tr>
+					{{/perLocation}}
+				</tbody>
+			</table>
+		</div>
 	</div>
-
-	<div class="col-md-3">
-		<table class="table table-condensed">
-			<tr>
-				<th>{{lang_client}}</th>
-				<th>{{lang_clientStart}}</th>
-			</tr>
-			{{#lastLogin}}
-			<tr>
-				<td>{{client}}</td>
-				<td>{{lastlogin}}</td>
-			</tr>
-			{{/lastLogin}}
-		</table>
+	<div class="row">
+		<div class="col-md-12">
+			<table id="table-perclient" class="table table-condensed table-striped">
+				<thead>
+					<tr>
+						<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-avgtime">{{lang_avgSessionLength}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-laststart">{{lang_clientStart}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#perClient}}
+					<tr>
+						<td class="text-left">{{hostname}}</td>
+						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
+						<td data-sort-value="{{avgTimeInSeconds}}" class="text-left column-avgtime">{{avgTime}}</td>
+						<td class="text-left column-logincount">{{loginCount}}</td>
+						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
+						<td data-sort-value="{{lastLogoutUnixtime}}" class="text-left column-lastlogout">{{lastLogout}}</td>
+						<td data-sort-value="{{lastStartUnixtime}}" class="text-left column-laststart">{{lastStart}}</td>
+					</tr>
+					{{/perClient}}
+				</tbody>
+			</table>
+		</div>
 	</div>
-
-	<div class="col-md-3">
-		<table class="table table-condensed">
-			<tr>
-				<th>{{lang_room}}</th>
-				<th>{{lang_totalOffTime}}</th>
-			</tr>
-			{{#offTimeRoom}}
-			<tr>
-				<td>{{room}}</td>
-				<td>{{offTime}}</td>
-			</tr>
-			{{/offTimeRoom}}
-		</table>
+	<div class="row">
+		<div class="col-md-12">
+			<table id="table-peruser" class="table table-condensed table-striped">
+				<thead>
+				<tr>
+					<th data-sort="string" class="text-left col-md-4">{{lang_user}}</th>
+					<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+				</tr>
+				</thead>
+				<tbody>
+				{{#perUser}}
+				<tr>
+					<td class="text-left">{{user}}</td>
+					<td class="text-left column-logincount">{{loginCount}}</td>
+				</tr>
+				{{/perUser}}
+				</tbody>
+			</table>
+		</div>
 	</div>
-</div>
-
-
-
-
-<div class="row">
-	<div class="col-md-4">
-		<table class="table table-condensed">
-			<tr>
-				<th>{{lang_vm}}</th>
-				<th>{{lang_countLogins}}</th>
-			</tr>
-			{{#vmLogins}}
-			<tr>
-				<td>{{vmname}}</td>
-				<td>{{numLogins}}</td>
-			</tr>
-			{{/vmLogins}}
-		</table>
+	<div class="row">
+		<div class="col-md-12">
+			<table id="table-pervm" class="table table-condensed table-striped">
+				<thead>
+				<tr>
+					<th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th>
+					<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+				</tr>
+				</thead>
+				<tbody>
+				{{#perVM}}
+				<tr>
+					<td class="text-left">{{vm}}</td>
+					<td class="text-left column-logincount">{{loginCount}}</td>
+				</tr>
+				{{/perVM}}
+				</tbody>
+			</table>
+		</div>
 	</div>
+</div>
 
-	<div class="col-md-4">
-		<table class="table table-condensed table-striped">
-			<tr>
-				<th>{{lang_client}}</th>
-				<th>{{lang_countLogins}}</th>
-			</tr>
-			{{#machineLogins}}
-			<tr>
-				<td>{{client}}</td>
-				<td>{{numLogins}}</td>
-			</tr>
-			{{/machineLogins}}
-		</table>
-	</div>
 
-	<div class="col-md-4">
-		<table class="table table-condensed table-striped">
-			<tr>
-				<th>{{lang_user}}</th>
-				<th>{{lang_countLogins}}</th>
-			</tr>
-			{{#userLogins}}
-			<tr>
-				<td>{{username}}</td>
-				<td>{{numLogins}}</td>
-			</tr>
-			{{/userLogins}}
-		</table>
-	</div>
-</div>
 
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
new file mode 100644
index 00000000..62e20a4a
--- /dev/null
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -0,0 +1,47 @@
+<div class="container-fluid">
+	<div class="row top-row form-inline">
+		<div class="col-md-12 ">
+			<select id="select-table" onchange="chooseTable(this.value)" class="form-control" style="width:160px">
+				<option value="total" selected="selected">{{lang_total}}</option>
+				<option value="perlocation">{{lang_perlocation}}</option>
+				<option value="perclient">{{lang_perclient}}</option>
+				<option value="peruser">{{lang_peruser}}</option>
+				<option value="pervm">{{lang_pervm}}</option>
+			</select>
+			<div class="btn-group">
+				<button id="button-totaltime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('totaltime')">{{lang_totalTime}}</button>
+				<button id="button-avgtime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('avgtime')">{{lang_avgSessionLength}}</button>
+				<button id="button-logincount" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('logincount')">{{lang_totalLogins}}</button>
+				<button id="button-timeoffline" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('timeoffline')">{{lang_totalOffTime}}</button>
+				<button id="button-lastlogout" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('lastlogout')">{{lang_clientLogout}}</button>
+				<button id="button-laststart" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('laststart')">{{lang_clientStart}}</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+<script type="application/javascript">
+	document.addEventListener("DOMContentLoaded", function () {
+		chooseTable($('#select-table').val());
+		$("table").stupidtable();
+	});
+
+	function chooseTable(v) {
+		$("[id^=table-]").hide();
+		$('#table-'+v).show();
+	}
+
+	function toggleButton(v) {
+		$button = $('#button-'+v);
+		if($button.hasClass('btn-default')) {
+			$button.removeClass('btn-default');
+			$button.addClass('btn-primary');
+			$('.column-'+v).show()
+		} else {
+			$button.removeClass('btn-primary');
+			$button.addClass('btn-default');
+			$('.column-'+v).hide()
+		}
+	}
+</script>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From f9f365ffbc7457f706f759a40b7dd16e3ea8d753 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Thu, 1 Dec 2016 16:32:12 +0100
Subject: [statistics_reporting] moved functions to own file, improved language
 and variable naming

---
 .../inc/statisticreporting.inc.php                 | 64 ++++++++++++++++++++++
 .../lang/de/template-tags.json                     |  6 +-
 .../lang/en/template-tags.json                     |  6 +-
 .../statistics_reporting/page.inc.php              | 52 +++++-------------
 4 files changed, 83 insertions(+), 45 deletions(-)
 create mode 100644 modules-available/statistics_reporting/inc/statisticreporting.inc.php

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
new file mode 100644
index 00000000..5bfba04f
--- /dev/null
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -0,0 +1,64 @@
+<?php
+
+
+class StatisticReporting
+{
+	public static function getClientStatistics() {
+		$res = Database::simpleQuery("SELECT t1.name, timeSum, avgTime, offlineSum, loginCount, lastLogout, lastStart FROM (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(statistic.dateline + (statistic.data *1)) AS 'lastLogout'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
+													WHERE typeid = '~session-length' GROUP BY machine.machineuuid
+												) t1 INNER JOIN (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum', MAX(statistic.dateline) AS 'lastStart'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
+													WHERE typeid = '~offline-length' GROUP BY machine.machineuuid
+												) t2 ON t1.uuid = t2.uuid");
+		return $res;
+	}
+
+	public static function getLocationStatistics() {
+		$res = Database::simpleQuery("SELECT t1.ln, timeSum, avgTime, offlineSum, loginCount FROM (
+													SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
+																		INNER JOIN location ON machine.locationid = location.locationid 
+													WHERE statistic.typeid = '~session-length' GROUP By location.locationname
+												) t1 INNER JOIN (
+											 		SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum'
+													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
+																		INNER JOIN location ON machine.locationid = location.locationid 
+													WHERE statistic.typeid = '~offline-length' GROUP By location.locationname
+												) t2 ON t1.ln = t2.ln");
+		return $res;
+	}
+
+	public static function getUserStatistics() {
+		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY username ORDER BY 2 DESC");
+		return $res;
+	}
+
+	public static function getVMStatistics() {
+		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY data ORDER BY 2 DESC");
+		return $res;
+	}
+
+	public static function getOverallStatistics () {
+		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)), AVG(CAST(data AS UNSIGNED)), COUNT(*) FROM statistic WHERE typeid = '~session-length'");
+		return $res;
+	}
+
+	public static function getTotalOffline() {
+		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)) FROM statistic WHERE typeid='~offline-length'");
+		return $res;
+	}
+
+
+
+
+
+
+	public static function formatSeconds($seconds)
+	{
+		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
+	}
+
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 2a9688b2..db3e9f11 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -4,10 +4,10 @@
     "lang_client": "Client",
     "lang_vm": "VM",
     "lang_totalLogins": "Gesamt Logins",
-    "lang_overallOfftime": "Gesamtzeit Offline",
+    "lang_overallOfftime": "Insgesamte Zeit Offline",
     "lang_totalOffTime": "Gesamtzeit Offline",
-    "lang_clientLogout": "Letzter Logout",
-    "lang_clientStart": "Letzter Client Start",
+    "lang_clientLogout": "Letzter VM Logout",
+    "lang_clientStart": "Letzter Client Boot",
     "lang_room": "Raum",
     "lang_offTime": "Zeit seit Logout",
     "lang_total": "Gesamt",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index cfbf3ad8..7a7ff13a 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -5,9 +5,9 @@
     "lang_vm": "VM",
     "lang_totalLogins": "Total Logins",
     "lang_overallOfftime": "Overall time offline",
-    "lang_totalOffTime": "Time offline",
-    "lang_clientLogout": "Last Logout",
-    "lang_clientStart": "Last Client Start",
+    "lang_totalOffTime": "Total time offline",
+    "lang_clientLogout": "Last VM Logout",
+    "lang_clientStart": "Last Client Boot",
     "lang_room": "Room",
     "lang_offTime": "Time since offline",
     "lang_total": "Total",
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 6d3c2ae3..aaf191df 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -24,79 +24,53 @@ class Page_Statistics_Reporting extends Page
 		// TODO: got empty machine with alot of logins. isn't shown in the inner-join hostname query below.
 		// $res = Database::simpleQuery("SELECT machineuuid as 'hostname', COUNT(*) AS 'count' FROM statistic WHERE typeid='~session-length' GROUP BY machineuuid ORDER BY 2 DESC");
 
-		// TODO: session-length liefert 3000 Einträge mehr als vmchooser-session?
+		// TODO: session-length liefert 3000 Einträge mehr als vmchooser-session? (logins ohne ausgewählter VM -> Session endet trotzdem mit session-length Meldung)
 
 		// TODO change AVG to median
 
 
 		// total time online, average time online, total  number of logins
-		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)), AVG(CAST(data AS UNSIGNED)), COUNT(*) FROM statistic WHERE typeid = '~session-length'");
+		$res = StatisticReporting::getOverallStatistics();
 		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array('time' =>  $this->formatSeconds($row[0]), 'avgTime' =>  $this->formatSeconds($row[1]), 'totalLogins' => $row[2]);
+		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'avgTime' =>  StatisticReporting::formatSeconds($row[1]), 'totalLogins' => $row[2]);
 		//total time offline
-		$res = Database::simpleQUery("SELECT SUM(CAST(data AS UNSIGNED)) FROM statistic WHERE typeid='~offline-length'");
+		$res = StatisticReporting::getTotalOffline();
 		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array_merge($data, array('totalOfftime' => $this->formatSeconds($row[0])));
+		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row[0])));
 
 		// per location
-		$res = Database::simpleQuery("SELECT t1.ln, timeSum, avgTime, offlineSum, loginCount FROM (
-													SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount'
-													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
-																		INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE statistic.typeid = '~session-length' GROUP By location.locationname
-												) t1 INNER JOIN (
-											 		SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum'
-													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
-																		INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE statistic.typeid = '~offline-length' GROUP By location.locationname
-												) t2 ON t1.ln = t2.ln");
+		$res = StatisticReporting::getLocationStatistics();
 		$data[] = array('perLocation' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perLocation'][] = array('location' => $row[0], 'time' => $this->formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'avgTime' => $this->formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => $this->formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4]);
+			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
+				'avgTime' => StatisticReporting::formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4]);
 		}
 
 		// per client
-		$res = Database::simpleQuery("SELECT t1.name, timeSum, avgTime, offlineSum, loginCount, lastLogout, lastStart FROM (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(statistic.dateline) AS 'lastLogout'
-													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
-													WHERE typeid = '~session-length' GROUP BY machine.machineuuid
-												) t1 INNER JOIN (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum', MAX(statistic.dateline) AS 'lastStart'
-													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
-													WHERE typeid = '~offline-length' GROUP BY machine.machineuuid
-												) t2 ON t1.uuid = t2.uuid");
+		$res = StatisticReporting::getClientStatistics();
 		$data[] = array('perClient' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perClient'][] = array('hostname' => $row[0], 'time' => $this->formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'avgTime' => $this->formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => $this->formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
+			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
+				'avgTime' => StatisticReporting::formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
 				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6]);
 		}
 
 		// per user
-		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY username ORDER BY 2 DESC");
+		$res = StatisticReporting::getUserStatistics();
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
 		}
 
 		// per vm
-		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY data ORDER BY 2 DESC");
+		$res = StatisticReporting::getVMStatistics();
 		$data[] = array('perVM' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perVM'][] = array('vm' => $row[0], 'loginCount' => $row[1]);
 		}
 
 
-
-
 		Render::addTemplate('columnChooser');
 		Render::addTemplate('_page', $data);
 	}
-
-
-	protected function formatSeconds($seconds)
-	{
-		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
-	}
 }
-- 
cgit v1.2.3-55-g7522


From b8e32e237af996a598207fec6ca2268628d91d69 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 6 Dec 2016 15:56:04 +0100
Subject: [statistics_reporting] Added time bounds and time cutoff possibility.

---
 .../inc/statisticreporting.inc.php                 | 74 +++++++++++++++-------
 .../statistics_reporting/page.inc.php              | 29 +++++----
 2 files changed, 66 insertions(+), 37 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 5bfba04f..a1a209d8 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -3,59 +3,87 @@
 
 class StatisticReporting
 {
-	public static function getClientStatistics() {
+
+	public static function getClientStatistics($cutOffTimeInSeconds) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		// time bounds (8,22 means from 8 o clock to 22 o clock)
+		$lowerBound = 8;
+		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT t1.name, timeSum, avgTime, offlineSum, loginCount, lastLogout, lastStart FROM (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(statistic.dateline + (statistic.data *1)) AS 'lastLogout'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
-													WHERE typeid = '~session-length' GROUP BY machine.machineuuid
+													WHERE typeid = '~session-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													GROUP BY machine.machineuuid
 												) t1 INNER JOIN (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum', MAX(statistic.dateline) AS 'lastStart'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
-													WHERE typeid = '~offline-length' GROUP BY machine.machineuuid
+													WHERE typeid = '~offline-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													GROUP BY machine.machineuuid
 												) t2 ON t1.uuid = t2.uuid");
 		return $res;
 	}
 
-	public static function getLocationStatistics() {
-		$res = Database::simpleQuery("SELECT t1.ln, timeSum, avgTime, offlineSum, loginCount FROM (
-													SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount'
+	public static function getLocationStatistics($cutOffTimeInSeconds) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		// time bounds (8,22 means from 8 o clock to 22 o clock)
+		$lowerBound = 8;
+		$upperBound = 22;
+		$res = Database::simpleQuery("SELECT t1.locName, timeSum, avgTime, offlineSum, loginCount FROM (
+													SELECT location.locationname AS 'locName', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
 																		INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE statistic.typeid = '~session-length' GROUP By location.locationname
+													WHERE statistic.typeid = '~session-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													GROUP By location.locationname
 												) t1 INNER JOIN (
-											 		SELECT location.locationname AS 'ln', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum'
+											 		SELECT location.locationname AS 'locName', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
 																		INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE statistic.typeid = '~offline-length' GROUP By location.locationname
-												) t2 ON t1.ln = t2.ln");
+													WHERE statistic.typeid = '~offline-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													GROUP By location.locationname
+												) t2 ON t1.locName = t2.locName");
 		return $res;
 	}
 
-	public static function getUserStatistics() {
-		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY username ORDER BY 2 DESC");
+	public static function getUserStatistics($cutOffTimeInSeconds) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		// time bounds (8,22 means from 8 o clock to 22 o clock)
+		$lowerBound = 8;
+		$upperBound = 22;
+		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
+												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound)) GROUP BY username ORDER BY 2 DESC");
 		return $res;
 	}
 
-	public static function getVMStatistics() {
-		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' GROUP BY data ORDER BY 2 DESC");
+	public static function getVMStatistics($cutOffTimeInSeconds) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		// time bounds (8,22 means from 8 o clock to 22 o clock)
+		$lowerBound = 8;
+		$upperBound = 22;
+		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
+												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound)) GROUP BY data ORDER BY 2 DESC");
 		return $res;
 	}
 
-	public static function getOverallStatistics () {
-		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)), AVG(CAST(data AS UNSIGNED)), COUNT(*) FROM statistic WHERE typeid = '~session-length'");
+	public static function getOverallStatistics ($cutOffTimeInSeconds) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		// time bounds (8,22 means from 8 o clock to 22 o clock)
+		$lowerBound = 8;
+		$upperBound = 22;
+		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)), AVG(CAST(data AS UNSIGNED)), COUNT(*) FROM statistic WHERE typeid = '~session-length' AND dateline>=$queryTime
+												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))");
 		return $res;
 	}
 
-	public static function getTotalOffline() {
-		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)) FROM statistic WHERE typeid='~offline-length'");
+	public static function getTotalOfflineStatistics($cutOffTimeInSeconds) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		// time bounds (8,22 means from 8 o clock to 22 o clock)
+		$lowerBound = 8;
+		$upperBound = 22;
+		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)) FROM statistic WHERE typeid='~offline-length' AND dateline>=$queryTime
+												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))");
 		return $res;
 	}
 
-
-
-
-
-
 	public static function formatSeconds($seconds)
 	{
 		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index aaf191df..e009317c 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -3,6 +3,9 @@
 class Page_Statistics_Reporting extends Page
 {
 
+	private $cutOffTimer;
+
+
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
 	 */
@@ -21,25 +24,24 @@ class Page_Statistics_Reporting extends Page
 	 */
 	protected function doRender()
 	{
-		// TODO: got empty machine with alot of logins. isn't shown in the inner-join hostname query below.
-		// $res = Database::simpleQuery("SELECT machineuuid as 'hostname', COUNT(*) AS 'count' FROM statistic WHERE typeid='~session-length' GROUP BY machineuuid ORDER BY 2 DESC");
-
-		// TODO: session-length liefert 3000 Einträge mehr als vmchooser-session? (logins ohne ausgewählter VM -> Session endet trotzdem mit session-length Meldung)
-
-		// TODO change AVG to median
+		// timespan you want to see = Days selected * seconds per Day
+		// default = 14 days
+		$cutOff = Request::get('cutoff', 14, 'int');
+		$chooserData = array('cutoff' => $cutOff);
+		$this->cutOffTimer = $cutOff * 86400;
 
 
 		// total time online, average time online, total  number of logins
-		$res = StatisticReporting::getOverallStatistics();
+		$res = StatisticReporting::getOverallStatistics($this->cutOffTimer);
 		$row = $res->fetch(PDO::FETCH_NUM);
 		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'avgTime' =>  StatisticReporting::formatSeconds($row[1]), 'totalLogins' => $row[2]);
 		//total time offline
-		$res = StatisticReporting::getTotalOffline();
+		$res = StatisticReporting::getTotalOfflineStatistics($this->cutOffTimer);
 		$row = $res->fetch(PDO::FETCH_NUM);
 		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row[0])));
 
 		// per location
-		$res = StatisticReporting::getLocationStatistics();
+		$res = StatisticReporting::getLocationStatistics($this->cutOffTimer);
 		$data[] = array('perLocation' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
@@ -47,7 +49,7 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		// per client
-		$res = StatisticReporting::getClientStatistics();
+		$res = StatisticReporting::getClientStatistics($this->cutOffTimer);
 		$data[] = array('perClient' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
@@ -56,21 +58,20 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		// per user
-		$res = StatisticReporting::getUserStatistics();
+		$res = StatisticReporting::getUserStatistics($this->cutOffTimer);
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
 		}
 
 		// per vm
-		$res = StatisticReporting::getVMStatistics();
+		$res = StatisticReporting::getVMStatistics($this->cutOffTimer);
 		$data[] = array('perVM' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perVM'][] = array('vm' => $row[0], 'loginCount' => $row[1]);
 		}
 
-
-		Render::addTemplate('columnChooser');
+		Render::addTemplate('columnChooser', $chooserData);
 		Render::addTemplate('_page', $data);
 	}
 }
-- 
cgit v1.2.3-55-g7522


From 8c57a58760c716fa2ad8387ef8ba4eaac8b741a6 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 12 Dec 2016 18:30:28 +0100
Subject: [statistics_reporting] edited time bound possibility

---
 .../inc/statisticreporting.inc.php                 | 52 +++++++++-------------
 .../statistics_reporting/page.inc.php              | 28 ++++++------
 2 files changed, 35 insertions(+), 45 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index a1a209d8..69a4d516 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -4,83 +4,71 @@
 class StatisticReporting
 {
 
-	public static function getClientStatistics($cutOffTimeInSeconds) {
+	public static function getClientStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		// time bounds (8,22 means from 8 o clock to 22 o clock)
-		$lowerBound = 8;
-		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT t1.name, timeSum, avgTime, offlineSum, loginCount, lastLogout, lastStart FROM (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(statistic.dateline + (statistic.data *1)) AS 'lastLogout'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
-													WHERE typeid = '~session-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													WHERE typeid = '~session-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline+statistic.data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
 													GROUP BY machine.machineuuid
 												) t1 INNER JOIN (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum', MAX(statistic.dateline) AS 'lastStart'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
-													WHERE typeid = '~offline-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													WHERE typeid = '~offline-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline+statistic.data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
 													GROUP BY machine.machineuuid
 												) t2 ON t1.uuid = t2.uuid");
 		return $res;
 	}
 
-	public static function getLocationStatistics($cutOffTimeInSeconds) {
+	public static function getLocationStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		// time bounds (8,22 means from 8 o clock to 22 o clock)
-		$lowerBound = 8;
-		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT t1.locName, timeSum, avgTime, offlineSum, loginCount FROM (
 													SELECT location.locationname AS 'locName', SUM(CAST(statistic.data AS UNSIGNED)) AS 'timeSum', AVG(CAST(statistic.data AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
 																		INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE statistic.typeid = '~session-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													WHERE statistic.typeid = '~session-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline+statistic.data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
 													GROUP By location.locationname
 												) t1 INNER JOIN (
 											 		SELECT location.locationname AS 'locName', SUM(CAST(statistic.data AS UNSIGNED)) AS 'offlineSum'
 													FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
 																		INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE statistic.typeid = '~offline-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))
+													WHERE statistic.typeid = '~offline-length' AND dateline>=$queryTime AND ((FROM_UNIXTIME(dateline+statistic.data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
 													GROUP By location.locationname
 												) t2 ON t1.locName = t2.locName");
 		return $res;
 	}
 
-	public static function getUserStatistics($cutOffTimeInSeconds) {
+	// logins between bounds
+	public static function getUserStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		// time bounds (8,22 means from 8 o clock to 22 o clock)
-		$lowerBound = 8;
-		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
-												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound)) GROUP BY username ORDER BY 2 DESC");
+												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) GROUP BY username ORDER BY 2 DESC");
 		return $res;
 	}
 
-	public static function getVMStatistics($cutOffTimeInSeconds) {
+	// vm logins between bounds
+	public static function getVMStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		// time bounds (8,22 means from 8 o clock to 22 o clock)
-		$lowerBound = 8;
-		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
-												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound)) GROUP BY data ORDER BY 2 DESC");
+												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) GROUP BY data ORDER BY 2 DESC");
 		return $res;
 	}
 
-	public static function getOverallStatistics ($cutOffTimeInSeconds) {
+	// AND(betweenBounds OR <lower but goes into bound OR > upper but begins in bound					)
+	public static function getOverallStatistics ($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		// time bounds (8,22 means from 8 o clock to 22 o clock)
-		$lowerBound = 8;
-		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)), AVG(CAST(data AS UNSIGNED)), COUNT(*) FROM statistic WHERE typeid = '~session-length' AND dateline>=$queryTime
-												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))");
+												AND (((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
+																											)
+												
+												");
 		return $res;
 	}
 
-	public static function getTotalOfflineStatistics($cutOffTimeInSeconds) {
+	public static function getTotalOfflineStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		// time bounds (8,22 means from 8 o clock to 22 o clock)
-		$lowerBound = 8;
-		$upperBound = 22;
 		$res = Database::simpleQuery("SELECT SUM(CAST(data AS UNSIGNED)) FROM statistic WHERE typeid='~offline-length' AND dateline>=$queryTime
-												AND ((FROM_UNIXTIME(dateline, '%H')*1 >= $lowerBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperBound))");
+												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))");
 		return $res;
 	}
 
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index e009317c..9417d2da 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -1,11 +1,9 @@
 <?php
 
+
 class Page_Statistics_Reporting extends Page
 {
 
-	private $cutOffTimer;
-
-
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
 	 */
@@ -24,24 +22,28 @@ class Page_Statistics_Reporting extends Page
 	 */
 	protected function doRender()
 	{
-		// timespan you want to see = Days selected * seconds per Day
+		// timespan you want to see = Days selected * seconds per Day (86400)
 		// default = 14 days
 		$cutOff = Request::get('cutoff', 14, 'int');
-		$chooserData = array('cutoff' => $cutOff);
-		$this->cutOffTimer = $cutOff * 86400;
+		$cutOffTimer = $cutOff * 86400;
+
+		$lowerTimeBound = Request::get('lower', 0, 'int');
+
+		$upperTimeBound = Request::get('upper', 24, 'int');
 
 
 		// total time online, average time online, total  number of logins
-		$res = StatisticReporting::getOverallStatistics($this->cutOffTimer);
+		$res = StatisticReporting::getOverallStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
 		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'avgTime' =>  StatisticReporting::formatSeconds($row[1]), 'totalLogins' => $row[2]);
+
 		//total time offline
-		$res = StatisticReporting::getTotalOfflineStatistics($this->cutOffTimer);
+		$res = StatisticReporting::getTotalOfflineStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
 		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row[0])));
 
 		// per location
-		$res = StatisticReporting::getLocationStatistics($this->cutOffTimer);
+		$res = StatisticReporting::getLocationStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perLocation' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
@@ -49,7 +51,7 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		// per client
-		$res = StatisticReporting::getClientStatistics($this->cutOffTimer);
+		$res = StatisticReporting::getClientStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perClient' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
@@ -58,20 +60,20 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		// per user
-		$res = StatisticReporting::getUserStatistics($this->cutOffTimer);
+		$res = StatisticReporting::getUserStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
 		}
 
 		// per vm
-		$res = StatisticReporting::getVMStatistics($this->cutOffTimer);
+		$res = StatisticReporting::getVMStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perVM' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perVM'][] = array('vm' => $row[0], 'loginCount' => $row[1]);
 		}
 
-		Render::addTemplate('columnChooser', $chooserData);
+		Render::addTemplate('columnChooser');
 		Render::addTemplate('_page', $data);
 	}
 }
-- 
cgit v1.2.3-55-g7522


From b8e485583f7df8e1c911215832194d69cc564574 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 20 Dec 2016 15:23:28 +0100
Subject: [statistics_reporting] filtered sessions with short length (<60secs),
 logins on machines without locationid are now shown

---
 .../inc/statisticreporting.inc.php                 | 52 +++++++++++++++++-----
 .../statistics_reporting/page.inc.php              |  2 +-
 2 files changed, 42 insertions(+), 12 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 7652bbdc..0e6039bb 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -10,7 +10,7 @@ class StatisticReporting
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', AVG(CAST(sessionTable.length AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
-													WHERE sessionTable.dateline>=$queryTime
+													WHERE sessionTable.dateline>=$queryTime AND sessionTable.data >= 60
 													GROUP BY machine.machineuuid
 												) t1 INNER JOIN (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum', MAX(offlineTable.dateline) AS 'lastStart'
@@ -26,17 +26,17 @@ class StatisticReporting
 		$queryTime = time() - $cutOffTimeInSeconds;
 
 		$res = Database::simpleQuery("SELECT t1.locName, timeSum, avgTime, offlineSum, loginCount FROM (
-													SELECT location.locationname AS 'locName', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', AVG(CAST(sessionTable.length AS UNSIGNED)) AS 'avgTime', COUNT(sessionTable.length) AS 'loginCount'
+													SELECT IFNULL(location.locationname, '') AS 'locName', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', AVG(CAST(sessionTable.length AS UNSIGNED)) AS 'avgTime', COUNT(sessionTable.length) AS 'loginCount'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
-														INNER JOIN location ON machine.locationid = location.locationid 
-													WHERE sessionTable.dateline >= $queryTime
+														LEFT JOIN location ON machine.locationid = location.locationid 
+													WHERE sessionTable.dateline >= $queryTime AND sessionTable.data >= 60
 													GROUP By location.locationname
 												) t1 INNER JOIN (
-											 		SELECT location.locationname AS 'locName', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
+											 		SELECT IFNULL(location.locationname, '') AS 'locName', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
 													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound)." offlineTable
 														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
-														INNER JOIN location ON machine.locationid = location.locationid 
+														LEFT JOIN location ON machine.locationid = location.locationid 
 													WHERE offlineTable.dateline >= $queryTime
 													GROUP By location.locationname
 												) t2 ON t1.locName = t2.locName");
@@ -46,8 +46,11 @@ class StatisticReporting
 	// logins between bounds
 	public static function getUserStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
-												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) GROUP BY username ORDER BY 2 DESC");
+		$res = Database::simpleQuery("SELECT username, data, COUNT(*) AS 'count' 
+												FROM statistic 
+												WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
+														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
+												GROUP BY username, data ORDER BY 3 DESC");
 		return $res;
 	}
 
@@ -64,7 +67,7 @@ class StatisticReporting
 		$queryTime = time() - $cutOffTimeInSeconds;
 		$res = Database::simpleQuery("SELECT SUM(CAST(sessionTable.length AS UNSIGNED)), AVG(CAST(sessionTable.length AS UNSIGNED)), COUNT(*)
 											 	FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
-											 	WHERE sessionTable.dateline>=$queryTime");
+											 	WHERE sessionTable.dateline>=$queryTime AND sessionTable.data >= 60");
 		return $res;
 	}
 
@@ -76,6 +79,35 @@ class StatisticReporting
 		return $res;
 	}
 
+	// TODO: Short Sessions in Tabelle einbauen
+	public static function getShortSessionsTotal($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		$res = Database::simpleQuery("SELECT COUNT(*) FROM statistic WHERE typeid='~session-length' AND data < 60 AND dateline>=$queryTime
+												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))");
+		return $res;
+	}
+
+	public static function getShortSessionsPerLocation ($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		$res = Database::simpleQuery("SELECT location.locationname, COUNT(*) 
+																	 	FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid 
+																							INNER JOIN location ON machine.locationid = location.locationid 
+ 																		WHERE statistic.typeid='~session-length' AND statistic.data < 60 AND dateline>=$queryTime
+																				AND ((FROM_UNIXTIME(dateline+statistic.data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
+ 																		GROUP BY location.locationname");
+		return $res;
+	}
+
+	public static function getShortSessionsPerClient ($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$queryTime = time() - $cutOffTimeInSeconds;
+		$res = Database::simpleQuery("SELECT machine.hostname, COUNT(*) 
+																	 FROM statistic INNER JOIN machine ON statistic.machineuuid = machine.machineuuid
+ 																	 WHERE statistic.typeid='~session-length' AND statistic.data < 60 AND dateline>=$queryTime
+																	 		AND ((FROM_UNIXTIME(dateline+statistic.data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
+ 																	 GROUP BY machine.hostname");
+		return $res;
+	}
+
 	public static function formatSeconds($seconds)
 	{
 		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
@@ -149,7 +181,5 @@ class StatisticReporting
 		";
 		return "(".$queryString.")";
 	}
-
-
 }
 
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 9417d2da..6392dd19 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -63,7 +63,7 @@ class Page_Statistics_Reporting extends Page
 		$res = StatisticReporting::getUserStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
+			$data['perUser'][] = array('user' => $row[0], 'vm' => $row[1], 'loginCount' => $row[2]);
 		}
 
 		// per vm
-- 
cgit v1.2.3-55-g7522


From b5b20494741a721eae44c1afea8369437d8ce97e Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 20 Dec 2016 16:09:55 +0100
Subject: [statistics_reporting] deleted vm per user (for udo) after adding it
 last commit

---
 modules-available/statistics_reporting/inc/statisticreporting.inc.php | 4 ++--
 modules-available/statistics_reporting/page.inc.php                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 0e6039bb..c9fe1c64 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -46,11 +46,11 @@ class StatisticReporting
 	// logins between bounds
 	public static function getUserStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		$res = Database::simpleQuery("SELECT username, data, COUNT(*) AS 'count' 
+		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' 
 												FROM statistic 
 												WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
 														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
-												GROUP BY username, data ORDER BY 3 DESC");
+												GROUP BY username ORDER BY 2 DESC");
 		return $res;
 	}
 
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 6392dd19..9417d2da 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -63,7 +63,7 @@ class Page_Statistics_Reporting extends Page
 		$res = StatisticReporting::getUserStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perUser'][] = array('user' => $row[0], 'vm' => $row[1], 'loginCount' => $row[2]);
+			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
 		}
 
 		// per vm
-- 
cgit v1.2.3-55-g7522


From f74dfc9488cf4733b18a11b90307183bafbc01f8 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 22 Dec 2016 13:59:12 +0100
Subject: [statistics_reporting] changed average to median

---
 .../inc/statisticreporting.inc.php                 | 26 +++++++++++++++++-----
 .../lang/de/template-tags.json                     |  2 +-
 .../lang/en/template-tags.json                     |  2 +-
 .../statistics_reporting/page.inc.php              |  8 ++++---
 .../statistics_reporting/templates/_page.html      | 12 +++++-----
 .../templates/columnChooser.html                   |  2 +-
 6 files changed, 34 insertions(+), 18 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 9212a09c..d98ec168 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -6,8 +6,8 @@ class StatisticReporting
 
 	public static function getClientStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		$res = Database::simpleQuery("SELECT t1.name, timeSum, avgTime, offlineSum, loginCount, lastLogout, lastStart, shortSessions FROM (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', AVG(CAST(sessionTable.length AS UNSIGNED)) AS 'avgTime', COUNT(*) AS 'loginCount', MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout'
+		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, loginCount, lastLogout, lastStart, shortSessions FROM (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', COUNT(*) AS 'loginCount', MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
 													WHERE sessionTable.dateline>=$queryTime AND sessionTable.data >= 60
@@ -37,8 +37,8 @@ class StatisticReporting
 	public static function getLocationStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
 
-		$res = Database::simpleQuery("SELECT t1.locName, timeSum, avgTime, offlineSum, loginCount, shortSessions FROM (
-													SELECT IFNULL(location.locationname, '') AS 'locName', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', AVG(CAST(sessionTable.length AS UNSIGNED)) AS 'avgTime', COUNT(sessionTable.length) AS 'loginCount'
+		$res = Database::simpleQuery("SELECT t1.locName, timeSum, medianTime, offlineSum, loginCount, shortSessions FROM (
+													SELECT IFNULL(location.locationname, '') AS 'locName', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', COUNT(sessionTable.length) AS 'loginCount'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
@@ -87,8 +87,8 @@ class StatisticReporting
 
 	public static function getOverallStatistics ($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		$res = Database::simpleQuery("SELECT sum, avg, countLong, countShort FROM
-												(	SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, AVG(CAST(sessionTable.length AS UNSIGNED)) AS avg, COUNT(*) AS countLong
+		$res = Database::simpleQuery("SELECT sum, median, countLong, countShort FROM
+												(	SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, COUNT(*) AS countLong
 											 		FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 											 		WHERE sessionTable.dateline>=$queryTime AND sessionTable.data >= 60
 											 	) 	t1 
@@ -113,6 +113,20 @@ class StatisticReporting
 		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
 	}
 
+	public static function calcMedian($string) {
+		$arr = explode(",", $string);
+		sort($arr, SORT_NUMERIC);
+		$count = count($arr); //total numbers in array
+		$middleval = floor(($count-1)/2); // find the middle value, or the lowest middle value
+		if($count % 2) { // odd number, middle is the median
+			$median = $arr[(int) $middleval];
+		} else { // even number, calculate avg of 2 medians
+			$low = $arr[(int) $middleval];
+			$high = $arr[(int) $middleval+1];
+			$median = (($low+$high)/2);
+		}
+		return round($median);
+	}
 
 	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound)
 	{
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index f2500db0..c5494205 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -17,7 +17,7 @@
     "lang_pervm": "Pro VM",
     "lang_hostname": "Client Name",
     "lang_location": "Raum",
-    "lang_avgSessionLength": "Durchschnittliche Sitzungsdauer",
+    "lang_medianSessionLength": "Mittlere Sitzungsdauer",
     "lang_totalTime": "Gesamte Zeit",
     "lang_last1": "Letzten 24 Stunden",
     "lang_last2": "Letzten 48 Stunden",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 8fa97719..de91621f 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -17,7 +17,7 @@
     "lang_pervm": "Per VM",
     "lang_hostname": "Client Name",
     "lang_location": "Location",
-    "lang_avgSessionLength": "Average Session Length",
+    "lang_medianSessionLength": "Median Session Length",
     "lang_totalTime": "Total Time",
     "lang_last1": "Last 24 hours",
     "lang_last2": "Last 48 hours",
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 9417d2da..0dd4f243 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -35,7 +35,7 @@ class Page_Statistics_Reporting extends Page
 		// total time online, average time online, total  number of logins
 		$res = StatisticReporting::getOverallStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'avgTime' =>  StatisticReporting::formatSeconds($row[1]), 'totalLogins' => $row[2]);
+		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'totalLogins' => $row[2]);
 
 		//total time offline
 		$res = StatisticReporting::getTotalOfflineStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
@@ -46,16 +46,18 @@ class Page_Statistics_Reporting extends Page
 		$res = StatisticReporting::getLocationStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perLocation' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
+			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'avgTime' => StatisticReporting::formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4]);
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4]);
 		}
 
 		// per client
 		$res = StatisticReporting::getClientStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perClient' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
+			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'avgTime' => StatisticReporting::formatSeconds($row[2]), 'avgTimeInSeconds' => $row[2], 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
 				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6]);
 		}
 
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
index 720fb37a..7cfb424c 100644
--- a/modules-available/statistics_reporting/templates/_page.html
+++ b/modules-available/statistics_reporting/templates/_page.html
@@ -6,7 +6,7 @@
 					<tr>
 						<th class="text-left col-md-2"></th>
 						<th class="text-left column-totaltime">{{lang_totalTime}}</th>
-						<th class="text-left column-avgtime">{{lang_avgSessionLength}}</th>
+						<th class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
 						<th class="text-left column-logincount">{{lang_totalLogins}}</th>
 						<th class="text-left column-timeoffline">{{lang_overallOfftime}}</th>
 					</tr>
@@ -15,7 +15,7 @@
 					<tr>
 						<th class="text-left">{{lang_total}}</th>
 						<td class="text-left column-totaltime">{{time}}</td>
-						<td class="text-left column-avgtime">{{avgTime}}</td>
+						<td class="text-left column-mediantime">{{medianTime}}</td>
 						<td class="text-left column-logincount">{{totalLogins}}</td>
 						<td class="text-left column-timeoffline">{{totalOfftime}}</td>
 					</tr>
@@ -30,7 +30,7 @@
 					<tr>
 						<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-avgtime">{{lang_avgSessionLength}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
 					</tr>
@@ -40,7 +40,7 @@
 					<tr>
 						<td class="text-left">{{location}}</td>
 						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
-						<td data-sort-value="{{avgTimeInSeconds}}" class="text-left column-avgtime">{{avgTime}}</td>
+						<td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td>
 						<td class="text-left column-logincount">{{loginCount}}</td>
 						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
 					</tr>
@@ -56,7 +56,7 @@
 					<tr>
 						<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-avgtime">{{lang_avgSessionLength}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th>
@@ -68,7 +68,7 @@
 					<tr>
 						<td class="text-left">{{hostname}}</td>
 						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
-						<td data-sort-value="{{avgTimeInSeconds}}" class="text-left column-avgtime">{{avgTime}}</td>
+						<td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td>
 						<td class="text-left column-logincount">{{loginCount}}</td>
 						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
 						<td data-sort-value="{{lastLogoutUnixtime}}" class="text-left column-lastlogout">{{lastLogout}}</td>
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 319f9702..d79f542b 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -25,7 +25,7 @@
 		</div>
 		<div class="col-md-12 buttonbar">
 			<button id="button-totaltime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('totaltime')">{{lang_totalTime}}</button>
-			<button id="button-avgtime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('avgtime')">{{lang_avgSessionLength}}</button>
+			<button id="button-mediantime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('mediantime')">{{lang_medianSessionLength}}</button>
 			<button id="button-logincount" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('logincount')">{{lang_totalLogins}}</button>
 			<button id="button-timeoffline" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('timeoffline')">{{lang_totalOffTime}}</button>
 			<button id="button-lastlogout" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('lastlogout')">{{lang_clientLogout}}</button>
-- 
cgit v1.2.3-55-g7522


From 47a8eebcda2c841193420e6e7bb5ec847940f753 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Thu, 22 Dec 2016 14:03:29 +0100
Subject: [statistics_reporting] better variable names

---
 .../statistics_reporting/inc/statisticreporting.inc.php             | 6 +++---
 modules-available/statistics_reporting/page.inc.php                 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index d98ec168..2c4acaf1 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -87,13 +87,13 @@ class StatisticReporting
 
 	public static function getOverallStatistics ($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$queryTime = time() - $cutOffTimeInSeconds;
-		$res = Database::simpleQuery("SELECT sum, median, countLong, countShort FROM
-												(	SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, COUNT(*) AS countLong
+		$res = Database::simpleQuery("SELECT sum, median, longSessions, shortSessions FROM
+												(	SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, COUNT(*) AS longSessions
 											 		FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 											 		WHERE sessionTable.dateline>=$queryTime AND sessionTable.data >= 60
 											 	) 	t1 
 											 	INNER JOIN
-											 	(	SELECT COUNT(sessionTable.length) as countShort
+											 	(	SELECT COUNT(sessionTable.length) as shortSessions
 											 		FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound)." sessionTable
 											 		WHERE sessionTable.dateline>=$queryTime AND sessionTable.data < 60
 											 	) 	t2");
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 0dd4f243..de13cdb3 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -35,7 +35,7 @@ class Page_Statistics_Reporting extends Page
 		// total time online, average time online, total  number of logins
 		$res = StatisticReporting::getOverallStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'totalLogins' => $row[2]);
+		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'totalLogins' => $row[2], 'shortSessions' => $row[3]);
 
 		//total time offline
 		$res = StatisticReporting::getTotalOfflineStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
@@ -48,7 +48,7 @@ class Page_Statistics_Reporting extends Page
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4]);
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4], 'shortSessions' => $row[5]);
 		}
 
 		// per client
@@ -58,7 +58,7 @@ class Page_Statistics_Reporting extends Page
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
 				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
-				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6]);
+				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6], 'shortSessions' => $row[7]);
 		}
 
 		// per user
-- 
cgit v1.2.3-55-g7522


From 3a2dae96362b1187ae4b9d89904d23b6a7da87cb Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 22 Dec 2016 15:08:36 +0100
Subject: [statistics_reporting] added short sessions to ui

---
 .../lang/de/template-tags.json                     |  3 ++-
 .../lang/en/template-tags.json                     |  3 ++-
 .../statistics_reporting/page.inc.php              | 10 ++++-----
 .../statistics_reporting/templates/_page.html      | 26 +++++++++++++---------
 .../templates/columnChooser.html                   |  3 ++-
 5 files changed, 27 insertions(+), 18 deletions(-)

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

diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index c5494205..68b68250 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -3,7 +3,8 @@
     "lang_countLogins": "Anzahl Logins",
     "lang_client": "Client",
     "lang_vm": "VM",
-    "lang_totalLogins": "Gesamt Logins",
+    "lang_sessions": "Sitzungen \u2265 60s",
+    "lang_shortSessions": "Sitzungen < 60s",
     "lang_overallOfftime": "Insgesamte Zeit Offline",
     "lang_totalOffTime": "Gesamtzeit Offline",
     "lang_clientLogout": "Letzter VM Logout",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index de91621f..b9e0c61d 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -3,7 +3,8 @@
     "lang_countLogins": "Number of Logins",
     "lang_client": "Client",
     "lang_vm": "VM",
-    "lang_totalLogins": "Total Logins",
+    "lang_sessions": "Sessions \u2265 60s",
+    "lang_shortSessions": "Sessions < 60s",
     "lang_overallOfftime": "Overall time offline",
     "lang_totalOffTime": "Total Time Offline",
     "lang_clientLogout": "Last VM Logout",
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index de13cdb3..f0f56e87 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -35,7 +35,7 @@ class Page_Statistics_Reporting extends Page
 		// total time online, average time online, total  number of logins
 		$res = StatisticReporting::getOverallStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'totalLogins' => $row[2], 'shortSessions' => $row[3]);
+		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'sessions' => $row[2], 'shortSessions' => $row[3]);
 
 		//total time offline
 		$res = StatisticReporting::getTotalOfflineStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
@@ -48,7 +48,7 @@ class Page_Statistics_Reporting extends Page
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4], 'shortSessions' => $row[5]);
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4], 'shortSessions' => $row[5]);
 		}
 
 		// per client
@@ -57,7 +57,7 @@ class Page_Statistics_Reporting extends Page
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'loginCount' => $row[4],
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4],
 				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6], 'shortSessions' => $row[7]);
 		}
 
@@ -65,14 +65,14 @@ class Page_Statistics_Reporting extends Page
 		$res = StatisticReporting::getUserStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perUser'][] = array('user' => $row[0], 'loginCount' => $row[1]);
+			$data['perUser'][] = array('user' => $row[0], 'sessions' => $row[1]);
 		}
 
 		// per vm
 		$res = StatisticReporting::getVMStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perVM' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perVM'][] = array('vm' => $row[0], 'loginCount' => $row[1]);
+			$data['perVM'][] = array('vm' => $row[0], 'sessions' => $row[1]);
 		}
 
 		Render::addTemplate('columnChooser');
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
index 7cfb424c..d2aaecde 100644
--- a/modules-available/statistics_reporting/templates/_page.html
+++ b/modules-available/statistics_reporting/templates/_page.html
@@ -7,7 +7,8 @@
 						<th class="text-left col-md-2"></th>
 						<th class="text-left column-totaltime">{{lang_totalTime}}</th>
 						<th class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-						<th class="text-left column-logincount">{{lang_totalLogins}}</th>
+						<th class="text-left column-sessions">{{lang_sessions}}</th>
+						<th class="text-left column-shortsessions">{{lang_shortSessions}}</th>
 						<th class="text-left column-timeoffline">{{lang_overallOfftime}}</th>
 					</tr>
 				</thead>
@@ -16,7 +17,8 @@
 						<th class="text-left">{{lang_total}}</th>
 						<td class="text-left column-totaltime">{{time}}</td>
 						<td class="text-left column-mediantime">{{medianTime}}</td>
-						<td class="text-left column-logincount">{{totalLogins}}</td>
+						<td class="text-left column-sessions">{{sessions}}</td>
+						<td class="text-left column-shortsessions">{{shortSessions}}</td>
 						<td class="text-left column-timeoffline">{{totalOfftime}}</td>
 					</tr>
 				</tbody>
@@ -31,7 +33,8 @@
 						<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
 					</tr>
 				</thead>
@@ -41,7 +44,8 @@
 						<td class="text-left">{{location}}</td>
 						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
 						<td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td>
-						<td class="text-left column-logincount">{{loginCount}}</td>
+						<td class="text-left column-sessions">{{sessions}}</td>
+						<td class="text-left column-shortsessions">{{shortSessions}}</td>
 						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
 					</tr>
 					{{/perLocation}}
@@ -57,7 +61,8 @@
 						<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-						<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
+						<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th>
 						<th data-sort="int" data-sort-default="desc" class="text-left column-laststart">{{lang_clientStart}}</th>
@@ -69,7 +74,8 @@
 						<td class="text-left">{{hostname}}</td>
 						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
 						<td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td>
-						<td class="text-left column-logincount">{{loginCount}}</td>
+						<td class="text-left column-sessions">{{sessions}}</td>
+						<td class="text-left column-shortsessions">{{shortSessions}}</td>
 						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
 						<td data-sort-value="{{lastLogoutUnixtime}}" class="text-left column-lastlogout">{{lastLogout}}</td>
 						<td data-sort-value="{{lastStartUnixtime}}" class="text-left column-laststart">{{lastStart}}</td>
@@ -85,14 +91,14 @@
 				<thead>
 				<tr>
 					<th data-sort="string" class="text-left col-md-4">{{lang_user}}</th>
-					<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+					<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
 				</tr>
 				</thead>
 				<tbody>
 				{{#perUser}}
 				<tr>
 					<td class="text-left">{{user}}</td>
-					<td class="text-left column-logincount">{{loginCount}}</td>
+					<td class="text-left column-sessions">{{sessions}}</td>
 				</tr>
 				{{/perUser}}
 				</tbody>
@@ -105,14 +111,14 @@
 				<thead>
 				<tr>
 					<th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th>
-					<th data-sort="int" data-sort-default="desc" class="text-left column-logincount">{{lang_totalLogins}}</th>
+					<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
 				</tr>
 				</thead>
 				<tbody>
 				{{#perVM}}
 				<tr>
 					<td class="text-left">{{vm}}</td>
-					<td class="text-left column-logincount">{{loginCount}}</td>
+					<td class="text-left column-sessions">{{sessions}}</td>
 				</tr>
 				{{/perVM}}
 				</tbody>
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index d79f542b..49c9a75d 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -26,7 +26,8 @@
 		<div class="col-md-12 buttonbar">
 			<button id="button-totaltime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('totaltime')">{{lang_totalTime}}</button>
 			<button id="button-mediantime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('mediantime')">{{lang_medianSessionLength}}</button>
-			<button id="button-logincount" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('logincount')">{{lang_totalLogins}}</button>
+			<button id="button-sessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('sessions')">{{lang_sessions}}</button>
+			<button id="button-shortsessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('shortsessions')">{{lang_shortSessions}}</button>
 			<button id="button-timeoffline" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('timeoffline')">{{lang_totalOffTime}}</button>
 			<button id="button-lastlogout" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('lastlogout')">{{lang_clientLogout}}</button>
 			<button id="button-laststart" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('laststart')">{{lang_clientStart}}</button>
-- 
cgit v1.2.3-55-g7522


From 2ab12fa0ce5fe4c916d5426e05656e61b4005b1e Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 22 Dec 2016 16:10:13 +0100
Subject: [statistics_reporting] changed cutoffs

---
 .../inc/statisticreporting.inc.php                 | 41 +++++++++-------------
 .../lang/de/template-tags.json                     |  4 +--
 .../lang/en/template-tags.json                     |  4 +--
 .../statistics_reporting/page.inc.php              | 15 ++++----
 4 files changed, 28 insertions(+), 36 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 7b1dcfdc..626aa290 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -4,17 +4,16 @@
 class StatisticReporting
 {
 
-	public static function getClientStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$queryTime = time() - $cutOffTimeInSeconds;
+	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, longSessions, lastLogout, lastStart, shortSessions FROM (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout'
-													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $queryTime)." sessionTable
+													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
 													GROUP BY machine.machineuuid
 												) 	t1 
 												INNER JOIN (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum', MAX(offlineTable.dateline) AS 'lastStart'
-													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $queryTime)." offlineTable
+													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
 														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid
 													GROUP BY machine.machineuuid
 												) 	t2 
@@ -23,19 +22,17 @@ class StatisticReporting
 	}
 
 	// IFNULL(location.locationname, '') - emptry string can be replaced with anything (name of the null-ids in the table)
-	public static function getLocationStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$queryTime = time() - $cutOffTimeInSeconds;
-
+	public static function getLocationStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT t1.locName, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
 													SELECT IFNULL(location.locationname, '') AS 'locName', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
-													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $queryTime)." sessionTable
+													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
 												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
 													GROUP BY location.locationname
 												) 	t1 
 												INNER JOIN (
 											 		SELECT IFNULL(location.locationname, '') AS 'locName', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
-													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $queryTime)." offlineTable
+													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
 														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
 													GROUP BY location.locationname
@@ -45,35 +42,31 @@ class StatisticReporting
 	}
 
 	// logins between bounds
-	public static function getUserStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$queryTime = time() - $cutOffTimeInSeconds;
+	public static function getUserStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' 
 												FROM statistic 
-												WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
+												WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
 														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
 												GROUP BY username ORDER BY 2 DESC");
 		return $res;
 	}
 
 	// vm logins between bounds
-	public static function getVMStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$queryTime = time() - $cutOffTimeInSeconds;
-		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline>=$queryTime 
+	public static function getVMStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
 												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) GROUP BY data ORDER BY 2 DESC");
 		return $res;
 	}
 
-	public static function getOverallStatistics ($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$queryTime = time() - $cutOffTimeInSeconds;
+	public static function getOverallStatistics ($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, SUM(sessionTable.length >= 60) AS longSessions, SUM(sessionTable.length < 60) AS shortSessions
-											 		FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $queryTime)." sessionTable");
+											 		FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable");
 		return $res;
 	}
 
-	public static function getTotalOfflineStatistics($cutOffTimeInSeconds, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$queryTime = time() - $cutOffTimeInSeconds;
+	public static function getTotalOfflineStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED))
-												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $queryTime)." offlineTable");
+												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable");
 		return $res;
 	}
 
@@ -97,13 +90,13 @@ class StatisticReporting
 		return round($median);
 	}
 
-	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound, $cutoffTime)
+	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound, $cutOff)
 	{
 		$lowerFormat = "'%y-%m-%d $lowerTimeBound:00:00'";
 		$upperFormat = "'%y-%m-%d ".($upperTimeBound-1).":59:59'";
 		$queryString = "
 			select
-			
+
 			@startLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)),
 			@startUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat)),
 			@endLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)),
@@ -157,7 +150,7 @@ class StatisticReporting
 			machineuuid
 			
 			from statistic
-			where dateline >= $cutoffTime and typeid = '$typeid' and (
+			where dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) and typeid = '$typeid' and (
 			(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)) <= dateline and dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat))) or
 			(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)) <= dateline+data and dateline+data <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)))
 	 		)
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 68b68250..207949a9 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -20,8 +20,8 @@
     "lang_location": "Raum",
     "lang_medianSessionLength": "Mittlere Sitzungsdauer",
     "lang_totalTime": "Gesamte Zeit",
-    "lang_last1": "Letzten 24 Stunden",
-    "lang_last2": "Letzten 48 Stunden",
+    "lang_last1": "Heute",
+    "lang_last2": "Letzten 2 Tage",
     "lang_last7": "Letzten 7 Tage",
     "lang_last14": "Letzten 14 Tage",
     "lang_last30": "Letzten 30 Tage",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index b9e0c61d..e9430960 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -20,8 +20,8 @@
     "lang_location": "Location",
     "lang_medianSessionLength": "Median Session Length",
     "lang_totalTime": "Total Time",
-    "lang_last1": "Last 24 hours",
-    "lang_last2": "Last 48 hours",
+    "lang_last1": "Today",
+    "lang_last2": "Last 2 days",
     "lang_last7": "Last 7 days",
     "lang_last14": "Last 14 days",
     "lang_last30": "Last 30 days",
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index f0f56e87..a55ba33f 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -24,8 +24,7 @@ class Page_Statistics_Reporting extends Page
 	{
 		// timespan you want to see = Days selected * seconds per Day (86400)
 		// default = 14 days
-		$cutOff = Request::get('cutoff', 14, 'int');
-		$cutOffTimer = $cutOff * 86400;
+		$cutOff = Request::get('cutoff', 14, 'int') - 1;
 
 		$lowerTimeBound = Request::get('lower', 0, 'int');
 
@@ -33,17 +32,17 @@ class Page_Statistics_Reporting extends Page
 
 
 		// total time online, average time online, total  number of logins
-		$res = StatisticReporting::getOverallStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
+		$res = StatisticReporting::getOverallStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
 		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'sessions' => $row[2], 'shortSessions' => $row[3]);
 
 		//total time offline
-		$res = StatisticReporting::getTotalOfflineStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
+		$res = StatisticReporting::getTotalOfflineStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_NUM);
 		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row[0])));
 
 		// per location
-		$res = StatisticReporting::getLocationStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
+		$res = StatisticReporting::getLocationStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perLocation' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
@@ -52,7 +51,7 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		// per client
-		$res = StatisticReporting::getClientStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
+		$res = StatisticReporting::getClientStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perClient' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
@@ -62,14 +61,14 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		// per user
-		$res = StatisticReporting::getUserStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
+		$res = StatisticReporting::getUserStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perUser' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perUser'][] = array('user' => $row[0], 'sessions' => $row[1]);
 		}
 
 		// per vm
-		$res = StatisticReporting::getVMStatistics($cutOffTimer, $lowerTimeBound, $upperTimeBound);
+		$res = StatisticReporting::getVMStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perVM' => array());
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$data['perVM'][] = array('vm' => $row[0], 'sessions' => $row[1]);
-- 
cgit v1.2.3-55-g7522


From e61bb374f6bd7eddd6c7efdc80b835a88a1156e7 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Fri, 23 Dec 2016 16:01:58 +0100
Subject: [statistics_reporting] location for clienttable

---
 .../statistics_reporting/inc/statisticreporting.inc.php              | 5 +++--
 modules-available/statistics_reporting/page.inc.php                  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 626aa290..c821701b 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -5,10 +5,11 @@ class StatisticReporting
 {
 
 	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, longSessions, lastLogout, lastStart, shortSessions FROM (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout'
+		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, longSessions, lastLogout, lastStart, shortSessions, locName FROM (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '') AS 'locName'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
+														LEFT JOIN location ON machine.locationid = location.locationid
 													GROUP BY machine.machineuuid
 												) 	t1 
 												INNER JOIN (
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index a55ba33f..8bd593f4 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -57,7 +57,7 @@ class Page_Statistics_Reporting extends Page
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
 				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4],
-				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6], 'shortSessions' => $row[7]);
+				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6], 'shortSessions' => $row[7], 'locationName' => $row[8]);
 		}
 
 		// per user
-- 
cgit v1.2.3-55-g7522


From d7eaf72343acc41f648f2c1ed6ff1845d9b514c2 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Thu, 29 Dec 2016 15:10:43 +0100
Subject: [statistics_reporting] added comments and improved readability

---
 .../inc/statisticreporting.inc.php                 | 31 +++++++++++++++-------
 .../statistics_reporting/page.inc.php              |  4 +--
 2 files changed, 23 insertions(+), 12 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index b75c6eaa..689af37d 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -4,9 +4,10 @@
 class StatisticReporting
 {
 
+	// Client Data: Name, Time Online, Median Time Online, Time Offline, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location
 	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
-		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, longSessions, lastLogout, lastStart, shortSessions, locName FROM (
+		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName FROM (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
@@ -23,7 +24,7 @@ class StatisticReporting
 		return $res;
 	}
 
-	// IFNULL(location.locationname, 'NOT ASSIGNED') - NOT ASSIGNED string can be replaced with anything (name of the null-ids in the table)
+	// Location Data: Name, Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
 	public static function getLocationStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
 		$res = Database::simpleQuery("SELECT t1.locName, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
@@ -44,40 +45,47 @@ class StatisticReporting
 		return $res;
 	}
 
-	// logins between bounds
+	// User Data: Name, Number of Logins
 	public static function getUserStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' 
 												FROM statistic 
 												WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
 														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
-												GROUP BY username ORDER BY 2 DESC");
+												GROUP BY username 
+												ORDER BY 2 DESC");
 		return $res;
 	}
 
-	// vm logins between bounds
+	// Virtual Machine Data: Name, Number of Usages
 	public static function getVMStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
-												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) GROUP BY data ORDER BY 2 DESC");
+												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) 
+												GROUP BY data 
+												ORDER BY 2 DESC");
 		return $res;
 	}
 
+	//Total Data: Time Online, Median Time Online, Number of Sessions > 60Sec, Number of Sessions < 60Sec
 	public static function getOverallStatistics ($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, SUM(sessionTable.length >= 60) AS longSessions, SUM(sessionTable.length < 60) AS shortSessions
-											 		FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable");
+											 	FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable");
 		return $res;
 	}
 
+	// Total Data(2): Time Offline
 	public static function getTotalOfflineStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED))
 												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable");
 		return $res;
 	}
 
+	// Format $seconds into ".d .h .m .s" format (day, hour, minute, second)
 	public static function formatSeconds($seconds)
 	{
 		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
 	}
 
+	// Calculate Median
 	public static function calcMedian($string) {
 		$arr = explode(",", $string);
 		sort($arr, SORT_NUMERIC);
@@ -93,6 +101,7 @@ class StatisticReporting
 		return round($median);
 	}
 
+	// query string which provides table with time-cutoff and time-bounds
 	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound, $cutOff)
 	{
 		$lowerFormat = "'%y-%m-%d $lowerTimeBound:00:00'";
@@ -153,9 +162,11 @@ class StatisticReporting
 			machineuuid
 			
 			from statistic
-			where dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) and typeid = '$typeid' and (
-			(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)) <= dateline and dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat))) or
-			(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)) <= dateline+data and dateline+data <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)))
+			where dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) and typeid = '$typeid' 
+			and (
+				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)) <= dateline and dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat))) 
+				or
+				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)) <= dateline+data and dateline+data <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)))
 	 		)
 		";
 		return "(".$queryString.")";
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 8bd593f4..13446ed9 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -56,8 +56,8 @@ class Page_Statistics_Reporting extends Page
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4],
-				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'lastStartUnixtime' => $row[6], 'shortSessions' => $row[7], 'locationName' => $row[8]);
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'lastStartUnixtime' => $row[4],
+				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'sessions' => $row[6], 'shortSessions' => $row[7], 'locationName' => $row[8]);
 		}
 
 		// per user
-- 
cgit v1.2.3-55-g7522


From 18a646aaf1032946574091f5be03347b3cf09855 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 9 Jan 2017 15:11:30 +0100
Subject: [statistics_reporting] bugfix

---
 modules-available/statistics_reporting/inc/statisticreporting.inc.php | 2 +-
 modules-available/statistics_reporting/page.inc.php                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 689af37d..39aa9377 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -4,7 +4,7 @@
 class StatisticReporting
 {
 
-	// Client Data: Name, Time Online, Median Time Online, Time Offline, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location
+	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location
 	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
 		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName FROM (
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 13446ed9..c309bfb6 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -56,8 +56,8 @@ class Page_Statistics_Reporting extends Page
 		while ($row = $res->fetch(PDO::FETCH_NUM)) {
 			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
 			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'lastStartUnixtime' => $row[4],
-				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'lastStart' => date(DATE_RSS,$row[6]), 'sessions' => $row[6], 'shortSessions' => $row[7], 'locationName' => $row[8]);
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'lastStart' => date(DATE_RSS,$row[4]), 'lastStartUnixtime' => $row[4],
+				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'sessions' => $row[6], 'shortSessions' => $row[7], 'locationName' => $row[8]);
 		}
 
 		// per user
-- 
cgit v1.2.3-55-g7522


From d7fa39c85738fb998c79a866a7f0ed36b9403a87 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 9 Jan 2017 16:48:45 +0100
Subject: [statistics_reporting] improved readability, added hashed values to
 queries

---
 .../inc/statisticreporting.inc.php                 | 20 ++++++-------
 .../statistics_reporting/page.inc.php              | 34 +++++++++++-----------
 2 files changed, 27 insertions(+), 27 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 39aa9377..c209c5ef 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -4,11 +4,11 @@
 class StatisticReporting
 {
 
-	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location
+	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location, id of location (anonymized), machine uuid (anonymized)
 	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
-		$res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName FROM (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName'
+		$res = Database::simpleQuery("SELECT t1.name AS clientName, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName, MD5(locId) AS locHash, MD5(t1.uuid) AS clientHash FROM (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
 														LEFT JOIN location ON machine.locationid = location.locationid
@@ -24,11 +24,11 @@ class StatisticReporting
 		return $res;
 	}
 
-	// Location Data: Name, Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
+	// Location Data: Name, ID (anonymized), Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
 	public static function getLocationStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
-		$res = Database::simpleQuery("SELECT t1.locName, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
-													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
+		$res = Database::simpleQuery("SELECT t1.locName AS locName, MD5(locId) AS locHash, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
+													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
 													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
 												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
@@ -45,9 +45,9 @@ class StatisticReporting
 		return $res;
 	}
 
-	// User Data: Name, Number of Logins
+	// User Data: Name, Name(anonymized), Number of Logins
 	public static function getUserStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT username, COUNT(*) AS 'count' 
+		$res = Database::simpleQuery("SELECT username AS name, IF(username = 'anonymous', 'anonymous', md5(username)) AS  userHash, COUNT(*) AS 'count' 
 												FROM statistic 
 												WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
 														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
@@ -58,7 +58,7 @@ class StatisticReporting
 
 	// Virtual Machine Data: Name, Number of Usages
 	public static function getVMStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT data, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
+		$res = Database::simpleQuery("SELECT data AS name, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
 												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) 
 												GROUP BY data 
 												ORDER BY 2 DESC");
@@ -74,7 +74,7 @@ class StatisticReporting
 
 	// Total Data(2): Time Offline
 	public static function getTotalOfflineStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED))
+		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED)) AS timeOff
 												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable");
 		return $res;
 	}
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index c309bfb6..e2c76b09 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -33,45 +33,45 @@ class Page_Statistics_Reporting extends Page
 
 		// total time online, average time online, total  number of logins
 		$res = StatisticReporting::getOverallStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array('time' =>  StatisticReporting::formatSeconds($row[0]), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row[1])), 'sessions' => $row[2], 'shortSessions' => $row[3]);
+		$row = $res->fetch(PDO::FETCH_ASSOC);
+		$data = array('time' =>  StatisticReporting::formatSeconds($row['sum']), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row['median'])), 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
 
 		//total time offline
 		$res = StatisticReporting::getTotalOfflineStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$row = $res->fetch(PDO::FETCH_NUM);
-		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row[0])));
+		$row = $res->fetch(PDO::FETCH_ASSOC);
+		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row['timeOff'])));
 
 		// per location
 		$res = StatisticReporting::getLocationStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perLocation' => array());
-		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
-			$data['perLocation'][] = array('location' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'sessions' => $row[4], 'shortSessions' => $row[5]);
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row['medianTime']));
+			$data['perLocation'][] = array('location' => $row['locName'], 'time' => StatisticReporting::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
 		}
 
 		// per client
 		$res = StatisticReporting::getClientStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perClient' => array());
-		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row[2]));
-			$data['perClient'][] = array('hostname' => $row[0], 'time' => StatisticReporting::formatSeconds($row[1]), 'timeInSeconds' => $row[1],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row[3]), 'offlineTimeInSeconds' => $row[3], 'lastStart' => date(DATE_RSS,$row[4]), 'lastStartUnixtime' => $row[4],
-				'lastLogout' => date(DATE_RSS,$row[5]), 'lastLogoutUnixtime' => $row[5], 'sessions' => $row[6], 'shortSessions' => $row[7], 'locationName' => $row[8]);
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row['medianTime']));
+			$data['perClient'][] = array('hostname' => $row['clientName'], 'time' => StatisticReporting::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
+				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'lastStart' => date(DATE_RSS,$row['lastStart']), 'lastStartUnixtime' => $row['lastStart'],
+				'lastLogout' => date(DATE_RSS,$row['lastLogout']), 'lastLogoutUnixtime' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row['locName']);
 		}
 
 		// per user
 		$res = StatisticReporting::getUserStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perUser' => array());
-		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perUser'][] = array('user' => $row[0], 'sessions' => $row[1]);
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$data['perUser'][] = array('user' => $row['name'], 'sessions' => $row['count']);
 		}
 
 		// per vm
 		$res = StatisticReporting::getVMStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
 		$data[] = array('perVM' => array());
-		while ($row = $res->fetch(PDO::FETCH_NUM)) {
-			$data['perVM'][] = array('vm' => $row[0], 'sessions' => $row[1]);
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$data['perVM'][] = array('vm' => $row['name'], 'sessions' => $row['count']);
 		}
 
 		Render::addTemplate('columnChooser');
-- 
cgit v1.2.3-55-g7522


From 9ccef127acd6dca0971e12726b019e2beaf7e4ce Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 12 Jan 2017 12:41:21 +0100
Subject: [statistics_reporting] moved some functions to a new class

---
 .../statistics_reporting/inc/getdata.inc.php       |  98 ++++++++++++
 .../statistics_reporting/inc/queries.inc.php       | 153 ++++++++++++++++++
 .../inc/statisticreporting.inc.php                 | 175 ---------------------
 .../statistics_reporting/page.inc.php              |  55 +------
 4 files changed, 259 insertions(+), 222 deletions(-)
 create mode 100644 modules-available/statistics_reporting/inc/getdata.inc.php
 create mode 100644 modules-available/statistics_reporting/inc/queries.inc.php
 delete mode 100644 modules-available/statistics_reporting/inc/statisticreporting.inc.php

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

diff --git a/modules-available/statistics_reporting/inc/getdata.inc.php b/modules-available/statistics_reporting/inc/getdata.inc.php
new file mode 100644
index 00000000..a1df66d0
--- /dev/null
+++ b/modules-available/statistics_reporting/inc/getdata.inc.php
@@ -0,0 +1,98 @@
+<?php
+
+class GetData
+{
+	public static $cutOff = 7;
+	public static $lowerTimeBound = 0;
+	public static $upperTimeBound = 24;
+
+
+	// total
+	public static function total($anonymize = false) {
+		// total time online, average time online, total  number of logins
+		$res = Queries::getOverallStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$row = $res->fetch(PDO::FETCH_ASSOC);
+		$data = array('time' =>  self::formatSeconds($row['sum']), 'medianTime' =>  self::formatSeconds(self::calcMedian($row['median'])), 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+
+		//total time offline
+		$res = Queries::getTotalOfflineStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$row = $res->fetch(PDO::FETCH_ASSOC);
+		$data = array_merge($data, array('totalOfftime' => self::formatSeconds($row['timeOff'])));
+
+		return $data;
+	}
+
+	// per location
+	public static function perLocation($anonymize = false) {
+		$res = Queries::getLocationStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$data = array();
+		$loc = $anonymize ? 'locHash' : 'locName';
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$median = self::calcMedian(self::calcMedian($row['medianTime']));
+			$data[] = array('location' => $row[$loc], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
+				'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+		}
+		return $data;
+	}
+
+	// per client
+	public static function perClient($anonymize = false) {
+		$res = Queries::getClientStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$data = array();
+		$name = $anonymize ? 'clientHash' : 'hostname';
+		$loc = $anonymize ? 'locHash' : 'locName';
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$median = self::calcMedian(self::calcMedian($row['medianTime']));
+			$data[] = array('hostname' => $row[$name], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
+				'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'lastStart' => date(DATE_RSS,$row['lastStart']), 'lastStartUnixtime' => $row['lastStart'],
+				'lastLogout' => date(DATE_RSS,$row['lastLogout']), 'lastLogoutUnixtime' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row[$loc]);
+		}
+		return $data;
+	}
+
+	// per user
+	public static function perUser($anonymize = false) {
+		$res = Queries::getUserStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$data = array();
+		$user = $anonymize ? 'userHash' : 'name';
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$data[] = array('user' => $row['name'], 'sessions' => $row['count']);
+		}
+		return $data;
+	}
+
+
+	// per vm
+	public static function perVM() {
+		$res = Queries::getVMStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$data = array();
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$data[] = array('vm' => $row['name'], 'sessions' => $row['count']);
+		}
+		return $data;
+	}
+
+
+
+	// Format $seconds into ".d .h .m .s" format (day, hour, minute, second)
+	private static function formatSeconds($seconds)
+	{
+		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
+	}
+
+	// Calculate Median
+	private static function calcMedian($string) {
+		$arr = explode(",", $string);
+		sort($arr, SORT_NUMERIC);
+		$count = count($arr); //total numbers in array
+		$middleval = floor(($count-1)/2); // find the middle value, or the lowest middle value
+		if($count % 2) { // odd number, middle is the median
+			$median = $arr[(int) $middleval];
+		} else { // even number, calculate avg of 2 medians
+			$low = $arr[(int) $middleval];
+			$high = $arr[(int) $middleval+1];
+			$median = (($low+$high)/2);
+		}
+		return round($median);
+	}
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
new file mode 100644
index 00000000..23afceed
--- /dev/null
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -0,0 +1,153 @@
+<?php
+
+
+class Queries
+{
+
+	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location, id of location (anonymized), machine uuid (anonymized)
+	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
+		$res = Database::simpleQuery("SELECT t1.name AS clientName, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName, MD5(locId) AS locHash, MD5(t1.uuid) AS clientHash FROM (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId'
+													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
+														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
+														LEFT JOIN location ON machine.locationid = location.locationid
+													GROUP BY machine.machineuuid
+												) 	t1 
+												INNER JOIN (
+													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum', MAX(offlineTable.dateline) AS 'lastStart'
+													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
+														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid
+													GROUP BY machine.machineuuid
+												) 	t2 
+												ON t1.uuid = t2.uuid");
+		return $res;
+	}
+
+	// Location Data: Name, ID (anonymized), Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
+	public static function getLocationStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
+		$res = Database::simpleQuery("SELECT t1.locName AS locName, MD5(locId) AS locHash, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
+													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
+													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
+												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
+														LEFT JOIN location ON machine.locationid = location.locationid 
+													GROUP BY location.locationname
+												) 	t1 
+												INNER JOIN (
+											 		SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
+													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
+														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
+														LEFT JOIN location ON machine.locationid = location.locationid 
+													GROUP BY location.locationname
+												) 	t2 
+												ON t1.locName = t2.locName");
+		return $res;
+	}
+
+	// User Data: Name, Name(anonymized), Number of Logins
+	public static function getUserStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT username AS name, IF(username = 'anonymous', 'anonymous', md5(username)) AS  userHash, COUNT(*) AS 'count' 
+												FROM statistic 
+												WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
+														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
+												GROUP BY username 
+												ORDER BY 2 DESC");
+		return $res;
+	}
+
+	// Virtual Machine Data: Name, Number of Usages
+	public static function getVMStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT data AS name, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
+												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) 
+												GROUP BY data 
+												ORDER BY 2 DESC");
+		return $res;
+	}
+
+	//Total Data: Time Online, Median Time Online, Number of Sessions > 60Sec, Number of Sessions < 60Sec
+	public static function getOverallStatistics ($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, SUM(sessionTable.length >= 60) AS longSessions, SUM(sessionTable.length < 60) AS shortSessions
+											 	FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable");
+		return $res;
+	}
+
+	// Total Data(2): Time Offline
+	public static function getTotalOfflineStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED)) AS timeOff
+												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable");
+		return $res;
+	}
+
+	// query string which provides table with time-cutoff and time-bounds
+	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound, $cutOff)
+	{
+		$lowerFormat = "'%y-%m-%d $lowerTimeBound:00:00'";
+		$upperFormat = "'%y-%m-%d ".($upperTimeBound-1).":59:59'";
+		$queryString = "
+			select
+
+			@startLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)),
+			@startUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat)),
+			@endLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)),
+			@endUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)),
+			
+			(CAST(data AS SIGNED) 
+			- IF(
+					dateline > @startUpper,
+					UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat) + INTERVAL 1 DAY) - dateline,
+					IF(
+						 dateline < @startLower,
+						 @startLower - dateline,
+						 0
+					)
+			  )
+			- IF(
+					dateline+data > @endUpper,
+					dateline+data - (@endUpper + 1),
+					IF(
+						 dateline+data < @endLower,
+						 dateline+data - (UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat) - INTERVAL 1 DAY) + 1),
+						 0
+					)
+			  )
+			- (    TO_DAYS(FROM_UNIXTIME(dateline+data, '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(dateline, '%y-%m-%d'))
+					 - 2
+					 + IF(dateline <= @startUpper, 1, 0)
+					 + IF(dateline+data >= @endLower, 1, 0)
+			  ) * ((24 - ($upperTimeBound - $lowerTimeBound)) * 3600)
+			  
+			- IF(
+					@leftBound := IF(dateline <= @startUpper, @startUpper, UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat) + INTERVAL 1 DAY))
+					< @rightBound := IF(dateline+data >= @endLower, @endLower, UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat) - INTERVAL 1 DAY)),
+					IF(
+						@timeDiff := (
+						(date_format(from_unixtime(@leftBound), '%H') -
+						date_format(convert_tz(from_unixtime(@leftBound), @@session.time_zone, '+00:00'), '%H') + 24) % 24
+						-
+						(date_format(from_unixtime(@rightBound), '%H') -
+						date_format(convert_tz(from_unixtime(@rightBound), @@session.time_zone, '+00:00'), '%H') + 24) % 24) = 1
+						AND ($lowerTimeBound >= 2 OR $upperTimeBound <= 2),
+						3600,
+						IF(@timeDiff = -1 AND ($lowerTimeBound >= 3 OR $upperTimeBound <= 3), -3600, 0)
+					),
+					0
+			  )
+					  
+			) as 'length',
+			dateline,
+			data,
+			machineuuid
+			
+			from statistic
+			where dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) and typeid = '$typeid' 
+			and (
+				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)) <= dateline and dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat))) 
+				or
+				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)) <= dateline+data and dateline+data <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)))
+	 		)
+		";
+		return "(".$queryString.")";
+	}
+}
+
diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
deleted file mode 100644
index c209c5ef..00000000
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-
-class StatisticReporting
-{
-
-	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location, id of location (anonymized), machine uuid (anonymized)
-	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
-		$res = Database::simpleQuery("SELECT t1.name AS clientName, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName, MD5(locId) AS locHash, MD5(t1.uuid) AS clientHash FROM (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId'
-													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
-														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
-														LEFT JOIN location ON machine.locationid = location.locationid
-													GROUP BY machine.machineuuid
-												) 	t1 
-												INNER JOIN (
-													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum', MAX(offlineTable.dateline) AS 'lastStart'
-													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
-														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid
-													GROUP BY machine.machineuuid
-												) 	t2 
-												ON t1.uuid = t2.uuid");
-		return $res;
-	}
-
-	// Location Data: Name, ID (anonymized), Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
-	public static function getLocationStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
-		$res = Database::simpleQuery("SELECT t1.locName AS locName, MD5(locId) AS locHash, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
-													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
-													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
-												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
-														LEFT JOIN location ON machine.locationid = location.locationid 
-													GROUP BY location.locationname
-												) 	t1 
-												INNER JOIN (
-											 		SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
-													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
-														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
-														LEFT JOIN location ON machine.locationid = location.locationid 
-													GROUP BY location.locationname
-												) 	t2 
-												ON t1.locName = t2.locName");
-		return $res;
-	}
-
-	// User Data: Name, Name(anonymized), Number of Logins
-	public static function getUserStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT username AS name, IF(username = 'anonymous', 'anonymous', md5(username)) AS  userHash, COUNT(*) AS 'count' 
-												FROM statistic 
-												WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
-														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
-												GROUP BY username 
-												ORDER BY 2 DESC");
-		return $res;
-	}
-
-	// Virtual Machine Data: Name, Number of Usages
-	public static function getVMStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT data AS name, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
-												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) 
-												GROUP BY data 
-												ORDER BY 2 DESC");
-		return $res;
-	}
-
-	//Total Data: Time Online, Median Time Online, Number of Sessions > 60Sec, Number of Sessions < 60Sec
-	public static function getOverallStatistics ($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, SUM(sessionTable.length >= 60) AS longSessions, SUM(sessionTable.length < 60) AS shortSessions
-											 	FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable");
-		return $res;
-	}
-
-	// Total Data(2): Time Offline
-	public static function getTotalOfflineStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED)) AS timeOff
-												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable");
-		return $res;
-	}
-
-	// Format $seconds into ".d .h .m .s" format (day, hour, minute, second)
-	public static function formatSeconds($seconds)
-	{
-		return intdiv($seconds, 3600*24).'d '.intdiv($seconds%(3600*24), 3600).'h '.intdiv($seconds%3600, 60).'m '.($seconds%60).'s';
-	}
-
-	// Calculate Median
-	public static function calcMedian($string) {
-		$arr = explode(",", $string);
-		sort($arr, SORT_NUMERIC);
-		$count = count($arr); //total numbers in array
-		$middleval = floor(($count-1)/2); // find the middle value, or the lowest middle value
-		if($count % 2) { // odd number, middle is the median
-			$median = $arr[(int) $middleval];
-		} else { // even number, calculate avg of 2 medians
-			$low = $arr[(int) $middleval];
-			$high = $arr[(int) $middleval+1];
-			$median = (($low+$high)/2);
-		}
-		return round($median);
-	}
-
-	// query string which provides table with time-cutoff and time-bounds
-	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound, $cutOff)
-	{
-		$lowerFormat = "'%y-%m-%d $lowerTimeBound:00:00'";
-		$upperFormat = "'%y-%m-%d ".($upperTimeBound-1).":59:59'";
-		$queryString = "
-			select
-
-			@startLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)),
-			@startUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat)),
-			@endLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)),
-			@endUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)),
-			
-			(CAST(data AS SIGNED) 
-			- IF(
-					dateline > @startUpper,
-					UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat) + INTERVAL 1 DAY) - dateline,
-					IF(
-						 dateline < @startLower,
-						 @startLower - dateline,
-						 0
-					)
-			  )
-			- IF(
-					dateline+data > @endUpper,
-					dateline+data - (@endUpper + 1),
-					IF(
-						 dateline+data < @endLower,
-						 dateline+data - (UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat) - INTERVAL 1 DAY) + 1),
-						 0
-					)
-			  )
-			- (    TO_DAYS(FROM_UNIXTIME(dateline+data, '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(dateline, '%y-%m-%d'))
-					 - 2
-					 + IF(dateline <= @startUpper, 1, 0)
-					 + IF(dateline+data >= @endLower, 1, 0)
-			  ) * ((24 - ($upperTimeBound - $lowerTimeBound)) * 3600)
-			  
-			- IF(
-					@leftBound := IF(dateline <= @startUpper, @startUpper, UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat) + INTERVAL 1 DAY))
-					< @rightBound := IF(dateline+data >= @endLower, @endLower, UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat) - INTERVAL 1 DAY)),
-					IF(
-						@timeDiff := (
-						(date_format(from_unixtime(@leftBound), '%H') -
-						date_format(convert_tz(from_unixtime(@leftBound), @@session.time_zone, '+00:00'), '%H') + 24) % 24
-						-
-						(date_format(from_unixtime(@rightBound), '%H') -
-						date_format(convert_tz(from_unixtime(@rightBound), @@session.time_zone, '+00:00'), '%H') + 24) % 24) = 1
-						AND ($lowerTimeBound >= 2 OR $upperTimeBound <= 2),
-						3600,
-						IF(@timeDiff = -1 AND ($lowerTimeBound >= 3 OR $upperTimeBound <= 3), -3600, 0)
-					),
-					0
-			  )
-					  
-			) as 'length',
-			dateline,
-			data,
-			machineuuid
-			
-			from statistic
-			where dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) and typeid = '$typeid' 
-			and (
-				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)) <= dateline and dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat))) 
-				or
-				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)) <= dateline+data and dateline+data <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)))
-	 		)
-		";
-		return "(".$queryString.")";
-	}
-}
-
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index e2c76b09..82c03acc 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -24,55 +24,16 @@ class Page_Statistics_Reporting extends Page
 	{
 		// timespan you want to see = Days selected * seconds per Day (86400)
 		// default = 14 days
-		$cutOff = Request::get('cutoff', 14, 'int') - 1;
+		GetData::$cutOff = Request::get('cutoff', 14, 'int') - 1;
+		GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
+		GetData::$upperTimeBound = Request::get('upper', 24, 'int');
 
-		$lowerTimeBound = Request::get('lower', 0, 'int');
+		$data = array_merge(GetData::total(), array('perLocation' => array(), 'perClient' => array(), 'perUser' => array(), 'perVM' => array()));
+		$data['perLocation'] = GetData::perLocation();
+		$data['perClient'] = GetData::perClient();
+		$data['perUser'] = GetData::perUser();
+		$data['perVM'] = GetData::perVM();
 
-		$upperTimeBound = Request::get('upper', 24, 'int');
-
-
-		// total time online, average time online, total  number of logins
-		$res = StatisticReporting::getOverallStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$row = $res->fetch(PDO::FETCH_ASSOC);
-		$data = array('time' =>  StatisticReporting::formatSeconds($row['sum']), 'medianTime' =>  StatisticReporting::formatSeconds(StatisticReporting::calcMedian($row['median'])), 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
-
-		//total time offline
-		$res = StatisticReporting::getTotalOfflineStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$row = $res->fetch(PDO::FETCH_ASSOC);
-		$data = array_merge($data, array('totalOfftime' => StatisticReporting::formatSeconds($row['timeOff'])));
-
-		// per location
-		$res = StatisticReporting::getLocationStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$data[] = array('perLocation' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row['medianTime']));
-			$data['perLocation'][] = array('location' => $row['locName'], 'time' => StatisticReporting::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
-		}
-
-		// per client
-		$res = StatisticReporting::getClientStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$data[] = array('perClient' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$median = StatisticReporting::calcMedian(StatisticReporting::calcMedian($row['medianTime']));
-			$data['perClient'][] = array('hostname' => $row['clientName'], 'time' => StatisticReporting::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
-				'medianTime' => StatisticReporting::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => StatisticReporting::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'lastStart' => date(DATE_RSS,$row['lastStart']), 'lastStartUnixtime' => $row['lastStart'],
-				'lastLogout' => date(DATE_RSS,$row['lastLogout']), 'lastLogoutUnixtime' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row['locName']);
-		}
-
-		// per user
-		$res = StatisticReporting::getUserStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$data[] = array('perUser' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$data['perUser'][] = array('user' => $row['name'], 'sessions' => $row['count']);
-		}
-
-		// per vm
-		$res = StatisticReporting::getVMStatistics($cutOff, $lowerTimeBound, $upperTimeBound);
-		$data[] = array('perVM' => array());
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$data['perVM'][] = array('vm' => $row['name'], 'sessions' => $row['count']);
-		}
 
 		Render::addTemplate('columnChooser');
 		Render::addTemplate('_page', $data);
-- 
cgit v1.2.3-55-g7522


From 5da76e80a9fb64bfbda5897aa08fa1bc575dbd25 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Fri, 13 Jan 2017 13:22:27 +0100
Subject: [statistics_reporting] improved cutoff in query functions + bugfix

---
 .../statistics_reporting/hooks/cron.inc.php        |  3 +
 .../statistics_reporting/inc/getdata.inc.php       | 17 ++--
 .../statistics_reporting/inc/queries.inc.php       | 91 +++++++++++++---------
 .../statistics_reporting/page.inc.php              |  5 +-
 4 files changed, 70 insertions(+), 46 deletions(-)
 create mode 100644 modules-available/statistics_reporting/hooks/cron.inc.php

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

diff --git a/modules-available/statistics_reporting/hooks/cron.inc.php b/modules-available/statistics_reporting/hooks/cron.inc.php
new file mode 100644
index 00000000..b79883df
--- /dev/null
+++ b/modules-available/statistics_reporting/hooks/cron.inc.php
@@ -0,0 +1,3 @@
+<?php
+
+$lastReporting = Property::get("lastReporting", 7);
diff --git a/modules-available/statistics_reporting/inc/getdata.inc.php b/modules-available/statistics_reporting/inc/getdata.inc.php
index a1df66d0..8628d9db 100644
--- a/modules-available/statistics_reporting/inc/getdata.inc.php
+++ b/modules-available/statistics_reporting/inc/getdata.inc.php
@@ -2,7 +2,8 @@
 
 class GetData
 {
-	public static $cutOff = 7;
+	public static $from;
+	public static $to;
 	public static $lowerTimeBound = 0;
 	public static $upperTimeBound = 24;
 
@@ -10,12 +11,12 @@ class GetData
 	// total
 	public static function total($anonymize = false) {
 		// total time online, average time online, total  number of logins
-		$res = Queries::getOverallStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$res = Queries::getOverallStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_ASSOC);
 		$data = array('time' =>  self::formatSeconds($row['sum']), 'medianTime' =>  self::formatSeconds(self::calcMedian($row['median'])), 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
 
 		//total time offline
-		$res = Queries::getTotalOfflineStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$res = Queries::getTotalOfflineStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_ASSOC);
 		$data = array_merge($data, array('totalOfftime' => self::formatSeconds($row['timeOff'])));
 
@@ -24,7 +25,7 @@ class GetData
 
 	// per location
 	public static function perLocation($anonymize = false) {
-		$res = Queries::getLocationStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$res = Queries::getLocationStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
 		$loc = $anonymize ? 'locHash' : 'locName';
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
@@ -37,9 +38,9 @@ class GetData
 
 	// per client
 	public static function perClient($anonymize = false) {
-		$res = Queries::getClientStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$res = Queries::getClientStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
-		$name = $anonymize ? 'clientHash' : 'hostname';
+		$name = $anonymize ? 'clientHash' : 'clientName';
 		$loc = $anonymize ? 'locHash' : 'locName';
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 			$median = self::calcMedian(self::calcMedian($row['medianTime']));
@@ -52,7 +53,7 @@ class GetData
 
 	// per user
 	public static function perUser($anonymize = false) {
-		$res = Queries::getUserStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$res = Queries::getUserStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
 		$user = $anonymize ? 'userHash' : 'name';
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
@@ -64,7 +65,7 @@ class GetData
 
 	// per vm
 	public static function perVM() {
-		$res = Queries::getVMStatistics(self::$cutOff, self::$lowerTimeBound, self::$upperTimeBound);
+		$res = Queries::getVMStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 			$data[] = array('vm' => $row['name'], 'sessions' => $row['count']);
diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index 23afceed..23f5fb03 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -5,18 +5,18 @@ class Queries
 {
 
 	// Client Data: Name, Time Online, Median Time Online, Time Offline, last start, last logout, Last Time Booted, Number of Sessions > 60Sec, Number of Sessions < 60Sec, name of location, id of location (anonymized), machine uuid (anonymized)
-	public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+	public static function getClientStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24, $excludeToday = false) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
 		$res = Database::simpleQuery("SELECT t1.name AS clientName, timeSum, medianTime, offlineSum, lastStart, lastLogout, longSessions, shortSessions, locName, MD5(locId) AS locHash, MD5(t1.uuid) AS clientHash FROM (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId'
-													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
+													FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable
 														INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
 														LEFT JOIN location ON machine.locationid = location.locationid
 													GROUP BY machine.machineuuid
 												) 	t1 
 												INNER JOIN (
 													SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum', MAX(offlineTable.dateline) AS 'lastStart'
-													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
+													FROM ".self::getBoundedTableQueryString('~offline-length', $from, $to, $lowerTimeBound, $upperTimeBound)." offlineTable
 														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid
 													GROUP BY machine.machineuuid
 												) 	t2 
@@ -25,18 +25,18 @@ class Queries
 	}
 
 	// Location Data: Name, ID (anonymized), Time Online, Median Time Online, Time Offline, Number of Sessions > 60Sec, Number of Sessions < 60Sec
-	public static function getLocationStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+	public static function getLocationStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24, $excludeToday = false) {
 		$notassigned = Dictionary::translateFile('template-tags', 'lang_notassigned');
 		$res = Database::simpleQuery("SELECT t1.locName AS locName, MD5(locId) AS locHash, timeSum, medianTime, offlineSum, longSessions, shortSessions FROM (
 													SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', location.locationid AS 'locId', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions'
-													FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
+													FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable
 												   	INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
 													GROUP BY location.locationname
 												) 	t1 
 												INNER JOIN (
 											 		SELECT IFNULL(location.locationname, '$notassigned') AS 'locName', SUM(CAST(offlineTable.length AS UNSIGNED)) AS 'offlineSum'
-													FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable
+													FROM ".self::getBoundedTableQueryString('~offline-length', $from, $to, $lowerTimeBound, $upperTimeBound)." offlineTable
 														INNER JOIN machine ON offlineTable.machineuuid = machine.machineuuid 
 														LEFT JOIN location ON machine.locationid = location.locationid 
 													GROUP BY location.locationname
@@ -46,80 +46,96 @@ class Queries
 	}
 
 	// User Data: Name, Name(anonymized), Number of Logins
-	public static function getUserStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT username AS name, IF(username = 'anonymous', 'anonymous', md5(username)) AS  userHash, COUNT(*) AS 'count' 
+	public static function getUserStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT username AS name, IF(username = 'anonymous', 'anonymous', md5(username)) AS  userHash, COUNT(*) AS 'count'
 												FROM statistic 
-												WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
-														AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound))
+												WHERE typeid='.vmchooser-session-name' AND dateline+data >= $from and dateline <= $to AND (
+														(@daysDiff := (TO_DAYS(FROM_UNIXTIME(@end := IF(dateline+data > $to, $to, dateline+data), '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(@start := IF(dateline < $from, $from, dateline), '%y-%m-%d'))) = 0
+																			and (FROM_UNIXTIME(@end, '%H') >= $lowerTimeBound) AND (FROM_UNIXTIME(@start, '%H') < $upperTimeBound))
+														or
+														(@daysDiff = 1 and (FROM_UNIXTIME(@end, '%H') >= $lowerTimeBound) OR (FROM_UNIXTIME(@start, '%H') < $upperTimeBound))
+														or
+														@daysDiff >= 2
+												)
 												GROUP BY username 
 												ORDER BY 2 DESC");
 		return $res;
 	}
 
 	// Virtual Machine Data: Name, Number of Usages
-	public static function getVMStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT data AS name, COUNT(*) AS 'count' FROM statistic WHERE typeid='.vmchooser-session-name' AND dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) 
-												AND ((FROM_UNIXTIME(dateline+data, '%H')*1 >= $lowerTimeBound) AND (FROM_UNIXTIME(dateline, '%H')*1 < $upperTimeBound)) 
+	public static function getVMStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24) {
+		$res = Database::simpleQuery("SELECT data AS name, COUNT(*) AS 'count'
+											 	FROM statistic
+												WHERE typeid='.vmchooser-session-name' AND dateline+data >= $from and dateline <= $to AND (
+														(@daysDiff := (TO_DAYS(FROM_UNIXTIME(@end := IF(dateline+data > $to, $to, dateline+data), '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(@start := IF(dateline < $from, $from, dateline), '%y-%m-%d'))) = 0
+																			and (FROM_UNIXTIME(@end, '%H') >= $lowerTimeBound) AND (FROM_UNIXTIME(@start, '%H') < $upperTimeBound))
+														or
+														(@daysDiff = 1 and (FROM_UNIXTIME(@end, '%H') >= $lowerTimeBound) OR (FROM_UNIXTIME(@start, '%H') < $upperTimeBound))
+														or
+														@daysDiff >= 2
+												)
 												GROUP BY data 
 												ORDER BY 2 DESC");
 		return $res;
 	}
 
 	//Total Data: Time Online, Median Time Online, Number of Sessions > 60Sec, Number of Sessions < 60Sec
-	public static function getOverallStatistics ($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+	public static function getOverallStatistics ($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT SUM(CAST(sessionTable.length AS UNSIGNED)) AS sum, GROUP_CONCAT(sessionTable.length) AS median, SUM(sessionTable.length >= 60) AS longSessions, SUM(sessionTable.length < 60) AS shortSessions
-											 	FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable");
+											 	FROM ".self::getBoundedTableQueryString('~session-length', $from, $to, $lowerTimeBound, $upperTimeBound)." sessionTable");
 		return $res;
 	}
 
 	// Total Data(2): Time Offline
-	public static function getTotalOfflineStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
+	public static function getTotalOfflineStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24) {
 		$res = Database::simpleQuery("SELECT SUM(CAST(offlineTable.length AS UNSIGNED)) AS timeOff
-												FROM ".self::getBoundedTableQueryString('~offline-length', $lowerTimeBound, $upperTimeBound, $cutOff)." offlineTable");
+												FROM ".self::getBoundedTableQueryString('~offline-length', $from, $to, $lowerTimeBound, $upperTimeBound)." offlineTable");
 		return $res;
 	}
 
 	// query string which provides table with time-cutoff and time-bounds
-	private static function getBoundedTableQueryString($typeid, $lowerTimeBound, $upperTimeBound, $cutOff)
+	private static function getBoundedTableQueryString($typeid, $from, $to, $lowerTimeBound, $upperTimeBound)
 	{
 		$lowerFormat = "'%y-%m-%d $lowerTimeBound:00:00'";
 		$upperFormat = "'%y-%m-%d ".($upperTimeBound-1).":59:59'";
 		$queryString = "
 			select
 
+			@start := IF(dateline < $from, $from, dateline),
+			@end := IF(dateline+data > $to, $to, dateline+data),
 			@startLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)),
 			@startUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat)),
 			@endLower := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)),
 			@endUpper := UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)),
 			
-			(CAST(data AS SIGNED) 
+			(CAST(@end-@start AS SIGNED)
 			- IF(
-					dateline > @startUpper,
-					UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat) + INTERVAL 1 DAY) - dateline,
+					@start > @startUpper,
+					UNIX_TIMESTAMP(FROM_UNIXTIME(@start, $lowerFormat) + INTERVAL 1 DAY) - @start,
 					IF(
-						 dateline < @startLower,
-						 @startLower - dateline,
+						 @start < @startLower,
+						 @startLower - @start,
 						 0
 					)
 			  )
 			- IF(
-					dateline+data > @endUpper,
-					dateline+data - (@endUpper + 1),
+					@end > @endUpper,
+					@end - (@endUpper + 1),
 					IF(
-						 dateline+data < @endLower,
-						 dateline+data - (UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat) - INTERVAL 1 DAY) + 1),
+						 @end < @endLower,
+						 @end - (UNIX_TIMESTAMP(FROM_UNIXTIME(@end, $upperFormat) - INTERVAL 1 DAY) + 1),
 						 0
 					)
 			  )
-			- (    TO_DAYS(FROM_UNIXTIME(dateline+data, '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(dateline, '%y-%m-%d'))
-					 - 2
-					 + IF(dateline <= @startUpper, 1, 0)
-					 + IF(dateline+data >= @endLower, 1, 0)
+			- (    TO_DAYS(FROM_UNIXTIME(@end, '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(@start, '%y-%m-%d'))
+			 		 - 2
+					 + IF(@start <= @startUpper, 1, 0)
+					 + IF(@end >= @endLower, 1, 0)
 			  ) * ((24 - ($upperTimeBound - $lowerTimeBound)) * 3600)
 			  
 			- IF(
-					@leftBound := IF(dateline <= @startUpper, @startUpper, UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat) + INTERVAL 1 DAY))
-					< @rightBound := IF(dateline+data >= @endLower, @endLower, UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat) - INTERVAL 1 DAY)),
+					@leftBound := IF(@start <= @startUpper, @startUpper, UNIX_TIMESTAMP(FROM_UNIXTIME(@start, $upperFormat) + INTERVAL 1 DAY))
+					< @rightBound := IF(@end >= @endLower, @endLower, UNIX_TIMESTAMP(FROM_UNIXTIME(@end, $lowerFormat) - INTERVAL 1 DAY)),
 					IF(
 						@timeDiff := (
 						(date_format(from_unixtime(@leftBound), '%H') -
@@ -133,18 +149,19 @@ class Queries
 					),
 					0
 			  )
-					  
 			) as 'length',
 			dateline,
 			data,
 			machineuuid
 			
 			from statistic
-			where dateline+data >= UNIX_TIMESTAMP(CURDATE() - INTERVAL $cutOff DAY) and typeid = '$typeid' 
+			where dateline+data >= $from and dateline <= $to and typeid = '$typeid' 
 			and (
-				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $lowerFormat)) <= dateline and dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat))) 
+				(@daysDiff := (TO_DAYS(FROM_UNIXTIME(dateline+data, '%y-%m-%d')) - TO_DAYS(FROM_UNIXTIME(dateline, '%y-%m-%d'))) = 0 and (dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat)) and dateline+data >= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat))))
 				or
-				(UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat)) <= dateline+data and dateline+data <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $upperFormat)))
+				(@daysDiff = 1 and (dateline <= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline, $upperFormat)) or dateline+data >= UNIX_TIMESTAMP(FROM_UNIXTIME(dateline+data, $lowerFormat))))
+				or
+				@daysDiff >= 2
 	 		)
 		";
 		return "(".$queryString.")";
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 82c03acc..aa373f54 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -24,7 +24,10 @@ class Page_Statistics_Reporting extends Page
 	{
 		// timespan you want to see = Days selected * seconds per Day (86400)
 		// default = 14 days
-		GetData::$cutOff = Request::get('cutoff', 14, 'int') - 1;
+		$date = new DateTime(date('Y-m-d 00:00:00'));
+		$date->sub(new DateInterval('P'.(Request::get('cutoff', 14, 'int') - 1).'D'));
+		GetData::$from = $date->getTimestamp();
+		GetData::$to = time();
 		GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
 		GetData::$upperTimeBound = Request::get('upper', 24, 'int');
 
-- 
cgit v1.2.3-55-g7522


From 3df046508f58bbfff51c5cad33f42af4e378bea7 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Fri, 13 Jan 2017 16:19:33 +0100
Subject: [statistics_reporting] improved anonymization

---
 .../statistics_reporting/inc/getdata.inc.php       | 50 +++++++++++++++-------
 .../statistics_reporting/page.inc.php              |  5 +--
 2 files changed, 36 insertions(+), 19 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/getdata.inc.php b/modules-available/statistics_reporting/inc/getdata.inc.php
index 8628d9db..880256d6 100644
--- a/modules-available/statistics_reporting/inc/getdata.inc.php
+++ b/modules-available/statistics_reporting/inc/getdata.inc.php
@@ -13,12 +13,18 @@ class GetData
 		// total time online, average time online, total  number of logins
 		$res = Queries::getOverallStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_ASSOC);
-		$data = array('time' =>  self::formatSeconds($row['sum']), 'medianTime' =>  self::formatSeconds(self::calcMedian($row['median'])), 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+		$data = array('time' =>  $row['sum'], 'medianTime' =>  self::calcMedian($row['median']), 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
 
 		//total time offline
 		$res = Queries::getTotalOfflineStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_ASSOC);
-		$data = array_merge($data, array('totalOfftime' => self::formatSeconds($row['timeOff'])));
+		$data = array_merge($data, array('totalOfftime' => $row['timeOff']));
+
+		if (!$anonymize) {
+			$data["time"] = self::formatSeconds($data["time"]);
+			$data["medianTime"] = self::formatSeconds($data["time"]);
+			$data["totalOfftime"] = self::formatSeconds($data["time"]);
+		}
 
 		return $data;
 	}
@@ -27,11 +33,19 @@ class GetData
 	public static function perLocation($anonymize = false) {
 		$res = Queries::getLocationStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
-		$loc = $anonymize ? 'locHash' : 'locName';
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$median = self::calcMedian(self::calcMedian($row['medianTime']));
-			$data[] = array('location' => $row[$loc], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
-				'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+		if (!$anonymize) {
+			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				$median = self::calcMedian(self::calcMedian($row['medianTime']));
+				$data[] = array('location' => $row['locName'], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
+					'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']),
+					'offlineTimeInSeconds' => $row['offlineSum'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+			}
+		} else {
+			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				$median = self::calcMedian(self::calcMedian($row['medianTime']));
+				$data[] = array('location' => $row['locHash'], 'time' => $row['timeSum'], 'medianTime' => $median, 'offTime' => $row['offlineSum'],
+									'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+			}
 		}
 		return $data;
 	}
@@ -40,13 +54,19 @@ class GetData
 	public static function perClient($anonymize = false) {
 		$res = Queries::getClientStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
-		$name = $anonymize ? 'clientHash' : 'clientName';
-		$loc = $anonymize ? 'locHash' : 'locName';
-		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$median = self::calcMedian(self::calcMedian($row['medianTime']));
-			$data[] = array('hostname' => $row[$name], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
-				'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'lastStart' => date(DATE_RSS,$row['lastStart']), 'lastStartUnixtime' => $row['lastStart'],
-				'lastLogout' => date(DATE_RSS,$row['lastLogout']), 'lastLogoutUnixtime' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row[$loc]);
+		if (!$anonymize) {
+			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				$median = self::calcMedian(self::calcMedian($row['medianTime']));
+				$data[] = array('hostname' => $row['clientName'], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
+					'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'lastStart' => date(DATE_RSS, $row['lastStart']), 'lastStartUnixtime' => $row['lastStart'],
+					'lastLogout' => date(DATE_RSS, $row['lastLogout']), 'lastLogoutUnixtime' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row['locName']);
+			}
+		} else {
+			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+				$median = self::calcMedian(self::calcMedian($row['medianTime']));
+				$data[] = array('hostname' => $row['clientHash'], 'time' => $row['timeSum'], 'medianTime' => $median, 'offTime' => $row['offlineSum'], 'lastStart' => $row['lastStart'],
+					'lastLogout' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row['locHash']);
+			}
 		}
 		return $data;
 	}
@@ -57,7 +77,7 @@ class GetData
 		$data = array();
 		$user = $anonymize ? 'userHash' : 'name';
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$data[] = array('user' => $row['name'], 'sessions' => $row['count']);
+			$data[] = array('user' => $row[$user], 'sessions' => $row['count']);
 		}
 		return $data;
 	}
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index aa373f54..941bf12f 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -24,9 +24,7 @@ class Page_Statistics_Reporting extends Page
 	{
 		// timespan you want to see = Days selected * seconds per Day (86400)
 		// default = 14 days
-		$date = new DateTime(date('Y-m-d 00:00:00'));
-		$date->sub(new DateInterval('P'.(Request::get('cutoff', 14, 'int') - 1).'D'));
-		GetData::$from = $date->getTimestamp();
+		GetData::$from = strtotime("- ".(Request::get('cutoff', 14, 'int') - 1)." days 00:00:00");
 		GetData::$to = time();
 		GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
 		GetData::$upperTimeBound = Request::get('upper', 24, 'int');
@@ -37,7 +35,6 @@ class Page_Statistics_Reporting extends Page
 		$data['perUser'] = GetData::perUser();
 		$data['perVM'] = GetData::perVM();
 
-
 		Render::addTemplate('columnChooser');
 		Render::addTemplate('_page', $data);
 	}
-- 
cgit v1.2.3-55-g7522


From 9cd078d34d5f3172e8e770fce3c3ec7d6445a460 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Mon, 16 Jan 2017 18:59:46 +0100
Subject: [statistics_reporting] added ui to disable the reporting

---
 .../lang/de/template-tags.json                     |  4 +-
 .../lang/en/template-tags.json                     |  4 +-
 .../statistics_reporting/page.inc.php              | 45 ++++++++++++++-------
 modules-available/statistics_reporting/style.css   |  4 ++
 .../templates/columnChooser.html                   | 46 +++++++++++++++++++++-
 5 files changed, 85 insertions(+), 18 deletions(-)

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

diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 7dcec880..73c39e1e 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -28,5 +28,7 @@
     "lang_last30": "Letzten 30 Tage",
     "lang_last90": "Letzten 90 Tage",
     "lang_apply": "Anwenden",
-    "lang_notassigned": "NICHT ZUGEWIESEN"
+    "lang_save": "Speichern",
+    "lang_notassigned": "NICHT ZUGEWIESEN",
+    "lang_reportingDescription": "Helfen Sie uns bwLehrpool, durch das wöchentliche, automatische Verschicken eines anonymisierten Statistikberichts, zu verbessern."
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 366a10de..90d59b38 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -28,5 +28,7 @@
     "lang_last30": "Last 30 days",
     "lang_last90": "Last 90 days",
     "lang_apply": "Apply",
-    "lang_notassigned": "NOT ASSIGNED"
+    "lang_save": "Save",
+    "lang_notassigned": "NOT ASSIGNED",
+    "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once per week."
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 941bf12f..1428848a 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -4,6 +4,8 @@
 class Page_Statistics_Reporting extends Page
 {
 
+	private $action = false;
+
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
 	 */
@@ -15,6 +17,8 @@ class Page_Statistics_Reporting extends Page
 			Message::addError('main.no-permission');
 			Util::redirect('?do=Main'); // does not return
 		}
+
+		$this->action = Request::any('action', 'show', 'string');
 	}
 
 	/**
@@ -22,20 +26,31 @@ class Page_Statistics_Reporting extends Page
 	 */
 	protected function doRender()
 	{
-		// timespan you want to see = Days selected * seconds per Day (86400)
-		// default = 14 days
-		GetData::$from = strtotime("- ".(Request::get('cutoff', 14, 'int') - 1)." days 00:00:00");
-		GetData::$to = time();
-		GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
-		GetData::$upperTimeBound = Request::get('upper', 24, 'int');
-
-		$data = array_merge(GetData::total(), array('perLocation' => array(), 'perClient' => array(), 'perUser' => array(), 'perVM' => array()));
-		$data['perLocation'] = GetData::perLocation();
-		$data['perClient'] = GetData::perClient();
-		$data['perUser'] = GetData::perUser();
-		$data['perVM'] = GetData::perVM();
-
-		Render::addTemplate('columnChooser');
-		Render::addTemplate('_page', $data);
+		if ($this->action === 'show') {
+			// timespan you want to see. default = last 7 days
+			GetData::$from = strtotime("- " . (Request::get('cutoff', 14, 'int') - 1) . " days 00:00:00");
+			GetData::$to = time();
+			GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
+			GetData::$upperTimeBound = Request::get('upper', 24, 'int');
+
+			$data = array_merge(GetData::total(), array('perLocation' => array(), 'perClient' => array(), 'perUser' => array(), 'perVM' => array()));
+			$data['perLocation'] = GetData::perLocation();
+			$data['perClient'] = GetData::perClient();
+			$data['perUser'] = GetData::perUser();
+			$data['perVM'] = GetData::perVM();
+
+			Render::addTemplate('columnChooser');
+			Render::addTemplate('_page', $data);
+		}
+	}
+
+	protected function doAjax()
+	{
+		$this->action = Request::any('action', false, 'string');
+		if ($this->action === 'setReporting') {
+			Property::set("reportingStatus", Request::get('reporting', "on", 'string'));
+		} elseif ($this->action === 'getReporting') {
+			echo Property::get("reportingStatus", "on");
+		}
 	}
 }
diff --git a/modules-available/statistics_reporting/style.css b/modules-available/statistics_reporting/style.css
index d7fa7a2f..4f314b14 100644
--- a/modules-available/statistics_reporting/style.css
+++ b/modules-available/statistics_reporting/style.css
@@ -7,6 +7,10 @@
     margin-bottom: 10px;
 }
 
+.top-row #button-settings {
+    margin-right: 0;
+}
+
 .buttonbar button {
     margin-bottom: 4px;
 }
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 09551fc1..47fef2a5 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -22,6 +22,7 @@
 				<div id="upper-handle" class="ui-slider-handle"></div>
 			</div>
 			<button id="applybound" type="button" class="btn btn-sm btn-primary" onclick="reloadPage()">{{lang_apply}}</button>
+			<button id="button-settings" type="button" class="pull-right btn btn-default" data-toggle="modal" data-target="#modal-settings" onclick="loadSettings()"><span class="glyphicon glyphicon-cog"></span></button>
 		</div>
 		<div class="col-md-12 buttonbar">
 			<button id="button-location" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('location')">{{lang_location}}</button>
@@ -37,6 +38,30 @@
 	</div>
 </div>
 
+
+<div id="modal-settings" class="modal fade" role="dialog">
+	<div class="modal-dialog">
+
+		<!-- Modal content-->
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal">&times;</button>
+				<h4 class="modal-title"><b>Settings</b></h4>
+			</div>
+			<div class="modal-body">
+				<label class="checkbox-inline" style="padding-left: 40px">
+					<input id="checkbox-reporting" type="checkbox" value="" style="margin-top: 0; margin-left: -30px">
+					{{lang_reportingDescription}}
+				</label>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="saveSettings()">{{lang_save}}</button>
+			</div>
+		</div>
+
+	</div>
+</div>
+
 <script type="application/javascript">
 	document.addEventListener("DOMContentLoaded", function () {
 		var lowerHandle = $("#lower-handle");
@@ -87,7 +112,7 @@
 		$("tr").removeAttr('style');
 		$("[id^=table-]").hide();
 		$('#table-'+v).show();
-		$("[id^=button-]").hide();
+		$('.buttonbar').find("[id^=button-]").hide();
 		var re = /column-(\w+)/g;
 		var match;
 		while (match = re.exec($('thead', '#table-'+v).html())) {
@@ -149,4 +174,23 @@
 		}
 		return(false);
 	}
+
+	function loadSettings() {
+		$.ajax({
+			url: '?do=statistics_reporting',
+			type: 'GET',
+			data: { action: "getReporting"},
+			success: function(value) {
+				$("#checkbox-reporting").prop("checked", value == "on");
+			}
+		});
+	}
+
+	function saveSettings() {
+		$.ajax({
+			url: '?do=statistics_reporting',
+			type: 'GET',
+			data: { action: "setReporting", reporting: $("#checkbox-reporting").is(":checked") ? "on" : "off" }
+		});
+	}
 </script>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From b5fd09f393b08f09a72f2851dc7b24e683fc9cfc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 19 Jan 2017 13:09:33 +0100
Subject: [statistics_reporting] Check if user is logged in in doAjax()

---
 modules-available/statistics_reporting/page.inc.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 1428848a..27d478dc 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -46,11 +46,15 @@ class Page_Statistics_Reporting extends Page
 
 	protected function doAjax()
 	{
-		$this->action = Request::any('action', false, 'string');
-		if ($this->action === 'setReporting') {
-			Property::set("reportingStatus", Request::get('reporting', "on", 'string'));
-		} elseif ($this->action === 'getReporting') {
-			echo Property::get("reportingStatus", "on");
+		if (!User::isLoggedIn()) {
+			echo "No.";
+		} else {
+			$this->action = Request::any('action', false, 'string');
+			if ($this->action === 'setReporting') {
+				Property::set("reportingStatus", Request::get('reporting', "on", 'string'));
+			} elseif ($this->action === 'getReporting') {
+				echo Property::get("reportingStatus", "on");
+			}
 		}
 	}
 }
-- 
cgit v1.2.3-55-g7522


From 886e13e1af47ba6488ba3c5146d96e48e08403ad Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 19 Jan 2017 16:03:06 +0100
Subject: [statistics_reporting] Overhaul remote reporting structure; default
 to off

---
 inc/util.inc.php                                   | 52 ++++++++++++++
 .../statistics_reporting/hooks/cron.inc.php        | 37 ++++------
 .../statistics_reporting/inc/remotereport.inc.php  | 84 ++++++++++++++++++++++
 .../statistics_reporting/page.inc.php              | 22 +++---
 .../templates/columnChooser.html                   |  4 +-
 5 files changed, 166 insertions(+), 33 deletions(-)
 create mode 100644 modules-available/statistics_reporting/inc/remotereport.inc.php

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

diff --git a/inc/util.inc.php b/inc/util.inc.php
index 671028ed..d454d18d 100644
--- a/inc/util.inc.php
+++ b/inc/util.inc.php
@@ -365,4 +365,56 @@ SADFACE;
 		exit(0);
 	}
 
+	/**
+	 * Return a binary string of given length, containing
+	 * random bytes. If $secure is given, only methods of
+	 * obtaining cryptographically strong random bytes will
+	 * be used, otherwise, weaker methods might be used.
+	 *
+	 * @param int $length number of bytes to return
+	 * @param bool $secure true = only use strong random sources
+	 * @return string|bool string of requested length, false on error
+	 */
+	public static function randomBytes($length, $secure)
+	{
+		if (function_exists('random_bytes')) {
+			return random_bytes($length);
+		}
+		if ($secure) {
+			if (function_exists('openssl_random_pseudo_bytes')) {
+				$bytes = openssl_random_pseudo_bytes($length, $ok);
+				if ($bytes !== false && $ok) {
+					return $bytes;
+				}
+			}
+			$file = '/dev/random';
+		} else {
+			$file = '/dev/urandom';
+		}
+		$fh = @fopen($file, 'r');
+		if ($fh !== false) {
+			$bytes = fread($fh, $length);
+			while ($bytes !== false && strlen($bytes) < $length) {
+				$new = fread($fh, $length - strlen($bytes));
+				if ($new === false) {
+					$bytes = false;
+					break;
+				}
+				$bytes .= $new;
+			}
+			fclose($fh);
+			if ($bytes !== false) {
+				return $bytes;
+			}
+		}
+		if ($secure) {
+			return false;
+		}
+		$bytes = '';
+		while ($length > 0) {
+			$bytes .= chr(mt_rand(0, 255));
+		}
+		return $bytes;
+	}
+
 }
diff --git a/modules-available/statistics_reporting/hooks/cron.inc.php b/modules-available/statistics_reporting/hooks/cron.inc.php
index bd427e64..a48f74c2 100644
--- a/modules-available/statistics_reporting/hooks/cron.inc.php
+++ b/modules-available/statistics_reporting/hooks/cron.inc.php
@@ -1,32 +1,23 @@
 <?php
 
-$nextReporting = Property::get("nextReporting", 0);
-$time = time();
+if (RemoteReport::isReportingEnabled()) {
+	$nextReporting = RemoteReport::getReportingTimestamp();
 
-$allowReport = Property::get("reportingStatus", "on") == "on";
+	// It's time to generate a new report
+	if ($nextReporting <= time()) {
+		RemoteReport::writeNextReportingTimestamp();
 
-if ($nextReporting < $time && $allowReport) {
+		$from = strtotime("-7 days", $nextReporting);
+		$to = $nextReporting;
 
-	Property::set("nextReporting", strtotime("Sunday 23:59:59"));
+		$statisticsReport = json_encode(RemoteReport::generateReport($from, $to));
 
-	GetData::$from = strtotime("last sunday - 6 days");
-	GetData::$to = strtotime("last sunday 23:59:59");
-	GetData::$salt = bin2hex(random_bytes(20));
+		$params = array("action" => "statistics", "data" => $statisticsReport);
 
-	$data = array_merge(GetData::total(true), array('perLocation' => array(), 'perClient' => array(), 'perUser' => array(), 'perVM' => array()));
-	$data['perLocation'] = GetData::perLocation(true);
-	$data['perClient'] = GetData::perClient(true);
-	$data['perUser'] = GetData::perUser(true);
-	$data['perVM'] = GetData::perVM(true);
+		$result = Download::asStringPost(CONFIG_REPORTING_URL, $params, 30, $code);
 
-
-	$statisticsReport = json_encode($data);
-
-	$params = array("action" => "statistics", "data" => $statisticsReport);
-
-	Download::asStringPost(CONFIG_REPORTING_URL, $params, 300, $code);
-
-	if ($code != 200) {
-		EventLog::warning("Statistics Reporting: ".$code);
+		if ($code != 200) {
+			EventLog::warning("Statistics Reporting failed: " . $code, $result);
+		}
 	}
-}
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php
new file mode 100644
index 00000000..0bf4e7e2
--- /dev/null
+++ b/modules-available/statistics_reporting/inc/remotereport.inc.php
@@ -0,0 +1,84 @@
+<?php
+
+class RemoteReport
+{
+
+	const ENABLED_ID = 'statistics-reporting-enabled';
+	const NEXT_SUBMIT_ID = 'statistics-reporting-next';
+
+	/**
+	 * Enable or disable remote reporting of usage statistics.
+	 *
+	 * @param bool|string $isEnabled true or 'on' if reporting should be enabled
+	 */
+	public static function setReportingEnabled($isEnabled)
+	{
+		$value = ($isEnabled === true || $isEnabled === 'on') ? 'on' : '';
+		Property::set(self::ENABLED_ID, $value, 60 * 24 * 14);
+	}
+
+	/**
+	 * Returns whether remote reporting is enabled or not.
+	 *
+	 * @return bool true if reporting is on, false if off
+	 */
+	public static function isReportingEnabled()
+	{
+		return Property::get(self::ENABLED_ID, false);
+	}
+
+	/**
+	 * Get the timestamp of the end of the next 7 day interval to
+	 * report statistics for. Usually if this is < time() you want
+	 * to generate the report.
+	 *
+	 * @return int timestamp of the end of the reporting time frame
+	 */
+	public static function getReportingTimestamp()
+	{
+		$ts = Property::get(self::NEXT_SUBMIT_ID, 0);
+		if ($ts === 0) {
+			// No timestamp stored yet - might be a fresh install
+			// schedule for next time
+			self::updateNextReportingTimestamp();
+			$ts = Property::get(self::NEXT_SUBMIT_ID, 0);
+		} elseif ($ts < strtotime('last monday')) {
+			// Too long ago, move forward to last monday
+			$ts = strtotime('last monday');
+		}
+		return $ts;
+	}
+
+	/**
+	 * Update the timestamp of the next scheduled statistics report.
+	 * This sets the end of the next 7 day interval to the start of
+	 * next monday (00:00).
+	 */
+	public static function writeNextReportingTimestamp()
+	{
+		Property::set(self::NEXT_SUBMIT_ID, strtotime('next monday'), 60 * 24 * 14);
+	}
+
+	/**
+	 * Generate the multi-dimensional array containing the anonymized
+	 * (weekly) statistics to report.
+	 *
+	 * @param $from start timestamp
+	 * @param $to end timestamp
+	 * @return array wrapped up statistics, ready for reporting
+	 */
+	public static function generateReport($from, $to) {
+		GetData::$from = $from;
+		GetData::$to = $to;
+		GetData::$salt = bin2hex(Util::randomBytes(20));
+		$data = GetData::total(true);
+		$data['perLocation'] = GetData::perLocation(true);
+		$data['perClient'] = GetData::perClient(true);
+		$data['perUser'] = GetData::perUser(true);
+		$data['perVM'] = GetData::perVM(true);
+		$data['tsFrom'] = $from;
+		$data['tsTo'] = $to;
+		return $data;
+	}
+
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 27d478dc..0309be68 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -46,15 +46,21 @@ class Page_Statistics_Reporting extends Page
 
 	protected function doAjax()
 	{
-		if (!User::isLoggedIn()) {
-			echo "No.";
-		} else {
-			$this->action = Request::any('action', false, 'string');
-			if ($this->action === 'setReporting') {
-				Property::set("reportingStatus", Request::get('reporting', "on", 'string'));
-			} elseif ($this->action === 'getReporting') {
-				echo Property::get("reportingStatus", "on");
+		$this->action = Request::any('action', false, 'string');
+		if ($this->action === 'setReporting') {
+			if (!User::isLoggedIn()) {
+				die("No.");
+			}
+			$state = Request::post('reporting', false, 'string');
+			if ($state === false) {
+				die('Missing setting value.');
 			}
+			RemoteReport::setReportingEnabled($state);
+		} elseif ($this->action === 'getReporting') {
+			echo RemoteReport::isReportingEnabled() ? 'on' : '';
+		} else {
+			echo 'Invalid action.';
 		}
 	}
+
 }
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 47fef2a5..513bc36b 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -189,8 +189,8 @@
 	function saveSettings() {
 		$.ajax({
 			url: '?do=statistics_reporting',
-			type: 'GET',
-			data: { action: "setReporting", reporting: $("#checkbox-reporting").is(":checked") ? "on" : "off" }
+			type: 'POST',
+			data: { action: "setReporting", reporting: $("#checkbox-reporting").is(":checked") ? "on" : "off", token: TOKEN }
 		});
 	}
 </script>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 5c6b40b28ead1157260e4abc2e697a696f69520e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 31 Jan 2017 15:45:28 +0100
Subject: [statistics_reporting] Make getdata functions options flag based in
 preparation of data export

---
 .../statistics_reporting/inc/getdata.inc.php       | 87 ++++++++++++++--------
 .../statistics_reporting/inc/remotereport.inc.php  | 10 +--
 .../statistics_reporting/page.inc.php              | 10 +--
 .../statistics_reporting/templates/_page.html      | 24 +++---
 4 files changed, 76 insertions(+), 55 deletions(-)

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

diff --git a/modules-available/statistics_reporting/inc/getdata.inc.php b/modules-available/statistics_reporting/inc/getdata.inc.php
index 1a3c81dc..b19af966 100644
--- a/modules-available/statistics_reporting/inc/getdata.inc.php
+++ b/modules-available/statistics_reporting/inc/getdata.inc.php
@@ -1,5 +1,8 @@
 <?php
 
+define('GETDATA_ANONYMOUS', 1);
+define('GETDATA_PRINTABLE', 2);
+
 class GetData
 {
 	public static $from;
@@ -9,7 +12,8 @@ class GetData
 	public static $salt;
 
 	// total
-	public static function total($anonymize = false) {
+	public static function total($flags = 0) {
+		$printable = 0 !== ($flags & GETDATA_PRINTABLE);
 		// total time online, average time online, total  number of logins
 		$res = Queries::getOverallStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$row = $res->fetch(PDO::FETCH_ASSOC);
@@ -20,59 +24,75 @@ class GetData
 		$row = $res->fetch(PDO::FETCH_ASSOC);
 		$data = array_merge($data, array('totalOfftime' => $row['timeOff']));
 
-		if (!$anonymize) {
-			$data["time"] = self::formatSeconds($data["time"]);
-			$data["medianTime"] = self::formatSeconds($data["medianTime"]);
-			$data["totalOfftime"] = self::formatSeconds($data["totalOfftime"]);
+		if ($printable) {
+			$data["time_s"] = self::formatSeconds($data["time"]);
+			$data["medianTime_s"] = self::formatSeconds($data["medianTime"]);
+			$data["totalOfftime_s"] = self::formatSeconds($data["totalOfftime"]);
 		}
 
 		return $data;
 	}
 
 	// per location
-	public static function perLocation($anonymize = false) {
+	public static function perLocation($flags = 0) {
+		$anonymize = 0 !== ($flags & GETDATA_ANONYMOUS);
+		$printable = 0 !== ($flags & GETDATA_PRINTABLE);
 		$res = Queries::getLocationStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
-		if (!$anonymize) {
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-				$median = self::calcMedian(self::calcMedian($row['medianTime']));
-				$data[] = array('location' => $row['locName'], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
-					'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']),
-					'offlineTimeInSeconds' => $row['offlineSum'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
-			}
-		} else {
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-				$median = self::calcMedian(self::calcMedian($row['medianTime']));
-				$data[] = array('location' => $row['locHash'], 'time' => $row['timeSum'], 'medianTime' => $median, 'offTime' => $row['offlineSum'],
-									'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions']);
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$median = self::calcMedian(self::calcMedian($row['medianTime']));
+			$entry = array(
+				'location' => ($anonymize ? $row['locHash'] : $row['locName']),
+				'time' => $row['timeSum'],
+				'medianTime' => $median,
+				'offTime' => $row['offlineSum'],
+				'sessions' => $row['longSessions'],
+				'shortSessions' => $row['shortSessions']
+			);
+			if ($printable) {
+				$entry['time_s'] = self::formatSeconds($row['timeSum']);
+				$entry['medianTime_s'] = self::formatSeconds($median);
+				$entry['offTime_s'] = self::formatSeconds($row['offlineSum']);
 			}
+			$data[] = $entry;
 		}
 		return $data;
 	}
 
 	// per client
-	public static function perClient($anonymize = false) {
+	public static function perClient($flags = 0) {
+		$anonymize = 0 !== ($flags & GETDATA_ANONYMOUS);
+		$printable = 0 !== ($flags & GETDATA_PRINTABLE);
 		$res = Queries::getClientStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
-		if (!$anonymize) {
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-				$median = self::calcMedian(self::calcMedian($row['medianTime']));
-				$data[] = array('hostname' => $row['clientName'], 'time' => self::formatSeconds($row['timeSum']), 'timeInSeconds' => $row['timeSum'],
-					'medianTime' => self::formatSeconds($median), 'medianTimeInSeconds' => $median, 'offTime' => self::formatSeconds($row['offlineSum']), 'offlineTimeInSeconds' => $row['offlineSum'], 'lastStart' => date(DATE_RSS, $row['lastStart']), 'lastStartUnixtime' => $row['lastStart'],
-					'lastLogout' => date(DATE_RSS, $row['lastLogout']), 'lastLogoutUnixtime' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row['locName']);
-			}
-		} else {
-			while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-				$median = self::calcMedian(self::calcMedian($row['medianTime']));
-				$data[] = array('hostname' => $row['clientHash'], 'time' => $row['timeSum'], 'medianTime' => $median, 'offTime' => $row['offlineSum'], 'lastStart' => $row['lastStart'],
-					'lastLogout' => $row['lastLogout'], 'sessions' => $row['longSessions'], 'shortSessions' => $row['shortSessions'], 'locationName' => $row['locHash']);
+		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
+			$median = self::calcMedian(self::calcMedian($row['medianTime']));
+			$entry = array(
+				'hostname' => ($anonymize ? $row['clientHash'] : $row['clientName']),
+				'time' => $row['timeSum'],
+				'medianTime' => $median,
+				'offTime' => $row['offlineSum'],
+				'lastStart' => $row['lastStart'],
+				'lastLogout' => $row['lastLogout'],
+				'sessions' => $row['longSessions'],
+				'shortSessions' => $row['shortSessions'],
+				'location' => ($anonymize ? $row['locHash'] : $row['locName']),
+			);
+			if ($printable) {
+				$entry['time_s'] = self::formatSeconds($row['timeSum']);
+				$entry['medianTime_s'] = self::formatSeconds($median);
+				$entry['offTime_s'] = self::formatSeconds($row['offlineSum']);
+				$entry['lastStart_s'] = date(DATE_RSS, $row['lastStart']);
+				$entry['lastLogout_s'] = date(DATE_RSS, $row['lastLogout']);
 			}
+			$data[] = $entry;
 		}
 		return $data;
 	}
 
 	// per user
-	public static function perUser($anonymize = false) {
+	public static function perUser($flags = 0) {
+		$anonymize = 0 !== ($flags & GETDATA_ANONYMOUS);
 		$res = Queries::getUserStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
 		$user = $anonymize ? 'userHash' : 'name';
@@ -84,7 +104,8 @@ class GetData
 
 
 	// per vm
-	public static function perVM($anonymize = false) {
+	public static function perVM($flags = 0) {
+		$anonymize = 0 !== ($flags & GETDATA_ANONYMOUS);
 		$res = Queries::getVMStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
 		$vm = $anonymize ? 'vmHash' : 'name';
diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php
index 0bf4e7e2..e00e6758 100644
--- a/modules-available/statistics_reporting/inc/remotereport.inc.php
+++ b/modules-available/statistics_reporting/inc/remotereport.inc.php
@@ -71,11 +71,11 @@ class RemoteReport
 		GetData::$from = $from;
 		GetData::$to = $to;
 		GetData::$salt = bin2hex(Util::randomBytes(20));
-		$data = GetData::total(true);
-		$data['perLocation'] = GetData::perLocation(true);
-		$data['perClient'] = GetData::perClient(true);
-		$data['perUser'] = GetData::perUser(true);
-		$data['perVM'] = GetData::perVM(true);
+		$data = GetData::total(GETDATA_ANONYMOUS);
+		$data['perLocation'] = GetData::perLocation(GETDATA_ANONYMOUS);
+		$data['perClient'] = GetData::perClient(GETDATA_ANONYMOUS);
+		$data['perUser'] = GetData::perUser(GETDATA_ANONYMOUS);
+		$data['perVM'] = GetData::perVM(GETDATA_ANONYMOUS);
 		$data['tsFrom'] = $from;
 		$data['tsTo'] = $to;
 		return $data;
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 0309be68..052d813d 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -33,11 +33,11 @@ class Page_Statistics_Reporting extends Page
 			GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
 			GetData::$upperTimeBound = Request::get('upper', 24, 'int');
 
-			$data = array_merge(GetData::total(), array('perLocation' => array(), 'perClient' => array(), 'perUser' => array(), 'perVM' => array()));
-			$data['perLocation'] = GetData::perLocation();
-			$data['perClient'] = GetData::perClient();
-			$data['perUser'] = GetData::perUser();
-			$data['perVM'] = GetData::perVM();
+			$data = GetData::total(GETDATA_PRINTABLE);
+			$data['perLocation'] = GetData::perLocation(GETDATA_PRINTABLE);
+			$data['perClient'] = GetData::perClient(GETDATA_PRINTABLE);
+			$data['perUser'] = GetData::perUser(GETDATA_PRINTABLE);
+			$data['perVM'] = GetData::perVM(GETDATA_PRINTABLE);
 
 			Render::addTemplate('columnChooser');
 			Render::addTemplate('_page', $data);
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
index 37c3cf90..39726d51 100644
--- a/modules-available/statistics_reporting/templates/_page.html
+++ b/modules-available/statistics_reporting/templates/_page.html
@@ -15,11 +15,11 @@
 				<tbody>
 					<tr>
 						<th class="text-left">{{lang_total}}</th>
-						<td class="text-left column-totaltime">{{time}}</td>
-						<td class="text-left column-mediantime">{{medianTime}}</td>
+						<td class="text-left column-totaltime">{{time_s}}</td>
+						<td class="text-left column-mediantime">{{medianTime_s}}</td>
 						<td class="text-left column-longsessions">{{sessions}}</td>
 						<td class="text-left column-shortsessions">{{shortSessions}}</td>
-						<td class="text-left column-timeoffline">{{totalOfftime}}</td>
+						<td class="text-left column-timeoffline">{{totalOfftime_s}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -42,11 +42,11 @@
 					{{#perLocation}}
 					<tr>
 						<td class="locationName text-left">{{location}}</td>
-						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
-						<td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td>
+						<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
+						<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
 						<td class="text-left column-longsessions">{{sessions}}</td>
 						<td class="text-left column-shortsessions">{{shortSessions}}</td>
-						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
+						<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
 					</tr>
 					{{/perLocation}}
 				</tbody>
@@ -73,14 +73,14 @@
 					{{#perClient}}
 					<tr>
 						<td class="text-left">{{hostname}}</td>
-						<td class="text-left column-location"><a class="locationLink" href="#">{{locationName}}</a></td>
-						<td data-sort-value="{{timeInSeconds}}" class="text-left column-totaltime">{{time}}</td>
-						<td data-sort-value="{{medianTimeInSeconds}}" class="text-left column-mediantime">{{medianTime}}</td>
+						<td class="text-left column-location"><a class="locationLink" href="#">{{location}}</a></td>
+						<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
+						<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
 						<td class="text-left column-longsessions">{{sessions}}</td>
 						<td class="text-left column-shortsessions">{{shortSessions}}</td>
-						<td data-sort-value="{{offlineTimeInSeconds}}" class="text-left column-timeoffline">{{offTime}}</td>
-						<td data-sort-value="{{lastLogoutUnixtime}}" class="text-left column-lastlogout">{{lastLogout}}</td>
-						<td data-sort-value="{{lastStartUnixtime}}" class="text-left column-laststart">{{lastStart}}</td>
+						<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
+						<td data-sort-value="{{lastLogout}}" class="text-left column-lastlogout">{{lastLogout_s}}</td>
+						<td data-sort-value="{{lastStart}}" class="text-left column-laststart">{{lastStart_s}}</td>
 					</tr>
 					{{/perClient}}
 				</tbody>
-- 
cgit v1.2.3-55-g7522


From 820f80d7321c9de822fbb8f57c6160bf2d29d1a8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 1 Feb 2017 11:28:54 +0100
Subject: [statistics_reporting] Make code match specification

---
 modules-available/statistics_reporting/page.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 052d813d..81d44e15 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -28,7 +28,7 @@ class Page_Statistics_Reporting extends Page
 	{
 		if ($this->action === 'show') {
 			// timespan you want to see. default = last 7 days
-			GetData::$from = strtotime("- " . (Request::get('cutoff', 14, 'int') - 1) . " days 00:00:00");
+			GetData::$from = strtotime("- " . (Request::get('cutoff', 7, 'int') - 1) . " days 00:00:00");
 			GetData::$to = time();
 			GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
 			GetData::$upperTimeBound = Request::get('upper', 24, 'int');
-- 
cgit v1.2.3-55-g7522


From 452a0a49d0e9bef75667e488b37580dd5688a923 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 2 Feb 2017 16:06:40 +0100
Subject: [statistics_reporting] Move logic js -> php (for export feature)

---
 .../statistics_reporting/page.inc.php              | 111 ++++++++++++--
 .../statistics_reporting/templates/_page.html      | 111 --------------
 .../templates/columnChooser.html                   | 169 +++++++--------------
 .../templates/table-client.html                    |  30 ++++
 .../templates/table-location.html                  |  24 +++
 .../templates/table-total.html                     |  22 +++
 .../statistics_reporting/templates/table-user.html |  16 ++
 .../statistics_reporting/templates/table-vm.html   |  19 +++
 8 files changed, 268 insertions(+), 234 deletions(-)
 delete mode 100644 modules-available/statistics_reporting/templates/_page.html
 create mode 100644 modules-available/statistics_reporting/templates/table-client.html
 create mode 100644 modules-available/statistics_reporting/templates/table-location.html
 create mode 100644 modules-available/statistics_reporting/templates/table-total.html
 create mode 100644 modules-available/statistics_reporting/templates/table-user.html
 create mode 100644 modules-available/statistics_reporting/templates/table-vm.html

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 81d44e15..235cebb7 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -4,7 +4,22 @@
 class Page_Statistics_Reporting extends Page
 {
 
-	private $action = false;
+	private $action;
+	private $type;
+
+	// "Constants"
+	private $days;
+
+	/**
+	 * @var array Names of columns that are being used by the various tables
+	 */
+	private $COLUMNS = array('col_lastlogout', 'col_laststart', 'col_location', 'col_longsessions', 'col_mediantime',
+		'col_sessions', 'col_shortsessions', 'col_timeoffline', 'col_totaltime');
+
+	/**
+	 * @var array Names of the tables we can display
+	 */
+	private $TABLES = array('total', 'location', 'client', 'user', 'vm');
 
 	/**
 	 * Called before any page rendering happens - early hook to check parameters etc.
@@ -19,6 +34,15 @@ class Page_Statistics_Reporting extends Page
 		}
 
 		$this->action = Request::any('action', 'show', 'string');
+		$this->type = Request::get('type', 'total', 'string');
+		$this->days = Request::get('cutoff', 7, 'int');
+		$this->lower = Request::get('lower', 8, 'int');
+		$this->upper = Request::get('upper', 20, 'int');
+
+		if (!in_array($this->type, $this->TABLES)) {
+			Message::addError('invalid-table-type', $this->type);
+			$this->type = 'total';
+		}
 	}
 
 	/**
@@ -27,20 +51,67 @@ class Page_Statistics_Reporting extends Page
 	protected function doRender()
 	{
 		if ($this->action === 'show') {
+
+			/*
+			 * Leave these here for the translate module
+			 * Dictionary::translate('col_lastlogout');
+			 * Dictionary::translate('col_laststart');
+			 * Dictionary::translate('col_location');
+			 * Dictionary::translate('col_longsessions');
+			 * Dictionary::translate('col_mediantime');
+			 * Dictionary::translate('col_sessions');
+			 * Dictionary::translate('col_shortsessions');
+			 * Dictionary::translate('col_timeoffline');
+			 * Dictionary::translate('col_totaltime');
+			 * Dictionary::translate('table_total');
+			 * Dictionary::translate('table_location');
+			 * Dictionary::translate('table_client');
+			 * Dictionary::translate('table_user');
+			 * Dictionary::translate('table_vm');
+			 */
+
+			$data = array(
+				'columns' => array(),
+				'tables' => array(),
+				'days' => array()
+			);
+
+			foreach ($this->COLUMNS as $column) {
+				$data['columns'][] = array(
+					'id' => $column,
+					'name' => Dictionary::translate($column, true),
+					'checked' => Request::get($column, 'on', 'string') === 'on' ? 'checked' : '',
+				);
+			}
+
+			foreach ($this->TABLES as $table) {
+				$data['tables'][] = array(
+					'name' => Dictionary::translate('table_' . $table, true),
+					'value' => $table,
+					'selected' => ($this->type === $table) ? 'selected' : '',
+				);
+			}
+
+			foreach (array(1,2,5,7,14,30,90) as $day) {
+				$data['days'][] = array(
+					'days' => $day,
+					'selected' => ($day === $this->days) ? 'selected' : '',
+				);
+			}
+
+			$data['lower'] = $this->lower;
+			$data['upper'] = $this->upper;
+
+			Render::addTemplate('columnChooser', $data);
+
 			// timespan you want to see. default = last 7 days
-			GetData::$from = strtotime("- " . (Request::get('cutoff', 7, 'int') - 1) . " days 00:00:00");
+			GetData::$from = strtotime("- " . ($this->days - 1) . " days 00:00:00");
 			GetData::$to = time();
-			GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
-			GetData::$upperTimeBound = Request::get('upper', 24, 'int');
-
-			$data = GetData::total(GETDATA_PRINTABLE);
-			$data['perLocation'] = GetData::perLocation(GETDATA_PRINTABLE);
-			$data['perClient'] = GetData::perClient(GETDATA_PRINTABLE);
-			$data['perUser'] = GetData::perUser(GETDATA_PRINTABLE);
-			$data['perVM'] = GetData::perVM(GETDATA_PRINTABLE);
+			GetData::$lowerTimeBound = $this->lower;
+			GetData::$upperTimeBound = $this->upper;
 
-			Render::addTemplate('columnChooser');
-			Render::addTemplate('_page', $data);
+			$data['data'] = $this->fetchData(GETDATA_PRINTABLE);
+			Render::addTemplate('table-' . $this->type, $data);
 		}
 	}
 
@@ -63,4 +134,20 @@ class Page_Statistics_Reporting extends Page
 		}
 	}
 
+	private function fetchData($flags)
+	{
+		switch ($this->type) {
+		case 'total':
+			return GetData::total($flags);
+		case 'location':
+			return GetData::perLocation($flags);
+		case 'client':
+			return GetData::perClient($flags);
+		case 'user':
+			return GetData::perUser($flags);
+		case 'vm':
+			return GetData::perVM($flags);
+		}
+	}
+
 }
diff --git a/modules-available/statistics_reporting/templates/_page.html b/modules-available/statistics_reporting/templates/_page.html
deleted file mode 100644
index 1f4ac52c..00000000
--- a/modules-available/statistics_reporting/templates/_page.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<table id="table-total" class="table table-condensed table-striped">
-	<thead>
-	<tr>
-		<th class="text-left col-md-2"></th>
-		<th class="text-left column-totaltime">{{lang_totalTime}}</th>
-		<th class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-		<th class="text-left column-longsessions">{{lang_longSessions}}</th>
-		<th class="text-left column-shortsessions">{{lang_shortSessions}}</th>
-		<th class="text-left column-timeoffline">{{lang_overallOfftime}}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<tr>
-		<th class="text-left">{{lang_total}}</th>
-		<td class="text-left column-totaltime">{{time_s}}</td>
-		<td class="text-left column-mediantime">{{medianTime_s}}</td>
-		<td class="text-left column-longsessions">{{sessions}}</td>
-		<td class="text-left column-shortsessions">{{shortSessions}}</td>
-		<td class="text-left column-timeoffline">{{totalOfftime_s}}</td>
-	</tr>
-	</tbody>
-</table>
-<table id="table-perlocation" class="table table-condensed table-striped">
-	<thead>
-	<tr>
-		<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-longsessions">{{lang_longSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#perLocation}}
-	<tr>
-		<td class="locationName text-left">{{location}}</td>
-		<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
-		<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
-		<td class="text-left column-longsessions">{{sessions}}</td>
-		<td class="text-left column-shortsessions">{{shortSessions}}</td>
-		<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
-	</tr>
-	{{/perLocation}}
-	</tbody>
-</table>
-<table id="table-perclient" class="table table-condensed table-striped">
-	<thead>
-	<tr>
-		<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
-		<th data-sort="string" class="text-left column-location">{{lang_location}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-totaltime">{{lang_totalTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-mediantime">{{lang_medianSessionLength}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-longsessions">{{lang_longSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-shortsessions">{{lang_shortSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-timeoffline">{{lang_totalOffTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-lastlogout">{{lang_clientLogout}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-laststart">{{lang_clientStart}}</th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#perClient}}
-	<tr>
-		<td class="text-left">{{hostname}}</td>
-		<td class="text-left column-location"><a class="locationLink" href="#">{{location}}</a></td>
-		<td data-sort-value="{{time}}" class="text-left column-totaltime">{{time_s}}</td>
-		<td data-sort-value="{{medianTime}}" class="text-left column-mediantime">{{medianTime_s}}</td>
-		<td class="text-left column-longsessions">{{sessions}}</td>
-		<td class="text-left column-shortsessions">{{shortSessions}}</td>
-		<td data-sort-value="{{offTime}}" class="text-left column-timeoffline">{{offTime_s}}</td>
-		<td data-sort-value="{{lastLogout}}" class="text-left column-lastlogout">{{lastLogout_s}}</td>
-		<td data-sort-value="{{lastStart}}" class="text-left column-laststart">{{lastStart_s}}</td>
-	</tr>
-	{{/perClient}}
-	</tbody>
-</table>
-<table id="table-peruser" class="table table-condensed table-striped">
-	<thead>
-	<tr>
-		<th data-sort="string" class="text-left col-md-4">{{lang_user}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#perUser}}
-	<tr>
-		<td class="text-left">{{user}}</td>
-		<td class="text-left column-sessions">{{sessions}}</td>
-	</tr>
-	{{/perUser}}
-	</tbody>
-</table>
-<table id="table-pervm" class="table table-condensed table-striped">
-	<thead>
-	<tr>
-		<th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left column-sessions">{{lang_sessions}}</th>
-	</tr>
-	</thead>
-	<tbody>
-	{{#perVM}}
-	<tr>
-		<td class="text-left">{{vm}}</td>
-		<td class="text-left column-sessions">{{sessions}}</td>
-	</tr>
-	{{/perVM}}
-	</tbody>
-</table>
-
-
-
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index c51250bd..b5cf4ec8 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -1,41 +1,39 @@
 <div class="container-fluid">
-	<div class="row form-inline">
-		<div class="col-md-12  top-row">
-			<select id="select-table" onchange="chooseTable(this.value)" class="form-control">
-				<option value="total">{{lang_total}}</option>
-				<option value="perlocation">{{lang_perlocation}}</option>
-				<option value="perclient">{{lang_perclient}}</option>
-				<option value="peruser">{{lang_peruser}}</option>
-				<option value="pervm">{{lang_pervm}}</option>
-			</select>
-			<select id="select-cutoff" onchange="reloadPage()" class="form-control">
-				<option value="1">{{lang_last1}}</option>
-				<option value="2">{{lang_last2}}</option>
-				<option value="7">{{lang_last7}}</option>
-				<option value="14">{{lang_last14}}</option>
-				<option value="30">{{lang_last30}}</option>
-				<option value="90">{{lang_last90}}</option>
-			</select>
-
-			<div id="slider">
-				<div id="lower-handle" class="ui-slider-handle"></div>
-				<div id="upper-handle" class="ui-slider-handle"></div>
+	<form method="get">
+		<input type="hidden" name="do" value="statistics_reporting">
+		<div class="row form-inline">
+			<div class="col-md-12  top-row">
+				<select name="type" id="select-table" class="form-control">
+					{{#tables}}
+					<option value="{{value}}" {{selected}}>{{name}}</option>
+					{{/tables}}
+				</select>
+				<select name="cutoff" id="select-cutoff" class="form-control">
+					{{#days}}
+					<option value="{{days}}" {{selected}}>{{lang_days}}: {{days}}</option>
+					{{/days}}
+				</select>
+
+				<div id="slider">
+					<div id="lower-handle" class="ui-slider-handle"></div>
+					<div id="upper-handle" class="ui-slider-handle"></div>
+					<input type="hidden" id="lower-field" name="lower" value="{{lower}}">
+					<input type="hidden" id="upper-field" name="upper" value="{{upper}}">
+				</div>
+				<button type="submit" class="btn btn-sm btn-primary">{{lang_apply}}</button>
+				<button id="button-settings" type="button" class="pull-right btn btn-default" data-toggle="modal" data-target="#modal-settings" onclick="loadSettings()"><span class="glyphicon glyphicon-cog"></span></button>
+			</div>
+			<div class="col-md-12">
+				{{#columns}}
+				<input type="hidden" name="{{id}}" value="off">
+				<div class="checkbox">
+					<input id="{{id}}" name="{{id}}" type="checkbox" class="column-toggle form-control" {{checked}}>
+					<label for="{{id}}">{{name}}</label>
+				</div>
+				{{/columns}}
 			</div>
-			<button id="applybound" type="button" class="btn btn-sm btn-primary collapse" onclick="reloadPage()">{{lang_apply}}</button>
-			<button id="button-settings" type="button" class="pull-right btn btn-default" data-toggle="modal" data-target="#modal-settings" onclick="loadSettings()"><span class="glyphicon glyphicon-cog"></span></button>
-		</div>
-		<div class="col-md-12 buttonbar">
-			<button id="button-location" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('location')">{{lang_location}}</button>
-			<button id="button-totaltime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('totaltime')">{{lang_totalTime}}</button>
-			<button id="button-mediantime" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('mediantime')">{{lang_medianSessionLength}}</button>
-			<button id="button-sessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('sessions')">{{lang_sessions}}</button>
-			<button id="button-longsessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('longsessions')">{{lang_longSessions}}</button>
-			<button id="button-shortsessions" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('shortsessions')">{{lang_shortSessions}}</button>
-			<button id="button-timeoffline" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('timeoffline')">{{lang_totalOffTime}}</button>
-			<button id="button-lastlogout" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('lastlogout')">{{lang_clientLogout}}</button>
-			<button id="button-laststart" type="button" class="column-toggle btn btn-primary" onclick="toggleButton('laststart')">{{lang_clientStart}}</button>
 		</div>
-	</div>
+	</form>
 </div>
 
 <div id="modal-settings" class="modal fade" role="dialog">
@@ -62,31 +60,29 @@
 </div>
 
 <script type="application/javascript">
+
 	document.addEventListener("DOMContentLoaded", function () {
 		var lowerHandle = $("#lower-handle");
 		var upperHandle = $("#upper-handle");
-		var lower = getQueryVariable("lower");
-		var upper = getQueryVariable("upper");
+		var lower = $('#lower-field').val();
+		var upper = $('#upper-field').val();
 		$( "#slider" ).slider({
 			range: true,
 			min: 0,
 			max: 24,
-			values: [ lower ? lower : 8, upper ? upper : 22 ],
+			values: [ lower, upper ],
 			create: function() {
-				lowerHandle.text( $(this).slider("values")[0]+":00" );
-				upperHandle.text( $(this).slider("values")[1]+":00" );
+				lowerHandle.text( lower+":00" );
+				upperHandle.text( upper+":00" );
 			},
 			slide: function(event, ui) {
 				lowerHandle.text(ui.values[0]+":00");
 				upperHandle.text(ui.values[1]+":00");
+				$('#lower-field').val(ui.values[0]);
+				$('#upper-field').val(ui.values[1]);
 			},
-			change: function(event, ui) {
-				$("#applybound").show()
-			}
 		});
 
-		loadForm();
-
 		var table = $("table").stupidtable();
 		table.on("aftertablesort", function (event, data) {
 			var th = $(this).find("th");
@@ -105,76 +101,27 @@
 			target.parent().css( "background-color", "#f8ff99" );
 			return false;
 		});
-	});
-
-	function chooseTable(v) {
-		$("tr").removeAttr('style');
-		$("[id^=table-]").hide();
-		$('#table-'+v).show();
-		$('.buttonbar').find("[id^=button-]").hide();
-		var re = /column-(\w+)/g;
-		var match;
-		while (match = re.exec($('thead', '#table-'+v).html())) {
-			$('#button-'+match[1]).show();
-		}
-	}
-
-	function reloadPage() {
-		saveForm();
-		var cutoff = $("#select-cutoff").val();
-		var lower = $("#lower-handle").text().split(":")[0];
-		var upper = $("#upper-handle").text().split(":")[0];
-		window.location.replace("?do=statistics_reporting&cutoff="+cutoff+"&lower="+lower+"&upper="+upper);
-	}
-
-	function toggleButton(v) {
-		var button = $('#button-'+v);
-		if(button.hasClass('btn-default')) {
-			button.removeClass('btn-default');
-			button.addClass('btn-primary');
-			$('.column-'+v).show()
-		} else {
-			button.removeClass('btn-primary');
-			button.addClass('btn-default');
-			$('.column-'+v).hide()
-		}
-	}
 
-	function saveForm() {
-		sessionStorage.setItem("select-table", $("#select-table").val());
-		sessionStorage.setItem("buttons", $('.buttonbar').find(".btn-default").map(function() { return this.id; }).get().join(" "));
-	}
+		$('.column-toggle').change(function () {
+			updateColumn($(this));
+		});
+		$('.column-toggle').each(function () {
+			var box = $(this);
+			if ($('.' + box.attr('name')).length === 0) {
+				box.parent().hide();
+			} else {
+				updateColumn(box);
+			}
+		});
+	});
 
-	function loadForm() {
-		var selectTable = sessionStorage.getItem("select-table");
-		if (selectTable) {
-			$("#select-table").val(selectTable);
-			chooseTable(selectTable);
+	function updateColumn(checkbox) {
+		var cols = $('.' + checkbox.attr('name'));
+		if (checkbox.is(':checked')) {
+			cols.show();
 		} else {
-			$("#select-table").val("total");
-			chooseTable("total");
-		}
-
-		var cutoff = getQueryVariable("cutoff");
-		$('#select-cutoff').val(cutoff ? cutoff : 7);
-
-		var buttons = sessionStorage.getItem("buttons");
-		if (buttons) {
-			buttons.split(" ").forEach(function (button) {
-				toggleButton(button.substr(7));
-			});
-		}
-	}
-
-	function getQueryVariable(variable)
-	{
-		var query = window.location.search.substring(1);
-		var vars = query.split("&");
-		for (var i=0;i<vars.length;i++) {
-			var pair = vars[i].split("=");
-			if(pair[0] == variable){return pair[1];}
+			cols.hide();
 		}
-		return(false);
 	}
 
 	function loadSettings() {
diff --git a/modules-available/statistics_reporting/templates/table-client.html b/modules-available/statistics_reporting/templates/table-client.html
new file mode 100644
index 00000000..e4538da6
--- /dev/null
+++ b/modules-available/statistics_reporting/templates/table-client.html
@@ -0,0 +1,30 @@
+<table id="table-perclient" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
+		<th data-sort="string" class="text-left col_location">{{lang_location}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_totaltime">{{lang_totalTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_longsessions">{{lang_longSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_shortsessions">{{lang_shortSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_lastlogout">{{lang_clientLogout}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_laststart">{{lang_clientStart}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#data}}
+	<tr>
+		<td class="text-left">{{hostname}}</td>
+		<td class="text-left col_location"><a class="locationLink" href="#">{{location}}</a></td>
+		<td data-sort-value="{{time}}" class="text-left col_totaltime">{{time_s}}</td>
+		<td data-sort-value="{{medianTime}}" class="text-left col_mediantime">{{medianTime_s}}</td>
+		<td class="text-left col_longsessions">{{sessions}}</td>
+		<td class="text-left col_shortsessions">{{shortSessions}}</td>
+		<td data-sort-value="{{offTime}}" class="text-left col_timeoffline">{{offTime_s}}</td>
+		<td data-sort-value="{{lastLogout}}" class="text-left col_lastlogout">{{lastLogout_s}}</td>
+		<td data-sort-value="{{lastStart}}" class="text-left col_laststart">{{lastStart_s}}</td>
+	</tr>
+	{{/data}}
+	</tbody>
+</table>
diff --git a/modules-available/statistics_reporting/templates/table-location.html b/modules-available/statistics_reporting/templates/table-location.html
new file mode 100644
index 00000000..55fa8e6f
--- /dev/null
+++ b/modules-available/statistics_reporting/templates/table-location.html
@@ -0,0 +1,24 @@
+<table id="table-perlocation" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_totaltime">{{lang_totalTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_longsessions">{{lang_longSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_shortsessions">{{lang_shortSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#data}}
+	<tr>
+		<td class="locationName text-left">{{location}}</td>
+		<td data-sort-value="{{time}}" class="text-left col_totaltime">{{time_s}}</td>
+		<td data-sort-value="{{medianTime}}" class="text-left col_mediantime">{{medianTime_s}}</td>
+		<td class="text-left col_longsessions">{{sessions}}</td>
+		<td class="text-left col_shortsessions">{{shortSessions}}</td>
+		<td data-sort-value="{{offTime}}" class="text-left col_timeoffline">{{offTime_s}}</td>
+	</tr>
+	{{/data}}
+	</tbody>
+</table>
diff --git a/modules-available/statistics_reporting/templates/table-total.html b/modules-available/statistics_reporting/templates/table-total.html
new file mode 100644
index 00000000..8e24dc01
--- /dev/null
+++ b/modules-available/statistics_reporting/templates/table-total.html
@@ -0,0 +1,22 @@
+<table id="table-total" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th class="text-left col-md-2"></th>
+		<th class="text-left col_totaltime">{{lang_totalTime}}</th>
+		<th class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
+		<th class="text-left col_longsessions">{{lang_longSessions}}</th>
+		<th class="text-left col_shortsessions">{{lang_shortSessions}}</th>
+		<th class="text-left col_timeoffline">{{lang_overallOfftime}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<th class="text-left">{{lang_total}}</th>
+		<td class="text-left col_totaltime">{{data.time_s}}</td>
+		<td class="text-left col_mediantime">{{data.medianTime_s}}</td>
+		<td class="text-left col_longsessions">{{data.sessions}}</td>
+		<td class="text-left col_shortsessions">{{data.shortSessions}}</td>
+		<td class="text-left col_timeoffline">{{data.totalOfftime_s}}</td>
+	</tr>
+	</tbody>
+</table>
diff --git a/modules-available/statistics_reporting/templates/table-user.html b/modules-available/statistics_reporting/templates/table-user.html
new file mode 100644
index 00000000..5c2ba56f
--- /dev/null
+++ b/modules-available/statistics_reporting/templates/table-user.html
@@ -0,0 +1,16 @@
+<table id="table-peruser" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-4">{{lang_user}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_sessions">{{lang_sessions}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#data}}
+	<tr>
+		<td class="text-left">{{user}}</td>
+		<td class="text-left col_sessions">{{sessions}}</td>
+	</tr>
+	{{/data}}
+	</tbody>
+</table>
diff --git a/modules-available/statistics_reporting/templates/table-vm.html b/modules-available/statistics_reporting/templates/table-vm.html
new file mode 100644
index 00000000..9a775709
--- /dev/null
+++ b/modules-available/statistics_reporting/templates/table-vm.html
@@ -0,0 +1,19 @@
+<table id="table-pervm" class="table table-condensed table-striped">
+	<thead>
+	<tr>
+		<th data-sort="string" class="text-left col-md-4">{{lang_vm}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_sessions">{{lang_sessions}}</th>
+	</tr>
+	</thead>
+	<tbody>
+	{{#data}}
+	<tr>
+		<td class="text-left">{{vm}}</td>
+		<td class="text-left col_sessions">{{sessions}}</td>
+	</tr>
+	{{/data}}
+	</tbody>
+</table>
+
+
+
-- 
cgit v1.2.3-55-g7522


From f3c37dd0c499f3b66e794701921c09ca2f71f8ed Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 6 Feb 2017 15:45:30 +0100
Subject: [statistics_reporting] Add export functionality for json, csv, xml -
 GUI still missing

---
 .../statistics_reporting/page.inc.php              | 89 ++++++++++++++++++++--
 1 file changed, 83 insertions(+), 6 deletions(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 235cebb7..9d19f95a 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -43,6 +43,18 @@ class Page_Statistics_Reporting extends Page
 			Message::addError('invalid-table-type', $this->type);
 			$this->type = 'total';
 		}
+
+		// timespan you want to see. default = last 7 days
+		GetData::$from = strtotime("- " . ($this->days - 1) . " days 00:00:00");
+		GetData::$to = time();
+		GetData::$lowerTimeBound = $this->lower;
+		GetData::$upperTimeBound = $this->upper;
+
+		// Export - handle in doPreprocess so we don't render the menu etc.
+		if ($this->action === 'export') {
+			$this->doExport();
+			// Does not return
+		}
 	}
 
 	/**
@@ -104,12 +116,6 @@ class Page_Statistics_Reporting extends Page
 
 			Render::addTemplate('columnChooser', $data);
 
-			// timespan you want to see. default = last 7 days
-			GetData::$from = strtotime("- " . ($this->days - 1) . " days 00:00:00");
-			GetData::$to = time();
-			GetData::$lowerTimeBound = $this->lower;
-			GetData::$upperTimeBound = $this->upper;
-
 			$data['data'] = $this->fetchData(GETDATA_PRINTABLE);
 			Render::addTemplate('table-' . $this->type, $data);
 		}
@@ -134,6 +140,77 @@ class Page_Statistics_Reporting extends Page
 		}
 	}
 
+	private function doExport()
+	{
+		$format = Request::get('format', 'json', 'string');
+		$printable = (bool)Request::get('printable', 0, 'int');
+		$flags = 0;
+		if ($printable) {
+			$flags |= GETDATA_PRINTABLE;
+		}
+		$res = $this->fetchData($flags);
+		// TODO: Filter unwanted columns
+		switch ($format) {
+		case 'json':
+			Header('Content-Type: application/json; charset=utf-8');
+			$output = json_encode(array('data' => $res));
+			break;
+		case 'csv':
+			if (!is_array($res)) {
+				die('Error fetching data.');
+			}
+			Header('Content-Type: text/csv; charset=utf-8');
+			$fh = fopen('php://output', 'w');
+			// Output UTF-8 BOM - Excel needs this to automatically decode as UTF-8
+			// (and since Excel is the only sane reason to export as csv, just always do it)
+			fputs($fh, chr(239) . chr(187) . chr(191));
+			// Output
+			if (isset($res[0]) && is_array($res[0])) {
+				// List of rows
+				fputcsv($fh, array_keys($res[0]));
+				foreach ($res as $row) {
+					fputcsv($fh, $row);
+				}
+			} else {
+				// Single assoc array
+				fputcsv($fh, array_keys($res));
+				fputcsv($fh, $res);
+			}
+			fclose($fh);
+			exit();
+			break;
+		case 'xml':
+			$xml_data = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?><data></data>');
+			$this->array_to_xml($res, $xml_data, 'row');
+			$output = $xml_data->asXML();
+			Header('Content-Type: text/xml; charset=utf-8');
+			break;
+		default:
+			Header('Content-Type: text/plain');
+			$output = 'Invalid format: ' . $format;
+		}
+		die($output);
+	}
+
+	/**
+	 * @param $data array Data to encode
+	 * @param $xml_data \SimpleXMLElement XML Object to append to
+	 */
+	private function array_to_xml($data, $xml_data, $parentName = 'row')
+	{
+		foreach ($data as $key => $value) {
+			if (is_numeric($key)) {
+				$key = $parentName;
+			}
+			if (is_array($value)) {
+				$subnode = $xml_data->addChild($key);
+				$this->array_to_xml($value, $subnode, $key);
+			} else {
+				$xml_data->addChild($key, htmlspecialchars($value));
+			}
+		}
+	}
+
 	private function fetchData($flags)
 	{
 		switch ($this->type) {
-- 
cgit v1.2.3-55-g7522


From d542bdae7f916e555492c3b6930ea49ca31e85a9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Feb 2017 12:20:49 +0100
Subject: [statistics_reporting] Send filename to browser when downloading
 statistics

---
 modules-available/statistics_reporting/page.inc.php | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 9d19f95a..05a26c41 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -150,6 +150,7 @@ class Page_Statistics_Reporting extends Page
 		}
 		$res = $this->fetchData($flags);
 		// TODO: Filter unwanted columns
+		Header('Content-Disposition: attachment; filename=' . 'statistics-' . date('Y.m.d-H.i.s') . '.' . $format);
 		switch ($format) {
 		case 'json':
 			Header('Content-Type: application/json; charset=utf-8');
-- 
cgit v1.2.3-55-g7522


From 1aee69c75e10a1f098ec3a93614cc36da407e22b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Feb 2017 14:06:27 +0100
Subject: [statistics_reporting] Unify translation handling

---
 .../statistics_reporting/lang/de/module.json       |  9 +++++--
 .../lang/de/template-tags.json                     | 30 ++++++++--------------
 .../statistics_reporting/lang/en/module.json       |  7 ++++-
 .../lang/en/template-tags.json                     | 22 +++++-----------
 .../statistics_reporting/page.inc.php              | 15 +++--------
 .../templates/table-client.html                    |  4 +--
 .../templates/table-total.html                     |  2 +-
 7 files changed, 37 insertions(+), 52 deletions(-)

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

diff --git a/modules-available/statistics_reporting/lang/de/module.json b/modules-available/statistics_reporting/lang/de/module.json
index 86ed5f45..64003d47 100644
--- a/modules-available/statistics_reporting/lang/de/module.json
+++ b/modules-available/statistics_reporting/lang/de/module.json
@@ -1,5 +1,10 @@
 {
-    "module_name": "Statistik Auswertung",
+    "module_name": "Statistikauswertung",
     "notAssigned": "Nicht zugewiesen",
-    "page_title": "Statistik Auswertung"
+    "page_title": "Statistikauswertung",
+    "table_client": "Nach Clients",
+    "table_location": "Nach Orten",
+    "table_total": "Gesamt",
+    "table_user": "Nach Benutzern",
+    "table_vm": "Nach Veranstaltungen"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index d4d7887a..379e2030 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -1,28 +1,20 @@
 {
     "lang_apply": "Anwenden",
-    "lang_clientLogout": "Letzter VM Logout",
-    "lang_clientStart": "Letzter Client Boot",
-    "lang_hostname": "Client Name",
-    "lang_last1": "Heute",
-    "lang_last14": "Letzten 14 Tage",
-    "lang_last2": "Letzten 2 Tage",
-    "lang_last30": "Letzten 30 Tage",
-    "lang_last7": "Letzten 7 Tage",
-    "lang_last90": "Letzten 90 Tage",
-    "lang_location": "Raum",
+    "lang_displayColumns": "Auswahl angezeigter Spalten",
+    "lang_displaySelection": "Anzeigemodus, Auswahl Zeitfenster",
+    "lang_export": "Exportieren",
+    "lang_hostname": "Hostname",
+    "lang_lastLogout": "Letzter Logout",
+    "lang_lastStart": "Letzter Boot",
+    "lang_location": "Ort",
     "lang_longSessions": "Sitzungen \u2265 60s",
-    "lang_medianSessionLength": "Mittlere Sitzungsdauer",
-    "lang_overallOfftime": "Insgesamte Zeit Offline",
-    "lang_perclient": "Pro Client",
-    "lang_perlocation": "Pro Raum",
-    "lang_peruser": "Pro Benutzer",
-    "lang_pervm": "Pro VM",
+    "lang_medianSessionLength": "Sitzungsdauer Median",
     "lang_reportingDescription": "Helfen Sie uns bwLehrpool, durch das w\u00f6chentliche, automatische Verschicken eines anonymisierten Statistikberichts, zu verbessern.",
     "lang_sessions": "Sitzungen",
     "lang_shortSessions": "Sitzungen < 60s",
     "lang_total": "Gesamt",
-    "lang_totalOffTime": "Gesamtzeit Offline",
-    "lang_totalTime": "Gesamte Zeit",
+    "lang_totalOffTime": "Gesamtzeit offline",
+    "lang_totalTime": "Gesamtzeit",
     "lang_user": "Nutzer",
-    "lang_vm": "VM"
+    "lang_vm": "Veranstaltung"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/module.json b/modules-available/statistics_reporting/lang/en/module.json
index 5362fee2..f5ed37d3 100644
--- a/modules-available/statistics_reporting/lang/en/module.json
+++ b/modules-available/statistics_reporting/lang/en/module.json
@@ -1,5 +1,10 @@
 {
     "module_name": "Statistics Reporting",
     "notAssigned": "Not assigned",
-    "page_title": "Statistics Reporting"
+    "page_title": "Statistics Reporting",
+    "table_client": "By client",
+    "table_location": "By location",
+    "table_total": "Total",
+    "table_user": "By user",
+    "table_vm": "By lecture"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 0047c7a4..466a8530 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -1,22 +1,14 @@
 {
     "lang_apply": "Apply",
-    "lang_clientLogout": "Last VM Logout",
-    "lang_clientStart": "Last Client Boot",
-    "lang_hostname": "Client Name",
-    "lang_last1": "Today",
-    "lang_last14": "Last 14 days",
-    "lang_last2": "Last 2 days",
-    "lang_last30": "Last 30 days",
-    "lang_last7": "Last 7 days",
-    "lang_last90": "Last 90 days",
+    "lang_displayColumns": "Select columns to display",
+    "lang_displaySelection": "Select display mode and specify time span",
+    "lang_export": "Export",
+    "lang_hostname": "Hostname",
+    "lang_lastLogout": "Last logout",
+    "lang_lastStart": "Last boot",
     "lang_location": "Location",
     "lang_longSessions": "Sessions \u2265 60s",
     "lang_medianSessionLength": "Median Session Length",
-    "lang_overallOfftime": "Overall time offline",
-    "lang_perclient": "Per Client",
-    "lang_perlocation": "Per Location",
-    "lang_peruser": "Per User",
-    "lang_pervm": "Per VM",
     "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once per week.",
     "lang_sessions": "Sessions",
     "lang_shortSessions": "Sessions < 60s",
@@ -24,5 +16,5 @@
     "lang_totalOffTime": "Total Time Offline",
     "lang_totalTime": "Total Time",
     "lang_user": "User",
-    "lang_vm": "VM"
+    "lang_vm": "Lecture"
 }
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 05a26c41..c5640d41 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -13,8 +13,8 @@ class Page_Statistics_Reporting extends Page
 	/**
 	 * @var array Names of columns that are being used by the various tables
 	 */
-	private $COLUMNS = array('col_lastlogout', 'col_laststart', 'col_location', 'col_longsessions', 'col_mediantime',
-		'col_sessions', 'col_shortsessions', 'col_timeoffline', 'col_totaltime');
+	private $COLUMNS = array('lastLogout', 'lastStart', 'location', 'longSessions', 'medianSessionLength',
+		'sessions', 'shortSessions', 'totalOffTime', 'totalTime');
 
 	/**
 	 * @var array Names of the tables we can display
@@ -66,15 +66,6 @@ class Page_Statistics_Reporting extends Page
 
 			/*
 			 * Leave these here for the translate module
-			 * Dictionary::translate('col_lastlogout');
-			 * Dictionary::translate('col_laststart');
-			 * Dictionary::translate('col_location');
-			 * Dictionary::translate('col_longsessions');
-			 * Dictionary::translate('col_mediantime');
-			 * Dictionary::translate('col_sessions');
-			 * Dictionary::translate('col_shortsessions');
-			 * Dictionary::translate('col_timeoffline');
-			 * Dictionary::translate('col_totaltime');
 			 * Dictionary::translate('table_total');
 			 * Dictionary::translate('table_location');
 			 * Dictionary::translate('table_client');
@@ -91,7 +82,7 @@ class Page_Statistics_Reporting extends Page
 			foreach ($this->COLUMNS as $column) {
 				$data['columns'][] = array(
 					'id' => $column,
-					'name' => Dictionary::translate($column, true),
+					'name' => Dictionary::translateFile('template-tags', 'lang_' . $column, true),
 					'checked' => Request::get($column, 'on', 'string') === 'on' ? 'checked' : '',
 				);
 			}
diff --git a/modules-available/statistics_reporting/templates/table-client.html b/modules-available/statistics_reporting/templates/table-client.html
index e4538da6..e53a49d6 100644
--- a/modules-available/statistics_reporting/templates/table-client.html
+++ b/modules-available/statistics_reporting/templates/table-client.html
@@ -8,8 +8,8 @@
 		<th data-sort="int" data-sort-default="desc" class="text-left col_longsessions">{{lang_longSessions}}</th>
 		<th data-sort="int" data-sort-default="desc" class="text-left col_shortsessions">{{lang_shortSessions}}</th>
 		<th data-sort="int" data-sort-default="desc" class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_lastlogout">{{lang_clientLogout}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_laststart">{{lang_clientStart}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_lastlogout">{{lang_lastLogout}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_laststart">{{lang_lastStart}}</th>
 	</tr>
 	</thead>
 	<tbody>
diff --git a/modules-available/statistics_reporting/templates/table-total.html b/modules-available/statistics_reporting/templates/table-total.html
index 8e24dc01..2e100ae5 100644
--- a/modules-available/statistics_reporting/templates/table-total.html
+++ b/modules-available/statistics_reporting/templates/table-total.html
@@ -6,7 +6,7 @@
 		<th class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
 		<th class="text-left col_longsessions">{{lang_longSessions}}</th>
 		<th class="text-left col_shortsessions">{{lang_shortSessions}}</th>
-		<th class="text-left col_timeoffline">{{lang_overallOfftime}}</th>
+		<th class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
 	</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.3-55-g7522


From cbfb8ff3d1a441f1509285c7b1a0c505cb5d47d7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Feb 2017 14:06:56 +0100
Subject: [statistics_reporting] Excel wants ';' in CSV

---
 modules-available/statistics_reporting/page.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index c5640d41..8ae9ec92 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -159,14 +159,14 @@ class Page_Statistics_Reporting extends Page
 			// Output
 			if (isset($res[0]) && is_array($res[0])) {
 				// List of rows
-				fputcsv($fh, array_keys($res[0]));
+				fputcsv($fh, array_keys($res[0]), ';');
 				foreach ($res as $row) {
-					fputcsv($fh, $row);
+					fputcsv($fh, $row, ';');
 				}
 			} else {
 				// Single assoc array
-				fputcsv($fh, array_keys($res));
-				fputcsv($fh, $res);
+				fputcsv($fh, array_keys($res), ';');
+				fputcsv($fh, $res, ';');
 			}
 			fclose($fh);
 			exit();
-- 
cgit v1.2.3-55-g7522


From 3428949ab80ad023693834a789008f230728493a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Feb 2017 14:33:04 +0100
Subject: [statistics_reporting] Fix hiding of checkboxes not matching any
 column

---
 .../statistics_reporting/page.inc.php              |  2 +-
 .../templates/columnChooser.html                   | 28 +++++-----------------
 .../templates/table-client.html                    | 28 +++++++++++-----------
 .../templates/table-location.html                  | 20 ++++++++--------
 .../templates/table-total.html                     | 20 ++++++++--------
 5 files changed, 41 insertions(+), 57 deletions(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 8ae9ec92..06f9cfb6 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -81,7 +81,7 @@ class Page_Statistics_Reporting extends Page
 
 			foreach ($this->COLUMNS as $column) {
 				$data['columns'][] = array(
-					'id' => $column,
+					'id' => 'col_' . $column,
 					'name' => Dictionary::translateFile('template-tags', 'lang_' . $column, true),
 					'checked' => Request::get($column, 'on', 'string') === 'on' ? 'checked' : '',
 				);
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 83d1b9e1..efc1f355 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -34,11 +34,11 @@
 		<div class="col-md-12 form-inline">
 			<div><strong class="text-capitalize">{{lang_displayColumns}}</strong></div>
 			{{#columns}}
-					<input type="hidden" name="{{id}}" value="off">
-					<div class="checkbox">
-						<input id="{{id}}" name="{{id}}" type="checkbox" class="column-toggle form-control" {{checked}}>
-						<label for="{{id}}">{{name}}</label>
-					</div>
+				<input type="hidden" name="{{id}}" value="off">
+				<div class="checkbox">
+					<input id="id_{{id}}" name="{{id}}" type="checkbox" class="column-toggle form-control" {{checked}}>
+					<label for="id_{{id}}">{{name}}</label>
+				</div>
 			{{/columns}}
 		</div>
 	</div>
@@ -117,18 +117,12 @@
 			th.eq(data.column).append(' <span class="arrow glyphicon glyphicon-chevron-'+arrow+'"></span>');
 		});
 
-		if (getParameter("type") == "location" && getParameter("location")) {
-			var target = $(".locationName:contains('"+decodeURIComponent(getParameter("location")).replace(/\+/g, " ")+"'):first");
-			$(window).scrollTop(target.offset().top - $(window).height()/2);
-			target.parent().css( "background-color", "#f8ff99" );
-		}
-
 		$(".locationLink").click(function(e) {
 			e.preventDefault();
 			var form = $('#controlsForm');
 			$('<input />').attr('type', 'hidden')
 				.attr('name', "location")
-				.attr('value', $(this).text())
+				.attr('value', $(this).data('lid'))
 				.appendTo(form);
 			form.find('#select-table').val("location");
 			form.submit();
@@ -174,14 +168,4 @@
 			data: { action: "setReporting", reporting: $("#checkbox-reporting").is(":checked") ? "on" : "off", token: TOKEN }
 		});
 	}
-
-	function getParameter(name) {
-			var query = window.location.search.substring(1);
-			var vars = query.split("&");
-			for (var i=0;i<vars.length;i++) {
-				var pair = vars[i].split("=");
-				if(pair[0] == name){return pair[1];}
-			}
-			return(false);
-	}
 </script>
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/templates/table-client.html b/modules-available/statistics_reporting/templates/table-client.html
index e53a49d6..2bb79447 100644
--- a/modules-available/statistics_reporting/templates/table-client.html
+++ b/modules-available/statistics_reporting/templates/table-client.html
@@ -3,13 +3,13 @@
 	<tr>
 		<th data-sort="string" class="text-left col-md-4">{{lang_hostname}}</th>
 		<th data-sort="string" class="text-left col_location">{{lang_location}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_totaltime">{{lang_totalTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_longsessions">{{lang_longSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_shortsessions">{{lang_shortSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_lastlogout">{{lang_lastLogout}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_laststart">{{lang_lastStart}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_totalTime">{{lang_totalTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_medianSessionLength">{{lang_medianSessionLength}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_longSessions">{{lang_longSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_shortSessions">{{lang_shortSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_totalOffTime">{{lang_totalOffTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_lastLogout">{{lang_lastLogout}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_lastStart">{{lang_lastStart}}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -17,13 +17,13 @@
 	<tr>
 		<td class="text-left">{{hostname}}</td>
 		<td class="text-left col_location"><a class="locationLink" href="#">{{location}}</a></td>
-		<td data-sort-value="{{time}}" class="text-left col_totaltime">{{time_s}}</td>
-		<td data-sort-value="{{medianTime}}" class="text-left col_mediantime">{{medianTime_s}}</td>
-		<td class="text-left col_longsessions">{{sessions}}</td>
-		<td class="text-left col_shortsessions">{{shortSessions}}</td>
-		<td data-sort-value="{{offTime}}" class="text-left col_timeoffline">{{offTime_s}}</td>
-		<td data-sort-value="{{lastLogout}}" class="text-left col_lastlogout">{{lastLogout_s}}</td>
-		<td data-sort-value="{{lastStart}}" class="text-left col_laststart">{{lastStart_s}}</td>
+		<td data-sort-value="{{time}}" class="text-left col_totalTime">{{time_s}}</td>
+		<td data-sort-value="{{medianTime}}" class="text-left col_medianSessionLength">{{medianTime_s}}</td>
+		<td class="text-left col_longSessions">{{sessions}}</td>
+		<td class="text-left col_shortSessions">{{shortSessions}}</td>
+		<td data-sort-value="{{offTime}}" class="text-left col_totalOffTime">{{offTime_s}}</td>
+		<td data-sort-value="{{lastLogout}}" class="text-left col_lastLogout">{{lastLogout_s}}</td>
+		<td data-sort-value="{{lastStart}}" class="text-left col_lastStart">{{lastStart_s}}</td>
 	</tr>
 	{{/data}}
 	</tbody>
diff --git a/modules-available/statistics_reporting/templates/table-location.html b/modules-available/statistics_reporting/templates/table-location.html
index 55fa8e6f..02292e5b 100644
--- a/modules-available/statistics_reporting/templates/table-location.html
+++ b/modules-available/statistics_reporting/templates/table-location.html
@@ -2,22 +2,22 @@
 	<thead>
 	<tr>
 		<th data-sort="string" class="text-left col-md-2">{{lang_location}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_totaltime">{{lang_totalTime}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_longsessions">{{lang_longSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_shortsessions">{{lang_shortSessions}}</th>
-		<th data-sort="int" data-sort-default="desc" class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_totalTime">{{lang_totalTime}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_medianSessionLength">{{lang_medianSessionLength}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_longSessions">{{lang_longSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_shortSessions">{{lang_shortSessions}}</th>
+		<th data-sort="int" data-sort-default="desc" class="text-left col_totalOffTime">{{lang_totalOffTime}}</th>
 	</tr>
 	</thead>
 	<tbody>
 	{{#data}}
 	<tr>
 		<td class="locationName text-left">{{location}}</td>
-		<td data-sort-value="{{time}}" class="text-left col_totaltime">{{time_s}}</td>
-		<td data-sort-value="{{medianTime}}" class="text-left col_mediantime">{{medianTime_s}}</td>
-		<td class="text-left col_longsessions">{{sessions}}</td>
-		<td class="text-left col_shortsessions">{{shortSessions}}</td>
-		<td data-sort-value="{{offTime}}" class="text-left col_timeoffline">{{offTime_s}}</td>
+		<td data-sort-value="{{time}}" class="text-left col_totalTime">{{time_s}}</td>
+		<td data-sort-value="{{medianTime}}" class="text-left col_medianSessionLength">{{medianTime_s}}</td>
+		<td class="text-left col_longSessions">{{sessions}}</td>
+		<td class="text-left col_shortSessions">{{shortSessions}}</td>
+		<td data-sort-value="{{offTime}}" class="text-left col_totalOffTime">{{offTime_s}}</td>
 	</tr>
 	{{/data}}
 	</tbody>
diff --git a/modules-available/statistics_reporting/templates/table-total.html b/modules-available/statistics_reporting/templates/table-total.html
index 2e100ae5..e59dda25 100644
--- a/modules-available/statistics_reporting/templates/table-total.html
+++ b/modules-available/statistics_reporting/templates/table-total.html
@@ -2,21 +2,21 @@
 	<thead>
 	<tr>
 		<th class="text-left col-md-2"></th>
-		<th class="text-left col_totaltime">{{lang_totalTime}}</th>
-		<th class="text-left col_mediantime">{{lang_medianSessionLength}}</th>
-		<th class="text-left col_longsessions">{{lang_longSessions}}</th>
-		<th class="text-left col_shortsessions">{{lang_shortSessions}}</th>
-		<th class="text-left col_timeoffline">{{lang_totalOffTime}}</th>
+		<th class="text-left col_totalTime">{{lang_totalTime}}</th>
+		<th class="text-left col_medianSessionLength">{{lang_medianSessionLength}}</th>
+		<th class="text-left col_longSessions">{{lang_longSessions}}</th>
+		<th class="text-left col_shortSessions">{{lang_shortSessions}}</th>
+		<th class="text-left col_totalOffTime">{{lang_totalOffTime}}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<tr>
 		<th class="text-left">{{lang_total}}</th>
-		<td class="text-left col_totaltime">{{data.time_s}}</td>
-		<td class="text-left col_mediantime">{{data.medianTime_s}}</td>
-		<td class="text-left col_longsessions">{{data.sessions}}</td>
-		<td class="text-left col_shortsessions">{{data.shortSessions}}</td>
-		<td class="text-left col_timeoffline">{{data.totalOfftime_s}}</td>
+		<td class="text-left col_totalTime">{{data.time_s}}</td>
+		<td class="text-left col_medianSessionLength">{{data.medianTime_s}}</td>
+		<td class="text-left col_longSessions">{{data.sessions}}</td>
+		<td class="text-left col_shortSessions">{{data.shortSessions}}</td>
+		<td class="text-left col_totalOffTime">{{data.totalOfftime_s}}</td>
 	</tr>
 	</tbody>
 </table>
-- 
cgit v1.2.3-55-g7522


From 47db4f25c7b2d257c176bf5616bb60d8745a4a07 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Feb 2017 14:57:03 +0100
Subject: [statistics_reporting] Fix location highlighting (do it server side)

---
 modules-available/statistics_reporting/page.inc.php           | 11 ++++++++++-
 .../statistics_reporting/templates/table-client.html          |  2 +-
 .../statistics_reporting/templates/table-location.html        |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 06f9cfb6..90188121 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -209,7 +209,16 @@ class Page_Statistics_Reporting extends Page
 		case 'total':
 			return GetData::total($flags);
 		case 'location':
-			return GetData::perLocation($flags);
+			$data = GetData::perLocation($flags);
+			$highlight = Request::get('location', false, 'int');
+			if ($highlight !== false) {
+				foreach ($data as &$row) {
+					if ($row['locationId'] == $highlight) {
+						$row['highlight'] = true;
+					}
+				}
+			}
+			return $data;
 		case 'client':
 			return GetData::perClient($flags);
 		case 'user':
diff --git a/modules-available/statistics_reporting/templates/table-client.html b/modules-available/statistics_reporting/templates/table-client.html
index 2bb79447..2fb2f574 100644
--- a/modules-available/statistics_reporting/templates/table-client.html
+++ b/modules-available/statistics_reporting/templates/table-client.html
@@ -16,7 +16,7 @@
 	{{#data}}
 	<tr>
 		<td class="text-left">{{hostname}}</td>
-		<td class="text-left col_location"><a class="locationLink" href="#">{{location}}</a></td>
+		<td class="text-left col_location"><a class="locationLink" href="#" data-lid="{{locationId}}">{{location}}</a></td>
 		<td data-sort-value="{{time}}" class="text-left col_totalTime">{{time_s}}</td>
 		<td data-sort-value="{{medianTime}}" class="text-left col_medianSessionLength">{{medianTime_s}}</td>
 		<td class="text-left col_longSessions">{{sessions}}</td>
diff --git a/modules-available/statistics_reporting/templates/table-location.html b/modules-available/statistics_reporting/templates/table-location.html
index 02292e5b..9479b7af 100644
--- a/modules-available/statistics_reporting/templates/table-location.html
+++ b/modules-available/statistics_reporting/templates/table-location.html
@@ -11,7 +11,7 @@
 	</thead>
 	<tbody>
 	{{#data}}
-	<tr>
+	<tr{{#highlight}} class="info"{{/highlight}}>
 		<td class="locationName text-left">{{location}}</td>
 		<td data-sort-value="{{time}}" class="text-left col_totalTime">{{time_s}}</td>
 		<td data-sort-value="{{medianTime}}" class="text-left col_medianSessionLength">{{medianTime_s}}</td>
-- 
cgit v1.2.3-55-g7522


From 5a6575b1c07997ba1af20952f435290ce8ce970c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 8 Feb 2017 12:13:57 +0100
Subject: [statistics_reporting] Nag user if statistics reporting is disabled

---
 .../hooks/main-warning.inc.php                     |  5 +++
 .../statistics_reporting/inc/remotereport.inc.php  |  2 +-
 .../lang/de/template-tags.json                     |  4 +-
 .../lang/en/template-tags.json                     |  4 +-
 .../statistics_reporting/page.inc.php              | 26 ++++++++++++-
 .../templates/columnChooser.html                   | 43 ++++++++++++----------
 6 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 modules-available/statistics_reporting/hooks/main-warning.inc.php

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

diff --git a/modules-available/statistics_reporting/hooks/main-warning.inc.php b/modules-available/statistics_reporting/hooks/main-warning.inc.php
new file mode 100644
index 00000000..33381c9f
--- /dev/null
+++ b/modules-available/statistics_reporting/hooks/main-warning.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+if (!RemoteReport::isReportingEnabled()) {
+	Message::addInfo('statistics_reporting.remote-report-disabled', true);
+}
diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php
index e00e6758..7aad8b3a 100644
--- a/modules-available/statistics_reporting/inc/remotereport.inc.php
+++ b/modules-available/statistics_reporting/inc/remotereport.inc.php
@@ -24,7 +24,7 @@ class RemoteReport
 	 */
 	public static function isReportingEnabled()
 	{
-		return Property::get(self::ENABLED_ID, false);
+		return Property::get(self::ENABLED_ID, false) === 'on';
 	}
 
 	/**
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 379e2030..315837de 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -2,6 +2,7 @@
     "lang_apply": "Anwenden",
     "lang_displayColumns": "Auswahl angezeigter Spalten",
     "lang_displaySelection": "Anzeigemodus, Auswahl Zeitfenster",
+    "lang_downloadReport": "Report herunterladen",
     "lang_export": "Exportieren",
     "lang_hostname": "Hostname",
     "lang_lastLogout": "Letzter Logout",
@@ -9,7 +10,8 @@
     "lang_location": "Ort",
     "lang_longSessions": "Sitzungen \u2265 60s",
     "lang_medianSessionLength": "Sitzungsdauer Median",
-    "lang_reportingDescription": "Helfen Sie uns bwLehrpool, durch das w\u00f6chentliche, automatische Verschicken eines anonymisierten Statistikberichts, zu verbessern.",
+    "lang_reportingDescription": "Helfen Sie uns bwLehrpool durch das w\u00f6chentliche Verschicken eines anonymisierten Statistikberichts zu verbessern. Wenn Sie den Inhalt eines solchen Reports genauer inspizieren wollen, k\u00f6nnen Sie \u00fcber den untenstehenden Button einen aktuellen Report ihres Servers herunterladen.",
+    "lang_reportingLabel": "Anonymisierte Nutzungsstatistiken herunterladen",
     "lang_sessions": "Sitzungen",
     "lang_shortSessions": "Sitzungen < 60s",
     "lang_total": "Gesamt",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index 466a8530..a4865931 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -2,6 +2,7 @@
     "lang_apply": "Apply",
     "lang_displayColumns": "Select columns to display",
     "lang_displaySelection": "Select display mode and specify time span",
+    "lang_downloadReport": "Download report",
     "lang_export": "Export",
     "lang_hostname": "Hostname",
     "lang_lastLogout": "Last logout",
@@ -9,7 +10,8 @@
     "lang_location": "Location",
     "lang_longSessions": "Sessions \u2265 60s",
     "lang_medianSessionLength": "Median Session Length",
-    "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once per week.",
+    "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once a week. If you want to check what data the report contains, you can download such a report for reference below.",
+    "lang_reportingLabel": "Send anonymized usage statistics",
     "lang_sessions": "Sessions",
     "lang_shortSessions": "Sessions < 60s",
     "lang_total": "Total",
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 90188121..f0614d35 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -55,6 +55,14 @@ class Page_Statistics_Reporting extends Page
 			$this->doExport();
 			// Does not return
 		}
+		// Get report - fetch data exactly the way it would automatically be reported
+		// so the user can know what is going on
+		if ($this->action === 'getreport') {
+			$report = RemoteReport::generateReport(strtotime('-7 days'), time('now'));
+			Header('Content-Disposition: attachment; filename=remote-report.json');
+			Header('Content-Type: application/json; charset=utf-8');
+			die(json_encode($report));
+		}
 	}
 
 	/**
@@ -105,6 +113,13 @@ class Page_Statistics_Reporting extends Page
 			$data['lower'] = $this->lower;
 			$data['upper'] = $this->upper;
 
+			if (RemoteReport::isReportingEnabled()) {
+				$data['settingsButtonClass'] = 'default';
+				$data['reportChecked'] = 'checked';
+			} else {
+				$data['settingsButtonClass'] = 'danger';
+			}
+
 			Render::addTemplate('columnChooser', $data);
 
 			$data['data'] = $this->fetchData(GETDATA_PRINTABLE);
@@ -124,8 +139,15 @@ class Page_Statistics_Reporting extends Page
 				die('Missing setting value.');
 			}
 			RemoteReport::setReportingEnabled($state);
-		} elseif ($this->action === 'getReporting') {
-			echo RemoteReport::isReportingEnabled() ? 'on' : '';
+			$data = array();
+			if (RemoteReport::isReportingEnabled()) {
+				$data['class'] = 'default';
+				$data['checked'] = true;
+			} else {
+				$data['class'] = 'danger';
+			}
+			Header('Content-Type: application/json; charset=utf-8');
+			die(json_encode($data));
 		} else {
 			echo 'Invalid action.';
 		}
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index efc1f355..9707c970 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -2,7 +2,7 @@
 	<input type="hidden" name="do" value="statistics_reporting">
 	<div class="row">
 		<div class="col-md-12">
-			<button id="button-settings" type="button" class="pull-right btn btn-default" data-toggle="modal" data-target="#modal-settings" onclick="loadSettings()"><span class="glyphicon glyphicon-cog"></span></button>
+			<button id="button-settings" type="button" class="pull-right btn btn-{{settingsButtonClass}}" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span></button>
 			<strong class="text-capitalize">{{lang_displaySelection}}</strong>
 		</div>
 	</div>
@@ -72,8 +72,12 @@
 			</div>
 			<div class="modal-body">
 				<div class="checkbox">
-					<input id="checkbox-reporting" type="checkbox" value="on" style="margin-top: 0; margin-left: -30px">
-					<label for="checkbox-reporting" style="padding-left: 40px">{{lang_reportingDescription}}</label>
+					<input id="checkbox-reporting" type="checkbox" value="on" {{reportChecked}}>
+					<label for="checkbox-reporting" style="padding-left: 40px">{{lang_reportingLabel}}</label>
+				</div>
+				<div>
+					<p>{{lang_reportingDescription}}</p>
+					<a class="btn btn-success" href="?do=statistics_reporting&amp;action=getreport">{{lang_downloadReport}}</a>
 				</div>
 			</div>
 			<div class="modal-footer">
@@ -120,10 +124,14 @@
 		$(".locationLink").click(function(e) {
 			e.preventDefault();
 			var form = $('#controlsForm');
-			$('<input />').attr('type', 'hidden')
-				.attr('name', "location")
-				.attr('value', $(this).data('lid'))
-				.appendTo(form);
+			var inp = $('#location-id');
+			if (inp.length === 0) {
+				inp = $('<input />').attr('type', 'hidden')
+					.attr('name', "location")
+					.attr('id', 'location-id')
+					.appendTo(form);
+			}
+			inp.attr('value', $(this).data('lid'));
 			form.find('#select-table').val("location");
 			form.submit();
 		});
@@ -150,22 +158,19 @@
 		}
 	}
 
-	function loadSettings() {
-		$.ajax({
-			url: '?do=statistics_reporting',
-			type: 'GET',
-			data: { action: "getReporting"},
-			success: function(value) {
-				$("#checkbox-reporting").prop("checked", value == "on");
-			}
-		});
-	}
-
 	function saveSettings() {
 		$.ajax({
 			url: '?do=statistics_reporting',
 			type: 'POST',
-			data: { action: "setReporting", reporting: $("#checkbox-reporting").is(":checked") ? "on" : "off", token: TOKEN }
+			data: { action: "setReporting", reporting: $("#checkbox-reporting").is(":checked") ? "on" : "off", token: TOKEN },
+			success: function(value) {
+				if (typeof(value) === 'object') {
+					$("#checkbox-reporting").prop('checked', !!value['checked']);
+					$("#button-settings").removeClass('btn-default btn-danger').addClass('btn-' + value['class']);
+				} else {
+					alert('Invalid reply when setting value: ' + value + ' (' + typeof(value) + ')');
+				}
+			}
 		});
 	}
 </script>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 24908c0871f8ea12b2f158a08499cf1e14dfa7de Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 8 Feb 2017 15:18:06 +0100
Subject: [statistics_reporting] Implement column filtering for export

---
 .../statistics_reporting/page.inc.php              | 30 ++++++++++++++++++++--
 .../templates/columnChooser.html                   |  7 +++--
 2 files changed, 33 insertions(+), 4 deletions(-)

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

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index f0614d35..51c137f6 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -87,11 +87,12 @@ class Page_Statistics_Reporting extends Page
 				'days' => array()
 			);
 
+			$forceOn = (Request::get('type') === false);
 			foreach ($this->COLUMNS as $column) {
 				$data['columns'][] = array(
 					'id' => 'col_' . $column,
 					'name' => Dictionary::translateFile('template-tags', 'lang_' . $column, true),
-					'checked' => Request::get($column, 'on', 'string') === 'on' ? 'checked' : '',
+					'checked' => ($forceOn || Request::get('col_' . $column, 'off', 'string') !== 'off') ? 'checked' : '',
 				);
 			}
 
@@ -162,7 +163,32 @@ class Page_Statistics_Reporting extends Page
 			$flags |= GETDATA_PRINTABLE;
 		}
 		$res = $this->fetchData($flags);
-		// TODO: Filter unwanted columns
+		// Filter unwanted columns
+		if (isset($res[0])) {
+			foreach ($this->COLUMNS as $column) {
+				if (Request::get('col_' . $column, 'delete', 'string') === 'delete') {
+					foreach ($res as &$row) {
+						unset($row[$column], $row[$column . '_s']);
+						if ($column === 'location') {
+							unset($row['locationId']);
+						}
+					}
+				} elseif ($printable && isset($row[0][$column . '_s'])) {
+					foreach ($res as &$row) {
+						unset($row[$column]);
+					}
+				} elseif ($column === 'location' && (isset($res[0]['location']) || isset($res[0]['locationId']))) {
+					foreach ($res as &$row) {
+						if ($printable) {
+							unset($row['locationId']);
+						} else {
+							unset($row['location']);
+						}
+					}
+				}
+			}
+			unset($row);
+		}
 		Header('Content-Disposition: attachment; filename=' . 'statistics-' . date('Y.m.d-H.i.s') . '.' . $format);
 		switch ($format) {
 		case 'json':
diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html
index 75dfb34f..f08daf1c 100644
--- a/modules-available/statistics_reporting/templates/columnChooser.html
+++ b/modules-available/statistics_reporting/templates/columnChooser.html
@@ -34,9 +34,8 @@
 		<div class="col-md-12 form-inline">
 			<div><strong class="text-capitalize">{{lang_displayColumns}}</strong></div>
 			{{#columns}}
-				<input type="hidden" name="{{id}}" value="off">
 				<div class="checkbox">
-					<input id="id_{{id}}" name="{{id}}" type="checkbox" class="column-toggle form-control" {{checked}}>
+					<input id="id_{{id}}" name="{{id}}" value="on" type="checkbox" class="column-toggle form-control" {{checked}}>
 					<label for="id_{{id}}">{{name}}</label>
 				</div>
 			{{/columns}}
@@ -142,6 +141,10 @@
 		$('.column-toggle').each(function () {
 			var box = $(this);
 			if ($('.' + box.attr('name')).length === 0) {
+				if (!box.is(':checked')) {
+					box.attr('value', 'off');
+					box.prop('checked', true);
+				}
 				box.parent().hide();
 			} else {
 				updateColumn(box);
-- 
cgit v1.2.3-55-g7522


From 0d6aaf82f8c0e1f695fc170acf030a484dca1aaa Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 23 Feb 2017 18:04:53 +0100
Subject: [statistics_reporting] fixed column selector order

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

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

diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index 8cca9650..3e944c92 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -104,11 +104,11 @@ class Queries
 			# The whole length of the session/offline time.
 			(end-start
 			
-			# Now the time that is not within the daily time bounds get substracted.
+			# Now the time that is not within the daily time bounds is subtracted.
 			# This includes the time before the first daily bound, the time after the last daily bound
 			# and the time between the daily bounds (if a session/offline time spans multiple days)
 			
-			# Time before the first daily bound gets substracted.
+			# Time before the first daily bound is subtracted.
 			- IF(
 					start > startUpper,
 					UNIX_TIMESTAMP(FROM_UNIXTIME(start, $lowerFormat) + INTERVAL 1 DAY) - start,
@@ -119,7 +119,7 @@ class Queries
 					)
 			  )
 			  
-			# Time after the last daily bound gets substracted.
+			# Time after the last daily bound is subtracted.
 			- IF(
 					end > endUpper,
 					end - (endUpper + 1),
@@ -130,13 +130,13 @@ class Queries
 					)
 			  )
 			  
-			# Time between the daily bounds get substracted.
+			# Time between the daily bounds is subtracted.
 			- (    daysDiff - 2
 					 + IF(start <= startUpper, 1, 0)
 					 + IF(end >= endLower, 1, 0)
 			  ) * ((24 - ($upperTimeBound - $lowerTimeBound)) * 3600)
 		
-			# If the session crossed a clock change (to/from daylight saving time), the last substraction may have substracted
+			# If the session crossed a clock change (to/from daylight saving time), the last subtraction may have subtracted
 			# one hour too much or too little. This IF will correct this.
 			- IF(
 					innerStart < innerEnd,
@@ -161,7 +161,7 @@ class Queries
 				select 
 					*,
 					
-					# timeDiff is the clock change between leftBound and Rightbound. ( 0 = no clock change)
+					# timeDiff is the clock change between innerStart and innerEnd. ( 0 = no clock change)
 					((CAST(date_format(from_unixtime(innerStart), '%H') as SIGNED) -
 					CAST(date_format(convert_tz(from_unixtime(innerStart), @@session.time_zone, '+00:00'), '%H') as SIGNED) + 24) % 24
 					-
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 51c137f6..6bd908a5 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -13,8 +13,8 @@ class Page_Statistics_Reporting extends Page
 	/**
 	 * @var array Names of columns that are being used by the various tables
 	 */
-	private $COLUMNS = array('lastLogout', 'lastStart', 'location', 'longSessions', 'medianSessionLength',
-		'sessions', 'shortSessions', 'totalOffTime', 'totalTime');
+	private $COLUMNS = array('location', 'totalTime', 'medianSessionLength', 'sessions', 'longSessions', 'shortSessions',
+		'totalOffTime', 'lastLogout', 'lastStart');
 
 	/**
 	 * @var array Names of the tables we can display
-- 
cgit v1.2.3-55-g7522