From 4910fa0b9f5ca6b6063965cc516ced8d72f8be5b Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Tue, 17 Jan 2017 13:47:24 +0100
Subject: [statistics_reporting] added vm name anonymization

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

(limited to 'modules-available')

diff --git a/modules-available/statistics_reporting/hooks/cron.inc.php b/modules-available/statistics_reporting/hooks/cron.inc.php
index 57e64a84..9b32bc96 100644
--- a/modules-available/statistics_reporting/hooks/cron.inc.php
+++ b/modules-available/statistics_reporting/hooks/cron.inc.php
@@ -16,7 +16,7 @@ if ($nextReporting < $time && $allowReport) {
 	$data['perLocation'] = GetData::perLocation(true);
 	$data['perClient'] = GetData::perClient(true);
 	$data['perUser'] = GetData::perUser(true);
-	$data['perVM'] = GetData::perVM();
+	$data['perVM'] = GetData::perVM(true);
 
 
 	$statisticsReport = json_encode($data);
diff --git a/modules-available/statistics_reporting/inc/getdata.inc.php b/modules-available/statistics_reporting/inc/getdata.inc.php
index 880256d6..cfb63658 100644
--- a/modules-available/statistics_reporting/inc/getdata.inc.php
+++ b/modules-available/statistics_reporting/inc/getdata.inc.php
@@ -84,11 +84,12 @@ class GetData
 
 
 	// per vm
-	public static function perVM() {
+	public static function perVM($anonymize = false) {
 		$res = Queries::getVMStatistics(self::$from, self::$to, self::$lowerTimeBound, self::$upperTimeBound);
 		$data = array();
+		$vm = $anonymize ? 'vmHash' : 'name';
 		while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
-			$data[] = array('vm' => $row['name'], 'sessions' => $row['count']);
+			$data[] = array('vm' => $row[$vm], 'sessions' => $row['count']);
 		}
 		return $data;
 	}
diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index 23f5fb03..219640a6 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -64,7 +64,7 @@ class Queries
 
 	// Virtual Machine Data: Name, Number of Usages
 	public static function getVMStatistics($from, $to, $lowerTimeBound = 0, $upperTimeBound = 24) {
-		$res = Database::simpleQuery("SELECT data AS name, COUNT(*) AS 'count'
+		$res = Database::simpleQuery("SELECT data AS name, MD5(data) AS vmHash, 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
-- 
cgit v1.2.3-55-g7522