mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-22 16:14:00 +02:00
Code Issues Releases Wiki Activity

Clean up some variable/method names

Browse Source
This commit is contained in:
Toby Zerner
2017-12-19 08:57:55 +10:30
parent d827fd36fe
commit 88228df6f2
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/statistics/src/Listener/AddStatisticsData.php
View File

@@ -84,8 +84,8 @@ class AddStatisticsData
$results = $query
->selectRaw(
'DATE_FORMAT(
@date := DATE_ADD('.$column.', INTERVAL ? SECOND), -- correct for timezone
IF(@date > ?, \'%Y-%m-%dT%H:00:00\', \'%Y-%m-%dT00:00:00\') -- if within the last 48 hours, group by hour
@date := DATE_ADD('.$column.', INTERVAL ? SECOND), -- convert to user timezone
IF(@date > ?, \'%Y-%m-%d %H:00:00\', \'%Y-%m-%d\') -- if within the last 48 hours, group by hour
) as time_group',
[$offset, new DateTime('-48 hours')]
)
@@ -94,13 +94,14 @@ class AddStatisticsData
->groupBy('time_group')
->lists('count', 'time_group');
// Now that we have the aggregated statistics, convert each point in
// time into a UNIX timestamp .
$displayTimezone = $this->getDisplayTimezone();
// Now that we have the aggregated statistics, convert each time group
// into a UNIX timestamp.
$userTimezone = $this->getUserTimezone();
$timed = [];
$results->each(function ($count, $time) use (&$timed, $displayTimezone) {
$time = new DateTime($time, $displayTimezone);
$results->each(function ($count, $time) use (&$timed, $userTimezone) {
$time = new DateTime($time, $userTimezone);
$timed[$time->getTimestamp()] = $count;
});
@@ -109,19 +110,14 @@ class AddStatisticsData
private function getTimezoneOffset()
{
$now = new DateTime;
$dataTimezone = new DateTimeZone(date_default_timezone_get());
return $this->getDisplayTimezone()->getOffset(new DateTime('now', $dataTimezone));
return $this->getUserTimezone()->getOffset($now) - $dataTimezone->getOffset($now);
}
private function getUTCOffset()
{
$utcTimezone = new DateTimeZone('UTC');
return $this->getDisplayTimezone()->getOffset(new DateTime('now', $utcTimezone));
}
private function getDisplayTimezone()
private function getUserTimezone()
{
return new DateTimeZone($this->settings->get('flarum-statistics.timezone', date_default_timezone_get()));
}