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

Moving from old "timezones" location to the new "timezone" one. MDL-12024 ; merged from 19_STABLE

Browse source
This commit is contained in:
stronk7 2007-12-31 15:08:08 +00:00
parent 848917d17f
commit 4ae7df39ee
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
admin/timezoneimport.php
View file

@ -23,9 +23,9 @@
if (!$ok or !confirm_sesskey()) { if (!$ok or !confirm_sesskey()) {
$message = '<br /><br />'; $message = '<br /><br />';
$message .= $CFG->dataroot.'/temp/olson.txt<br />'; $message .= $CFG->dataroot.'/temp/olson.txt<br />';
$message .= $CFG->dataroot.'/temp/timezones.txt<br />'; $message .= $CFG->dataroot.'/temp/timezone.txt<br />';
$message .= '<a href="http://download.moodle.org/timezones/">http://download.moodle.org/timezones/</a><br />'; $message .= '<a href="http://download.moodle.org/timezone/">http://download.moodle.org/timezone/</a><br />';
$message .= '<a href="'.$CFG->wwwroot.'/lib/timezones.txt">'.$CFG->dirroot.'/lib/timezones.txt</a><br />'; $message .= '<a href="'.$CFG->wwwroot.'/lib/timezone.txt">'.$CFG->dirroot.'/lib/timezone.txt</a><br />';
$message .= '<br />'; $message .= '<br />';
$message = get_string("configintrotimezones", 'admin', $message); $message = get_string("configintrotimezones", 'admin', $message);
@ -53,7 +53,7 @@
/// Next, look for a CSV file locally /// Next, look for a CSV file locally
$source = $CFG->dataroot.'/temp/timezones.txt'; $source = $CFG->dataroot.'/temp/timezone.txt';
if (!$importdone and is_readable($source)) { if (!$importdone and is_readable($source)) {
if ($timezones = get_records_csv($source, 'timezone')) { if ($timezones = get_records_csv($source, 'timezone')) {
update_timezone_records($timezones); update_timezone_records($timezones);
@ -62,22 +62,22 @@
} }
/// Otherwise, let's try moodle.org's copy /// Otherwise, let's try moodle.org's copy
$source = 'http://download.moodle.org/timezones/'; $source = 'http://download.moodle.org/timezone/';
if (!$importdone && ($content=download_file_content($source))) { if (!$importdone && ($content=download_file_content($source))) {
if ($file = fopen($CFG->dataroot.'/temp/timezones.txt', 'w')) { // Make local copy if ($file = fopen($CFG->dataroot.'/temp/timezone.txt', 'w')) { // Make local copy
fwrite($file, $content); fwrite($file, $content);
fclose($file); fclose($file);
if ($timezones = get_records_csv($CFG->dataroot.'/temp/timezones.txt', 'timezone')) { // Parse it if ($timezones = get_records_csv($CFG->dataroot.'/temp/timezone.txt', 'timezone')) { // Parse it
update_timezone_records($timezones); update_timezone_records($timezones);
$importdone = $source; $importdone = $source;
} }
unlink($CFG->dataroot.'/temp/timezones.txt'); unlink($CFG->dataroot.'/temp/timezone.txt');
} }
} }
/// Final resort, use the copy included in Moodle /// Final resort, use the copy included in Moodle
$source = $CFG->dirroot.'/lib/timezones.txt'; $source = $CFG->dirroot.'/lib/timezone.txt';
if (!$importdone and is_readable($source)) { // Distribution file if (!$importdone and is_readable($source)) { // Distribution file
if ($timezones = get_records_csv($source, 'timezone')) { if ($timezones = get_records_csv($source, 'timezone')) {
update_timezone_records($timezones); update_timezone_records($timezones);