L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 2588 when server dates are used.

Browse Source
This commit is contained in:
moodler
2005-02-19 02:49:31 +00:00
parent 1f16e05b9a
commit 102dc313ea
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+21 -15
View File
@@ -681,33 +681,39 @@ function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0,
*/
function userdate($date, $format='', $timezone=99, $fixday = true) {
if ($format == '') {
$format = get_string('strftimedaydatetime');
}
$timezone = get_user_timezone($timezone);
$formatnoday = str_replace('%d', 'DD', $format);
if ($fixday) {
$fixday = ($formatnoday != $format);
}
$date += dst_offset_on($date);
if (abs($timezone) > 13) {
$date += intval((float)date('O') * HOURSECS);
}
else {
$date += intval((float)$timezone * HOURSECS);
$timezone = get_user_timezone($timezone);
if (abs($timezone) > 13) { /// Server time
if ($fixday) {
$datestring = strftime($formatnoday, $date);
$daystring = str_replace(' 0', '', strftime(' %d', $date));
$datestring = str_replace('DD', $daystring, $datestring);
} else {
$datestring = strftime($format, $date);
}
} else {
$date += (int)($timezone * 3600);
if ($fixday) {
$datestring = gmstrftime($formatnoday, $date);
$daystring = str_replace(' 0', '', gmstrftime(' %d', $date));
$datestring = str_replace('DD', $daystring, $datestring);
} else {
$datestring = gmstrftime($format, $date);
}
}
if ($fixday) {
$datestring = gmstrftime($formatnoday, $date);
$daystring = str_replace(' 0', '', gmstrftime(' %d', $date));
$datestring = str_replace('DD', $daystring, $datestring);
} else {
$datestring = gmstrftime($format, $date);
}
return $datestring;
}