Skip to content

Commit

Permalink
more bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
moodler committed Jan 16, 2006
1 parent 18147bc commit 5d7a272
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 44 deletions.
14 changes: 7 additions & 7 deletions blocks/rss_client/db/migrate2utf8.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?
function migrate2utf_block_rss_client_title($recordid){
function migrate2utf8_block_rss_client_title($recordid){
global $CFG;

/// Some trivial checks
Expand All @@ -8,7 +8,7 @@ function migrate2utf_block_rss_client_title($recordid){
return false;
}

if (!$rssclient = get_record('block_rss_client','id',$recordid) {
if (!$rssclient = get_record('block_rss_client','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand All @@ -34,7 +34,7 @@ function migrate2utf_block_rss_client_title($recordid){
return $result;
}

function migrate2utf_block_rss_client_preferredtitle($recordid){
function migrate2utf8_block_rss_client_preferredtitle($recordid){
global $CFG;

/// Some trivial checks
Expand All @@ -47,12 +47,12 @@ function migrate2utf_block_rss_client_preferredtitle($recordid){
FROM {$CFG->prefix}block_rss_client brc
WHERE brc.id = $recordid";

if (!$rssuserid = get_record_sql($SQL) {
if (!$rssuserid = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$rssclient = get_record('block_rss_client','id',$recordid) {
if (!$rssclient = get_record('block_rss_client','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -91,12 +91,12 @@ function migrate2utf_block_rss_client_description($recordid){
FROM {$CFG->prefix}block_rss_client brc
WHERE brc.id = $recordid";

if (!$rssuserid = get_record_sql($SQL) {
if (!$rssuserid = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$rssclient = get_record('block_rss_client','id',$recordid) {
if (!$rssclient = get_record('block_rss_client','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/rss_client/db/migrate2utf8.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<DBMIGRATION type="block/block_rss_client" VERSION="2005120100">
<DBMIGRATION type="blocks/rss_client" VERSION="2005120100">
<TABLES>
<TABLE name="block_rss_client">
<FIELDS>
Expand Down
8 changes: 4 additions & 4 deletions lib/db/migrate2utf8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ function migrate2utf8_grade_letter_letter($recordid){
return $result;
}

function migrate2utf8_group_name($recordid){
function migrate2utf8_groups_name($recordid){
global $CFG;

/// Some trivial checks
Expand Down Expand Up @@ -505,7 +505,7 @@ function migrate2utf8_group_name($recordid){
return $result;
}

function migrate2utf8_group_description($recordid){
function migrate2utf8_groups_description($recordid){
global $CFG;

/// Some trivial checks
Expand Down Expand Up @@ -538,7 +538,7 @@ function migrate2utf8_group_description($recordid){
return $result;
}

function migrate2utf8_group_lang($recordid){
function migrate2utf8_groups_lang($recordid){
global $CFG;

/// Some trivial checks
Expand Down Expand Up @@ -571,7 +571,7 @@ function migrate2utf8_group_lang($recordid){
return $result;
}

function migrate2utf8_group_theme($recordid){
function migrate2utf8_groups_theme($recordid){
global $CFG;

/// Some trivial checks
Expand Down
2 changes: 1 addition & 1 deletion lib/db/mysql.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ CREATE TABLE `prefix_course` (
`fullname` varchar(254) NOT NULL default '',
`shortname` varchar(15) NOT NULL default '',
`idnumber` varchar(100) NOT NULL default '',
`summary` text NOT NULL,
`summary` text NOT NULL default '',
`format` varchar(10) NOT NULL default 'topics',
`showgrades` smallint(2) unsigned NOT NULL default '1',
`modinfo` longtext NOT NULL default '',
Expand Down
4 changes: 3 additions & 1 deletion mod/assignment/db/migrate2utf8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ function migrate2utf8_assignment_name($recordid){
$textlib = textlib_get_instance();
/// Convert the text
$result = $textlib->convert($assignment->name, $fromenc);



$newassignment = new object;
$newassignment->id = $recordid;
$newassignment->name = $result;
update_record('assignment',$newassignment);
/// And finally, just return the converted field

return $result;
}

Expand Down
60 changes: 30 additions & 30 deletions mod/scorm/db/migrate2utf8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ function migrate2utf8_scorm_scoes_manifest($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -58,12 +58,12 @@ function migrate2utf8_scorm_scoes_organization($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -102,12 +102,12 @@ function migrate2utf8_scorm_scoes_parent($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -147,12 +147,12 @@ function migrate2utf8_scorm_scoes_identifier($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -191,12 +191,12 @@ function migrate2utf8_scorm_scoes_launch($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -235,12 +235,12 @@ function migrate2utf8_scorm_scoes_parameters($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -279,12 +279,12 @@ function migrate2utf8_scorm_scoes_scormtype($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -323,12 +323,12 @@ function migrate2utf8_scorm_scoes_title($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -367,12 +367,12 @@ function migrate2utf8_scorm_scoes_prerequisites($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -411,12 +411,12 @@ function migrate2utf8_scorm_scoes_maxtimeallowed($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -455,12 +455,12 @@ function migrate2utf8_scorm_scoes_timelimitaction($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -499,12 +499,12 @@ function migrate2utf8_scorm_scoes_datafromlms($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -543,12 +543,12 @@ function migrate2utf8_scorm_scoes_masteryscore($recordid){
WHERE s.id = ss.scorm
AND ss.id = $recordid";

if (!$scorm = get_record_sql($SQL) {
if (!$scorm = get_record_sql($SQL)) {
log_the_problem_somewhere();
return false;
}

if (!$scormscoes = get_record('scorm_scoes','id',$recordid) {
if (!$scormscoes = get_record('scorm_scoes','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -582,7 +582,7 @@ function migrate2utf8_scorm_name($recordid){
return false;
}

if (!$scorm = get_record('scorm','id',$recordid) {
if (!$scorm = get_record('scorm','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -615,7 +615,7 @@ function migrate2utf8_scorm_reference($recordid){
return false;
}

if (!$scorm = get_record('scorm','id',$recordid) {
if (!$scorm = get_record('scorm','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -648,7 +648,7 @@ function migrate2utf8_scorm_summary($recordid){
return false;
}

if (!$scorm = get_record('scorm','id',$recordid) {
if (!$scorm = get_record('scorm','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down Expand Up @@ -681,7 +681,7 @@ function migrate2utf8_scorm_options($recordid){
return false;
}

if (!$scorm = get_record('scorm','id',$recordid) {
if (!$scorm = get_record('scorm','id',$recordid)) {
log_the_problem_somewhere();
return false;
}
Expand Down

0 comments on commit 5d7a272

Please sign in to comment.