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

Setting $CFG->forcetimezone now fully works.

Browse source 
One more item crossed out from the TODO list.
This commit is contained in:
defacer 2005-04-08 19:35:05 +00:00
parent ffc141e4be
commit 9a382a5c5e
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/calendar.html
View file

@ -66,7 +66,7 @@
</div>
<div>
<nobr><input type="radio" id="timezone2" name="forcetimezone" value="force" <?php if(!empty($CFG->forcetimezone)) echo 'checked="checked"';?> /> <label for="timezone2"><?php print_string('timezoneisforcedto', 'admin'); ?></label>
<?php choose_from_menu($presets, 'timezonepreset', (empty($CFG->forcetimezone) ? 0 : $CFG->forcetimezone), get_string('choose').'...', 'form.timezone2.checked=\'checked\''); ?>
<?php choose_from_menu($presets, 'timezonepreset', (empty($CFG->forcetimezone) ? '' : $CFG->forcetimezone), get_string('choose').'...', 'form.timezone2.checked=\'checked\'', ''); ?>
</nobr>
</div>
<?php } ?>

27
admin/calendar.php
View file

@ -40,10 +40,13 @@
}
if(isset($form->forcetimezone)) {
if($form->forcetimezone == 'force') {
$preset = optional_param('timezonepreset', 0, PARAM_INT);
$preset = optional_param('timezonepreset', '');
// Some replaces to prevent SQL injection
$preset = str_replace(';', '', $preset);
$preset = str_replace('\'', '', $preset);
}
else {
$preset = 0;
$preset = '';
}
set_config('forcetimezone', $preset);
}
@ -84,11 +87,27 @@
require_once('../calendar/lib.php');
// Populate some variables we 're going to need in calendar.html
$presets = get_records_sql('SELECT id, name FROM '.$CFG->prefix.'timezone GROUP BY name');
$presets = get_records('timezone');
if(!empty($presets)) {
foreach($presets as $id => $preset) {
$presets[$id] = $preset->name;
$presets[$preset->name] = get_string($preset->name, 'timezones');
unset($presets[$id]);
}
}
asort($presets); // Sort before adding trivial presets because string sorts mess up their order
for($i = -13; $i <= 13; $i += .5) {
$tzstring = get_string('unspecifiedlocation').' / GMT';
if($i < 0) {
$presets["$i"] = $tzstring . $i;
}
else if($i > 0) {
$presets["$i"] = $tzstring . '+' . $i;
}
else {
$presets["$i"] = $tzstring;
}
}