diff options
author | Simon Rettberg | 2020-06-29 12:59:06 +0200 |
---|---|---|
committer | Simon Rettberg | 2020-07-30 13:27:06 +0200 |
commit | e7161cf21fc29c4de60e3444f7ea079e991b889a (patch) | |
tree | f461a4e23eef927c392c87df19066c7cef7a95ec | |
parent | [locationinfo] Add option to show hostnames (diff) | |
download | slx-admin-e7161cf21fc29c4de60e3444f7ea079e991b889a.tar.gz slx-admin-e7161cf21fc29c4de60e3444f7ea079e991b889a.tar.xz slx-admin-e7161cf21fc29c4de60e3444f7ea079e991b889a.zip |
[statistics_reporting] Fix numer of unique users and server CPU model
-rw-r--r-- | modules-available/statistics_reporting/inc/queries.inc.php | 3 | ||||
-rw-r--r-- | modules-available/statistics_reporting/inc/remotereport.inc.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php index 39e43765..c77f0ed8 100644 --- a/modules-available/statistics_reporting/inc/queries.inc.php +++ b/modules-available/statistics_reporting/inc/queries.inc.php @@ -402,8 +402,7 @@ class Queries { $res = Database::queryFirst("SELECT Count(DISTINCT username) as `total` FROM statistic - WHERE (dateline BETWEEN $from AND $to) AND typeid = '.vmchooser-session-name' - GROUP BY username"); + WHERE (dateline BETWEEN $from AND $to) AND typeid = '.vmchooser-session-name'"); return (int)$res['total']; } diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php index fa84e7e5..f8f54a86 100644 --- a/modules-available/statistics_reporting/inc/remotereport.inc.php +++ b/modules-available/statistics_reporting/inc/remotereport.inc.php @@ -108,7 +108,7 @@ class RemoteReport } // $data = array(); - $data['cpuCount'] = preg_match_all('/\bprocessor\s+:\s+(.*)$/m', $cpuInfo, $out); + $data['cpuCount'] = preg_match_all('/\bmodel name\s+:\s+(.*)$/m', $cpuInfo, $out); if ($data['cpuCount'] > 0) { $data['cpuModel'] = $out[1][0]; } |