see changes for admin/utfdbmigrate.php

This commit is contained in:
toyomoyo 2006-02-24 08:20:13 +00:00
parent e98ae339ef
commit f841494c62
24 changed files with 1537 additions and 1019 deletions

View file

@ -1,6 +1,6 @@
<?
function migrate2utf8_label_name($recordid){
global $CFG;
global $CFG, $globallang;
/// Some trivial checks
if (empty($recordid)) {
@ -12,28 +12,33 @@ function migrate2utf8_label_name($recordid){
log_the_problem_somewhere();
return false;
}
if ($globallang) {
$fromenc = $globallang;
} else {
$sitelang = $CFG->lang;
$courselang = get_course_lang($label->course); //Non existing!
$userlang = get_main_teacher_lang($label->course); //N.E.!!
$sitelang = $CFG->lang;
$courselang = get_course_lang($label->course); //Non existing!
$userlang = get_main_teacher_lang($label->course); //N.E.!!
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
}
/// We are going to use textlib facilities
/// Convert the text
$result = utfconvert($label->name, $fromenc);
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
$result = utfconvert($label->name, $fromenc);
$newlabel = new object;
$newlabel->id = $recordid;
$newlabel->name = $result;
update_record('label',$newlabel);
$newlabel = new object;
$newlabel->id = $recordid;
$newlabel->name = $result;
update_record('label',$newlabel);
}
/// And finally, just return the converted field
return $result;
}
function migrate2utf8_label_content($recordid){
global $CFG;
global $CFG, $globallang;
/// Some trivial checks
if (empty($recordid)) {
@ -45,22 +50,27 @@ function migrate2utf8_label_content($recordid){
log_the_problem_somewhere();
return false;
}
if ($globallang) {
$fromenc = $globallang;
} else {
$sitelang = $CFG->lang;
$courselang = get_course_lang($label->course); //Non existing!
$userlang = get_main_teacher_lang($label->course); //N.E.!!
$sitelang = $CFG->lang;
$courselang = get_course_lang($label->course); //Non existing!
$userlang = get_main_teacher_lang($label->course); //N.E.!!
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
}
/// We are going to use textlib facilities
/// Convert the text
$result = utfconvert($label->content, $fromenc);
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
$result = utfconvert($label->content, $fromenc);
$newlabel = new object;
$newlabel->id = $recordid;
$newlabel->content = $result;
update_record('label',$newlabel);
$newlabel = new object;
$newlabel->id = $recordid;
$newlabel->content = $result;
update_record('label',$newlabel);
}
/// And finally, just return the converted field
return $result;
}