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

The timezone selection didn't work correctly... if there WAS a $USER->timezone

Browse Source 
set but it was set to 99, it didn't check the $CFG->timezone setting.
Fixed now. Fancy implementation, forgive me please! ;)
This commit is contained in:
defacer
2004-04-01 10:39:06 +00:00
parent d8ba183c39
commit a36166d327
1 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+59 -1
View File
@@ -165,6 +165,17 @@ function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0,
global $CFG, $USER;
// Work out the best timezone to use, in order of precedence
$timezones = array(
99, // this is a placeholder that gets skipped in the first next() call
isset($USER->timezone) ? $USER->timezone : 99,
isset($CFG->timezone) ? $CFG->timezone : 99,
);
while($timezone == 99 && $next = next($timezones)) {
$timezone = (float)$next;
}
/*
if ($timezone == 99) {
if (isset($USER->timezone)) { // A user is logged in
$timezone = (float)$USER->timezone;
@@ -172,6 +183,7 @@ function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0,
$timezone = (float)$CFG->timezone;
}
}
*/
if (abs($timezone) > 13) {
return mktime((int)$hour,(int)$minute,(int)$second,(int)$month,(int)$day,(int)$year);
@@ -249,6 +261,17 @@ function userdate($date, $format="", $timezone=99, $fixday = true) {
$fixday = ($formatnoday != $format);
}
// Work out the best timezone to use, in order of precedence
$timezones = array(
99, // this is a placeholder that gets skipped in the first next() call
isset($USER->timezone) ? $USER->timezone : 99,
isset($CFG->timezone) ? $CFG->timezone : 99,
);
while($timezone == 99 && $next = next($timezones)) {
$timezone = (float)$next;
}
/*
if ($timezone == 99) { // Work out the best timezone to use
if (isset($USER->timezone)) { // A user is logged in
$timezone = (float)$USER->timezone;
@@ -256,6 +279,7 @@ function userdate($date, $format="", $timezone=99, $fixday = true) {
$timezone = (float)$CFG->timezone;
}
}
*/
if (abs($timezone) > 13) {
if ($fixday) {
@@ -285,6 +309,7 @@ function usergetdate($date, $timezone=99) {
global $USER, $CFG;
if ($timezone == 99) { // Work out the best timezone to use
if (isset($USER->timezone)) { // A user is logged in
$timezone = (float)$USER->timezone;
@@ -315,6 +340,17 @@ function usertime($date, $timezone=99) {
/// the timezone. eg 3pm in India is 3pm GMT - 7 * 3600 seconds
global $USER, $CFG;
// Work out the best timezone to use, in order of precedence
$timezones = array(
99, // this is a placeholder that gets skipped in the first next() call
isset($USER->timezone) ? $USER->timezone : 99,
isset($CFG->timezone) ? $CFG->timezone : 99,
);
while($timezone == 99 && $next = next($timezones)) {
$timezone = (float)$next;
}
/*
if ($timezone == 99) { // Work out the best timezone to use
if (isset($USER->timezone)) { // A user is logged in
$timezone = (float)$USER->timezone;
@@ -322,6 +358,7 @@ function usertime($date, $timezone=99) {
$timezone = (float)$CFG->timezone;
}
}
*/
if (abs($timezone) > 13) {
return $date;
}
@@ -333,6 +370,16 @@ function usergetmidnight($date, $timezone=99) {
/// for the current user.
global $USER, $CFG;
// Work out the best timezone to use, in order of precedence
$timezones = array(
99, // this is a placeholder that gets skipped in the first next() call
isset($USER->timezone) ? $USER->timezone : 99,
isset($CFG->timezone) ? $CFG->timezone : 99,
);
while($timezone == 99 && $next = next($timezones)) {
$timezone = (float)$next;
}
/*
if ($timezone == 99) { // Work out the best timezone to use
if (isset($USER->timezone)) { // A user is logged in
$timezone = (float)$USER->timezone;
@@ -340,7 +387,7 @@ function usergetmidnight($date, $timezone=99) {
$timezone = (float)$CFG->timezone;
}
}
*/
$userdate = usergetdate($date, $timezone);
if (abs($timezone) > 13) {
@@ -356,6 +403,16 @@ function usertimezone($timezone=99) {
/// Returns a string that prints the user's timezone
global $USER, $CFG;
// Work out the best timezone to use, in order of precedence
$timezones = array(
99, // this is a placeholder that gets skipped in the first next() call
isset($USER->timezone) ? $USER->timezone : 99,
isset($CFG->timezone) ? $CFG->timezone : 99,
);
while($timezone == 99 && $next = next($timezones)) {
$timezone = (float)$next;
}
/*
if ($timezone == 99) { // Work out the best timezone to use
if (isset($USER->timezone)) { // A user is logged in
$timezone = (float)$USER->timezone;
@@ -363,6 +420,7 @@ function usertimezone($timezone=99) {
$timezone = (float)$CFG->timezone;
}
}
*/
if (abs($timezone) > 13) {
return "server time";
}