diff options
| author | Christian Hofmaier | 2017-04-12 14:30:18 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-04-12 14:30:18 +0200 |
| commit | 9f27c7cdeb1df2f9c42373f419c6621d4faa71ca (patch) | |
| tree | e55c6e1d95685df2117401e97f946b962f4e0f47 /modules-available/statistics_reporting/inc/remotereport.inc.php | |
| parent | [permissionmanager] changed description to tooltips (diff) | |
| parent | [rebootcontrol] New module for shutting down and rebooting clients (diff) | |
| download | slx-admin-9f27c7cdeb1df2f9c42373f419c6621d4faa71ca.tar.gz slx-admin-9f27c7cdeb1df2f9c42373f419c6621d4faa71ca.tar.xz slx-admin-9f27c7cdeb1df2f9c42373f419c6621d4faa71ca.zip | |
Merge branches 'master' and 'permission-manager' of git.openslx.org:openslx-ng/slx-admin into permission-manager
Diffstat (limited to 'modules-available/statistics_reporting/inc/remotereport.inc.php')
| -rw-r--r-- | modules-available/statistics_reporting/inc/remotereport.inc.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php index 7aad8b3a..4c5f604b 100644 --- a/modules-available/statistics_reporting/inc/remotereport.inc.php +++ b/modules-available/statistics_reporting/inc/remotereport.inc.php @@ -40,7 +40,7 @@ class RemoteReport if ($ts === 0) { // No timestamp stored yet - might be a fresh install // schedule for next time - self::updateNextReportingTimestamp(); + self::writeNextReportingTimestamp(); $ts = Property::get(self::NEXT_SUBMIT_ID, 0); } elseif ($ts < strtotime('last monday')) { // Too long ago, move forward to last monday @@ -63,18 +63,16 @@ class RemoteReport * Generate the multi-dimensional array containing the anonymized * (weekly) statistics to report. * - * @param $from start timestamp - * @param $to end timestamp + * @param int $from start timestamp + * @param int $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)); + GetData::$salt = bin2hex(Util::randomBytes(20, false)); $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; |