mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

More time fixes for stats - under certain dst situations there could have been an infinite loop. Please someone who is clever about timezones & dst review this

Browse Source
This commit is contained in:
mjollnir_ 2006-03-24 20:43:38 +00:00
parent ca252edb1d
commit 9ec656750e
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/statslib.php
View File

@ -64,7 +64,7 @@ function stats_cron_daily () {
}
$midnight = stats_usergetmidnight(time());
$midnight = stats_getmidnight(time());
// check to make sure we're due to run, at least one day after last run
if ((time() - 24*60*60) < $CFG->statslastdaily) {
@ -435,7 +435,7 @@ function stats_get_base_daily($time=0) {
if (empty($time)) {
$time = time();
}
return stats_usergetmidnight($time);
return stats_getmidnight($time);
}
function stats_get_base_weekly($time=0) {
@ -447,26 +447,26 @@ function stats_get_base_weekly($time=0) {
if (date('D',$time) == 'Mon')
$str = 'now';
return stats_usergetmidnight(strtotime($str,$time));
return stats_getmidnight(strtotime($str,$time));
}
function stats_get_base_monthly($time=0) {
if (empty($time)) {
$time = time();
}
return stats_usergetmidnight(strtotime(date('1-M-Y',$time)));
return stats_getmidnight(strtotime(date('1-M-Y',$time)));
}
function stats_get_next_monthend($lastmonth) {
return stats_usergetmidnight(strtotime(date('1-M-Y',$lastmonth).' +1 month'));
return stats_getmidnight(strtotime(date('1-M-Y',$lastmonth).' +1 month'));
}
function stats_get_next_weekend($lastweek) {
return stats_usergetmidnight(strtotime('+1 week',$lastweek));
return stats_getmidnight(strtotime('+1 week',$lastweek));
}
function stats_get_next_dayend($lastday) {
return stats_usergetmidnight(strtotime('+1 day',$lastday));
return stats_getmidnight(strtotime('+1 day',$lastday));
}
function stats_clean_old() {
@ -926,14 +926,39 @@ function stats_check_uptodate($courseid=0) {
}
// copied from usergetmidnight, but we ignore dst.
function stats_usergetmidnight($date, $timezone=99) {
// copied from usergetmidnight, but we ignore dst
function stats_getmidnight($date, $timezone=99) {
$timezone = get_user_timezone_offset($timezone);
$userdate = usergetdate($date, $timezone);
// Time of midnight of this user's day, in GMT
$userdate = stats_getdate($date, $timezone);
return make_timestamp($userdate['year'], $userdate['mon'], $userdate['mday'], 0, 0, 0, $timezone,false ); // ignore dst for this.
}
function stats_getdate($time, $timezone=99) {
$timezone = get_user_timezone_offset($timezone);
if (abs($timezone) > 13) { // Server time
return getdate($time);
}
// There is no gmgetdate so we use gmdate instead
$time += intval((float)$timezone * HOURSECS);
$datestring = strftime('%S_%M_%H_%d_%m_%Y_%w_%j_%A_%B', $time);
list(
$getdate['seconds'],
$getdate['minutes'],
$getdate['hours'],
$getdate['mday'],
$getdate['mon'],
$getdate['year'],
$getdate['wday'],
$getdate['yday'],
$getdate['weekday'],
$getdate['month']
) = explode('_', $datestring);
return $getdate;
}
?>