moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

get_user_timezone() should now be working for users with new-style timezone settings.

Browse source 
get_timezone_record() function added to cache some db queries.

I haven't been able to test this yet, will do later.
This commit is contained in:
defacer 2005-04-08 05:28:39 +00:00
parent 996d1f1e1c
commit 43b59916f6
1 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lib/moodlelib.php
View file

@ -848,17 +848,46 @@ function usertimezone($timezone=99) {
*/ */
function get_user_timezone($tz = 99) { function get_user_timezone($tz = 99) {
// Variables declared explicitly global here so that if we add global $USER, $CFG;
// something later we won't forget to global it...
$retval = $tz;
$timezones = array( $timezones = array(
isset($GLOBALS['USER']->timezone) ? $GLOBALS['USER']->timezone : 99, // TODO: this first line below needs to go in the end
isset($GLOBALS['CFG']->timezone) ? $GLOBALS['CFG']->timezone : 99, isset($USER->timezonename) ? $USER->timezonename : 99,
isset($USER->timezone) ? $USER->timezone : 99,
isset($CFG->timezone) ? $CFG->timezone : 99,
); );
while($tz == 99 && $next = each($timezones)) {
$tz = (float)$next['value']; while(($retval == '' || $retval == 99) && $next = each($timezones)) {
$retval = $next['value'];
} }
return $tz; if(is_numeric($retval)) {
return (float)$retval;
}
else {
$tzrecord = get_timezone_record($retval);
if(empty($tzrecord)) {
return 99;
}
return (float)$tzrecord->gmtoff / HOURSECS;
}
}
function get_timezone_record($timezonename) {
global $CFG, $db;
static $cache = NULL;
if($cache === NULL) {
$cache = array();
}
if(isset($cache[$timezonename])) {
return $cache[$timezonename];
}
return get_record_sql('SELECT * FROM '.$CFG->prefix.'timezone WHERE name = '.$db->qstr($timezonename).' ORDER BY year DESC LIMIT 1');
} }
function calculate_user_dst_table($from_year = NULL, $to_year = NULL) { function calculate_user_dst_table($from_year = NULL, $to_year = NULL) {