Skip to content
Permalink
Browse files

Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MO…

…ODLE_23_STABLE
  • Loading branch information...
stronk7 committed Mar 4, 2013
2 parents 328b5ea + 9845d1b commit 48f3a2495b2c2bd5d179234ef0e13fd946c384f3
Showing with 49 additions and 11 deletions.
  1. +49 −11 lib/statslib.php
@@ -1368,43 +1368,82 @@ function stats_get_report_options($courseid,$mode) {
return $reportoptions;
}
/**
* Fix missing entries in the statistics.
*
* This creates a dummy stat when nothing happened during a day/week/month.
*
* @param array $stats array of statistics.
* @param int $timeafter unused.
* @param string $timestr type of statistics to generate (dayly, weekly, monthly).
* @param boolean $line2
* @param boolean $line3
* @return array of fixed statistics.
*/
function stats_fix_zeros($stats,$timeafter,$timestr,$line2=true,$line3=false) {
if (empty($stats)) {
return;
}
$timestr = str_replace('user_','',$timestr); // just in case.
$fun = 'stats_get_base_'.$timestr;
// Gets the current user base time.
$fun = 'stats_get_base_'.$timestr;
$now = $fun();
$times = array();
// add something to timeafter since it is our absolute base
// Extract the ending time of the statistics.
$actualtimes = array();
foreach ($stats as $statid=>$s) {
//normalize the times in stats - those might have been created in different timezone, DST etc.
$s->timeend = $fun($s->timeend + 60*60*5);
$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. 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;
}
$timeafter = array_pop(array_values($actualtimes));
$actualtimesvalues = array_values($actualtimes);
$timeafter = array_pop($actualtimesvalues);
// Generate a base timestamp for each possible month/week/day.
$times = array();
while ($timeafter < $now) {
$times[] = $timeafter;
if ($timestr == 'daily') {
$timeafter = stats_get_next_day_start($timeafter);
} else if ($timestr == 'weekly') {
$timeafter = stats_get_next_week_start($timeafter);
} else if ($timestr == 'monthly') {
$timeafter = stats_get_next_month_start($timeafter);
// We can't just simply +1 month because the 31st Jan + 1 month = 2nd of March.
$year = date('Y', $timeafter);
$month = date('m', $timeafter);
$day = date('d', $timeafter);
$dayofnextmonth = $day;
if ($day >= 29) {
$daysinmonth = date('n', mktime(0, 0, 0, $month+1, 1, $year));
if ($day > $daysinmonth) {
$dayofnextmonth = $daysinmonth;
}
}
$timeafter = mktime($actualtimeshour, 0, 0, $month+1, $dayofnextmonth, $year);
} else {
return $stats; // this will put us in a never ending loop.
// This will put us in a never ending loop.
return $stats;
}
}
// Add the base timestamp to the statistics if not present.
foreach ($times as $count => $time) {
if (!in_array($time,$actualtimes) && $count != count($times) -1) {
$newobj = new StdClass;
@@ -1425,7 +1464,6 @@ function stats_fix_zeros($stats,$timeafter,$timestr,$line2=true,$line3=false) {
usort($stats,"stats_compare_times");
return $stats;
}
// helper function to sort arrays by $obj->timeend

0 comments on commit 48f3a24

Please sign in to comment.
You can’t perform that action at this time.