mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
see changes for admin/utfdbmigrate.php
This commit is contained in:
parent
e98ae339ef
commit
f841494c62
24 changed files with 1537 additions and 1019 deletions
|
@ -1,6 +1,6 @@
|
|||
<?
|
||||
function migrate2utf8_block_instance_configdata($recordid){
|
||||
global $CFG;
|
||||
global $CFG, $globallang;
|
||||
|
||||
$blockinstance = get_record('block_instance','id',$recordid);
|
||||
|
||||
|
@ -11,12 +11,15 @@ function migrate2utf8_block_instance_configdata($recordid){
|
|||
if ($blocktype -> name == 'html') {
|
||||
|
||||
///find course
|
||||
if ($globallang) {
|
||||
$fromenc = $globallang;
|
||||
} else {
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = get_course_lang($blockinstance->pageid); //Non existing!
|
||||
$userlang = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
|
||||
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = get_course_lang($blockinstance->pageid); //Non existing!
|
||||
$userlang = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
|
||||
|
||||
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
|
||||
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
|
||||
}
|
||||
|
||||
$blah = unserialize(base64_decode($blockinstance->configdata));
|
||||
|
||||
|
@ -35,12 +38,15 @@ function migrate2utf8_block_instance_configdata($recordid){
|
|||
} else if ($blocktype -> name == 'rss_client'){
|
||||
|
||||
///find course
|
||||
if ($globallang) {
|
||||
$fromenc = $globallang;
|
||||
} else {
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = get_course_lang($blockinstance->pageid); //Non existing!
|
||||
$userlang = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
|
||||
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = get_course_lang($blockinstance->pageid); //Non existing!
|
||||
$userlang = get_main_teacher_lang($blockinstance->pageid); //N.E.!!
|
||||
|
||||
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
|
||||
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
|
||||
}
|
||||
|
||||
$blah = unserialize(base64_decode($blockinstance->configdata));
|
||||
|
||||
|
|
|
@ -160,7 +160,7 @@ global $CFG;
|
|||
execute_sql("ALTER TABLE {$CFG->prefix}block_instance ADD INDEX pagetype (pagetype);",false); // do it silently, in case it's already there from 1.5
|
||||
modify_database('','ALTER TABLE prefix_block_pinned ADD INDEX pagetype (pagetype);');
|
||||
}
|
||||
|
||||
|
||||
//Finally, return result
|
||||
return $result;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?
|
||||
function migrate2utf8_block_rss_client_title($recordid){
|
||||
global $CFG;
|
||||
global $CFG, $globallang;
|
||||
|
||||
/// Some trivial checks
|
||||
if (empty($recordid)) {
|
||||
|
@ -12,30 +12,35 @@ function migrate2utf8_block_rss_client_title($recordid){
|
|||
log_the_problem_somewhere();
|
||||
return false;
|
||||
}
|
||||
if ($globallang) {
|
||||
$fromenc = $globallang;
|
||||
} else {
|
||||
$user = get_record('user','id',$rssclient->userid);
|
||||
|
||||
$user = get_record('user','id',$rssclient->userid);
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = NULL; //Non existing!
|
||||
$userlang = $user->lang; //N.E.!!
|
||||
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = NULL; //Non existing!
|
||||
$userlang = $user->lang; //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($rssclient->title, $fromenc);
|
||||
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
|
||||
$result = utfconvert($rssclient->title, $fromenc);
|
||||
|
||||
$newrssclient = new object;
|
||||
$newrssclient->id = $recordid;
|
||||
$newrssclient->title = $result;
|
||||
update_record('block_rss_client',$newrssclient);
|
||||
$newrssclient = new object;
|
||||
$newrssclient->id = $recordid;
|
||||
$newrssclient->title = $result;
|
||||
update_record('block_rss_client',$newrssclient);
|
||||
}
|
||||
/// And finally, just return the converted field
|
||||
return $result;
|
||||
}
|
||||
|
||||
function migrate2utf8_block_rss_client_preferredtitle($recordid){
|
||||
global $CFG;
|
||||
global $CFG, $globallang;
|
||||
|
||||
/// Some trivial checks
|
||||
if (empty($recordid)) {
|
||||
|
@ -57,29 +62,35 @@ function migrate2utf8_block_rss_client_preferredtitle($recordid){
|
|||
return false;
|
||||
}
|
||||
|
||||
$user = get_record('user','id',$rssuserid->userid);
|
||||
|
||||
if ($globallang) {
|
||||
$fromenc = $globallang;
|
||||
} else {
|
||||
$user = get_record('user','id',$rssuserid->userid);
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = NULL; //Non existing!
|
||||
$userlang = $user->lang; //N.E.!!
|
||||
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = NULL; //Non existing!
|
||||
$userlang = $user->lang; //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($rssclient->preferredtitle, $fromenc);
|
||||
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
|
||||
$result = utfconvert($rssclient->preferredtitle, $fromenc);
|
||||
|
||||
$newrssclient = new object;
|
||||
$newrssclient->id = $recordid;
|
||||
$newrssclient->preferredtitle = $result;
|
||||
update_record('block_rss_client',$newrssclient);
|
||||
$newrssclient = new object;
|
||||
$newrssclient->id = $recordid;
|
||||
$newrssclient->preferredtitle = $result;
|
||||
update_record('block_rss_client',$newrssclient);
|
||||
/// And finally, just return the converted field
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
function migrate2utf8_block_rss_client_description($recordid){
|
||||
global $CFG;
|
||||
global $CFG, $globallang;
|
||||
|
||||
/// Some trivial checks
|
||||
if (empty($recordid)) {
|
||||
|
@ -101,23 +112,28 @@ function migrate2utf8_block_rss_client_description($recordid){
|
|||
return false;
|
||||
}
|
||||
|
||||
$user = get_record('user','id',$rssuserid->userid);
|
||||
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = NULL; //Non existing!
|
||||
$userlang = $user->lang; //N.E.!!
|
||||
|
||||
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
|
||||
|
||||
if ($globallang) {
|
||||
$fromenc = $globallang;
|
||||
} else {
|
||||
$user = get_record('user','id',$rssuserid->userid);
|
||||
$sitelang = $CFG->lang;
|
||||
$courselang = NULL; //Non existing!
|
||||
$userlang = $user->lang; //N.E.!!
|
||||
$fromenc = get_original_encoding($sitelang, $courselang, $userlang);
|
||||
}
|
||||
|
||||
/// We are going to use textlib facilities
|
||||
|
||||
/// Convert the text
|
||||
$result = utfconvert($rssclient->description, $fromenc);
|
||||
if (($fromenc != 'utf-8') && ($fromenc != 'UTF-8')) {
|
||||
$result = utfconvert($rssclient->description, $fromenc);
|
||||
|
||||
$newrssclient = new object;
|
||||
$newrssclient->id = $recordid;
|
||||
$newrssclient->description = $result;
|
||||
update_record('block_rss_client',$newrssclient);
|
||||
$newrssclient = new object;
|
||||
$newrssclient->id = $recordid;
|
||||
$newrssclient->description = $result;
|
||||
update_record('block_rss_client',$newrssclient);
|
||||
}
|
||||
/// And finally, just return the converted field
|
||||
return $result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue