From 001fc706efdc58857f7288feaca766563af344bf Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 31 Jan 2006 08:37:00 +0000 Subject: [PATCH] fixing bugs in event table --- lib/db/migrate2utf8.php | 78 ++++++++++++++++++++++++++++++++++++++++- lib/db/migrate2utf8.xml | 30 +++++----------- 2 files changed, 85 insertions(+), 23 deletions(-) diff --git a/lib/db/migrate2utf8.php b/lib/db/migrate2utf8.php index 1828dca8cd2..72bdf016ab5 100755 --- a/lib/db/migrate2utf8.php +++ b/lib/db/migrate2utf8.php @@ -1,5 +1,80 @@ lang; + $courselang = get_course_lang($event->courseid); //Non existing! + if ($event->userid) { + $userlang = get_user_lang($event->userid); + } else { + $userlang = get_main_teacher_lang($event->courseid); + } + + $fromenc = get_original_encoding($sitelang, $courselang, $userlang); + +/// We are going to use textlib facilities + +/// Convert the text + $result = utfconvert($event->name, $fromenc); + + $newevent = new object; + $newevent->id = $recordid; + $newevent->name = $result; + update_record('event',$newevent); +/// And finally, just return the converted field + return $result; +} + +function migrate2utf8_event_description($recordid){ + global $CFG; + +/// Some trivial checks + if (empty($recordid)) { + log_the_problem_somewhere(); + return false; + } + + if (!$event = get_record('event', 'id', $recordid)) { + log_the_problem_somewhere(); + return false; + } + + $sitelang = $CFG->lang; + $courselang = get_course_lang($event->courseid); //Non existing! + if ($event->userid) { + $userlang = get_user_lang($event->userid); + } else { + $userlang = get_main_teacher_lang($event->courseid); + } + + $fromenc = get_original_encoding($sitelang, $courselang, $userlang); + +/// We are going to use textlib facilities + +/// Convert the text + $result = utfconvert($event->description, $fromenc); + + $newevent = new object; + $newevent->id = $recordid; + $newevent->description = $result; + update_record('event',$newevent); +/// And finally, just return the converted field + return $result; +} + function migrate2utf8_config_value($recordid){ global $CFG; @@ -868,7 +943,7 @@ function migrate2utf8_user_description($recordid){ $fromenc = get_original_encoding($sitelang, $courselang, $userlang); /// We are going to use textlib facilities - + /// Convert the text $result = utfconvert($user->description, $fromenc); @@ -876,6 +951,7 @@ function migrate2utf8_user_description($recordid){ $newuser->id = $recordid; $newuser->description = $result; update_record('user',$newuser); + /// And finally, just return the converted field return $result; } diff --git a/lib/db/migrate2utf8.xml b/lib/db/migrate2utf8.xml index 44e92655fdc..717a9b543f7 100755 --- a/lib/db/migrate2utf8.xml +++ b/lib/db/migrate2utf8.xml @@ -89,29 +89,15 @@ - - - SELECT e.userid - FROM {$CFG->prefix}event e - WHERE e.id = RECORDID - - - SELECT e.courseid as course - FROM {$CFG->prefix}event e - WHERE e.id = RECORDID - + + + migrate2utf8_event_name(RECORDID); + - - - SELECT e.userid - FROM {$CFG->prefix}event e - WHERE e.id = RECORDID - - - SELECT e.courseid as course - FROM {$CFG->prefix}event e - WHERE e.id = RECORDID - + + + migrate2utf8_event_description(RECORDID); +