mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

MDL-36380 stats: Issue with DST and monthly statistics

Browse Source
This commit is contained in:
Frederic Massart 2013-02-28 13:44:42 +08:00
parent 2e0bb2af8b
commit bed828de91
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/statslib.php
View File

@ -1468,12 +1468,20 @@ function stats_fix_zeros($stats,$timeafter,$timestr,$line2=true,$line3=false) {
// Extract the ending time of the statistics.
$actualtimes = array();
$actualtimeshour = null;
foreach ($stats as $statid => $s) {
// Normalise the month date to the 1st if for any reason it's set to later. But we ignore
// anything above or equal to 29 because sometimes we get the end of the month.
if ($timestr == 'monthly' && date('d', $s->timeend) > 1 && date('d', $s->timeend) < 29) {
$s->timeend = mktime(date('H', $s->timeend), date('i', $s->timeend), date('s', $s->timeend),
date('m', $s->timeend), 1, date('Y', $s->timeend));
// anything above or equal to 29 because sometimes we get the end of the month. Also, we will
// set the hours of the result to all of them, that way we prevent DST differences.
if ($timestr == 'monthly') {
$day = date('d', $s->timeend);
if (date('d', $s->timeend) > 1 && date('d', $s->timeend) < 29) {
$day = 1;
}
if (is_null($actualtimeshour)) {
$actualtimeshour = date('H', $s->timeend);
}
$s->timeend = mktime($actualtimeshour, 0, 0, date('m', $s->timeend), $day, date('Y', $s->timeend));
}
$stats[$statid] = $s;
$actualtimes[] = $s->timeend;
@ -1502,8 +1510,7 @@ function stats_fix_zeros($stats,$timeafter,$timestr,$line2=true,$line3=false) {
$dayofnextmonth = $daysinmonth;
}
}
$timeafter = mktime(date('H', $timeafter), date('i', $timeafter), date('s', $timeafter), $month+1,
$dayofnextmonth, $year);
$timeafter = mktime($actualtimeshour, 0, 0, $month+1, $dayofnextmonth, $year);
} else {
// This will put us in a never ending loop.
return $stats;