mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Starting to fix userdate() to recognize DST as well.

Browse Source
This commit is contained in:
defacer 2005-02-17 22:43:18 +00:00
parent 0d43d0d438
commit 85351042d1
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en/moodle.php
View File

@ -962,7 +962,7 @@ $string['strftimedateshort'] = '%%d %%B';
$string['strftimedatetime'] = '%%d %%B %%Y, %%I:%%M %%p';
$string['strftimedaydate'] = '%%A, %%d %%B %%Y';
$string['strftimedaydatetime'] = '%%A, %%d %%B %%Y, %%I:%%M %%p';
$string['strftimedayshort'] = '%%A, %%d %%B';
$string['strftimedayshort'] = '#l, j F';
$string['strftimedaytime'] = '%%a, %%H:%%M';
$string['strftimemonthyear'] = '%%B %%Y';
$string['strftimerecent'] = '%%d %%b, %%H:%%M';

41
lib/moodlelib.php
View File

@ -685,13 +685,41 @@ function userdate($date, $format='', $timezone=99, $fixday = true) {
$format = get_string('strftimedaydatetime');
}
$timezone = get_user_timezone($timezone);
// Super special hack while moving from strftime to gmdate -- credits to MD :P
$flags_strftime = array('%a', '%A', '%b', '%B', '%c', '%d', '%D', '%e', '%g', '%G', '%h', '%H', '%I', '%j', '%m', '%M', '%n', '%p', '%r', '%R', '%S', '%t', '%T', '%V', '%W', '%w', '%x', '%X', '%y', '%Y', '%Z', '%%');
$flags_gmdate = array('D', 'l', 'M', 'F', 'r', 'd', 'm/d/Y', 'j', 'y', 'Y', 'M', 'H', 'h', 'z', 'm', 'i', "\n", 'A', 'g:i a', 'H:i', 's', "\t", 'H:i:s', 'W', 'W', 'w', 'd/m/Y', 'H:i:s', 'y', 'Y', 'Z', '%');
if($fixday) {
$flags_gmdate[5] = 'j';
}
$gmdateformat = '';
if(substr($format, 0, 1) == '#') {
$gmdateformat = substr($format, 1);
}
else {
print_object('Format was "'.$format.'"');
$gmdateformat = str_replace($flags_strftime, $flags_gmdate, $format);
print_object('Format became "'.$gmdateformat.'"');
}
if(!empty($gmdateformat)) {
if (abs($timezone) > 13) {
$date += floatval(date('O')) * HOURSECS;
}
else {
$date += floatval($timezone) * HOURSECS;
}
$gmdatestring = gmdate($gmdateformat, $date);
}
$formatnoday = str_replace('%d', 'DD', $format);
if ($fixday) {
$fixday = ($formatnoday != $format);
}
$timezone = get_user_timezone($timezone);
if (abs($timezone) > 13) {
if ($fixday) {
$datestring = strftime($formatnoday, $date);
@ -711,6 +739,11 @@ function userdate($date, $format='', $timezone=99, $fixday = true) {
}
}
if(!empty($gmdatestring) && substr($format, 0, 1) != '#' && $gmdatestring !== str_replace(' ', ' ', $datestring)) {
print_object('Mismatch: "'.$datestring.'" vs "'.$gmdatestring.'"');
die();
}
return $datestring;
}
@ -731,10 +764,10 @@ function usergetdate($time, $timezone=99) {
$time += dst_offset_on($time);
if (abs($timezone) > 13) {
$time += intval(date('O')) * HOURSECS;
$time += floatval(date('O')) * HOURSECS;
}
else {
$time += (intval($timezone) * HOURSECS);
$time += floatval($timezone) * HOURSECS;
}
// This is independent of the server's TZ settings,