mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity

MDL-15095 towards restore lib dml conversion

Browse Source
This commit is contained in:
skodak 2008-06-03 22:36:54 +00:00
parent 785720d662
commit 9db7dab2ca
27 changed files with 521 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backup/lib.php
View File

@ -534,14 +534,11 @@
//This function is used to add slashes (and decode from UTF-8 if needed)
//It's used intensivelly when restoring modules and saving them in db
function backup_todb ($data, $addslashes=true) {
function backup_todb ($data) {
// MDL-10770
if ($data === '$@NULL@$') {
return null;
} else {
if ($addslashes) {
$data = addslashes($data);
}
return restore_decode_absolute_links($data);
}
}

443
backup/restorelib.php
View File

File diff suppressed because it is too large Load Diff

14
mod/assignment/restorelib.php
View File

@ -23,8 +23,7 @@
//This function executes all the restore procedure about this mod
function assignment_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -87,17 +86,17 @@
if (!in_array($assignment->assignmenttype, $plugins)) {
if (!defined('RESTORE_SILENTLY')) {
echo "<li><strong>".get_string("modulename","assignment")." \"".format_string(stripslashes($assignment->name),true)."\" - plugin '{$assignment->assignmenttype}' not available!</strong></li>";
echo "<li><strong>".get_string("modulename","assignment")." \"".format_string($assignment->name,true)."\" - plugin '{$assignment->assignmenttype}' not available!</strong></li>";
}
return true; // do not fail the restore
}
//The structure is equal to the db, so insert the assignment
$newid = insert_record ("assignment",$assignment);
$newid = $DB->insert_record ("assignment",$assignment);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","assignment")." \"".format_string(stripslashes($assignment->name),true)."\"</li>";
echo "<li>".get_string("modulename","assignment")." \"".format_string($assignment->name,true)."\"</li>";
}
backup_flush(300);
@ -122,8 +121,7 @@
//This function restores the assignment_submissions
function assignment_submissions_restore_mods($old_assignment_id, $new_assignment_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -177,7 +175,7 @@
}
//The structure is equal to the db, so insert the assignment_submission
$newid = insert_record ("assignment_submissions",$submission);
$newid = $DB->insert_record ("assignment_submissions",$submission);
//Do some output
if (($i+1) % 50 == 0) {

13
mod/chat/restorelib.php
View File

@ -23,8 +23,7 @@
//This function executes all the restore procedure about this mod
function chat_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -53,11 +52,11 @@
$chat->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
//The structure is equal to the db, so insert the chat
$newid = insert_record ("chat",$chat);
$newid = $db->insert_record ("chat",$chat);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","chat")." \"".format_string(stripslashes($chat->name),true)."\"</li>";
echo "<li>".get_string("modulename","chat")." \"".format_string($chat->name,true)."\"</li>";
}
backup_flush(300);
@ -82,8 +81,7 @@
//This function restores the chat_messages
function chat_messages_restore_mods($old_chat_id, $new_chat_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -123,7 +121,7 @@
}
//The structure is equal to the db, so insert the chat_message
$newid = insert_record ("chat_messages",$message);
$newid = $DB->insert_record ("chat_messages",$message);
//Do some output
if (($i+1) % 50 == 0) {
@ -250,7 +248,6 @@
//This function returns a log record with all the necessay transformations
//done. It's used by restore_log_module() to restore modules log.
function chat_restore_logs($restore,$log) {
$status = false;
//Depending of the action, we recode different things

9
mod/choice/restorelib.php
View File

@ -28,8 +28,7 @@
//This function executes all the restore procedure about this mod
function choice_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -84,7 +83,7 @@
}
}
//The structure is equal to the db, so insert the choice
$newid = insert_record ("choice",$choice);
$newid = $DB->insert_record ("choice",$choice);
if ($newid) {
//We have the newid, update backup_ids
@ -114,7 +113,7 @@
$option->choiceid = $newid;
$option->text = $options[$i];
$option->timemodified = $choice->timemodified;
$newoptionid = insert_record ("choice_options",$option);
$newoptionid = $DB->insert_record ("choice_options",$option);
//Save this choice_option to backup_ids
backup_putid($restore->backup_unique_code,"choice_options",$i,$newoptionid);
}
@ -134,7 +133,7 @@
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","choice")." \"".format_string(stripslashes($choice->name),true)."\"</li>";
echo "<li>".get_string("modulename","choice")." \"".format_string($choice->name,true)."\"</li>";
}
backup_flush(300);

32
mod/data/restorelib.php
View File

@ -37,8 +37,7 @@ $fieldids = array(); //array in the format of $fieldids[$oldid]=$newid. This
//Return a content encoded to support interactivities linking. Every module
function data_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -100,11 +99,11 @@ function data_restore_mods($mod,$restore) {
unset($database->notification); /// Unset it if null to get proper Moodle 2.0 default (0) applied
}
$newid = insert_record ('data', $database);
$newid = $DB->insert_record ('data', $database);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","data")." \"".format_string(stripslashes($database->name),true)."\"</li>";
echo "<li>".get_string("modulename","data")." \"".format_string($database->name,true)."\"</li>";
}
if ($newid) {
@ -161,8 +160,7 @@ function data_restore_mods($mod,$restore) {
}
function data_fields_restore_mods ($old_data_id, $new_data_id, $info, $restore) {
global $CFG, $fieldids;
global $CFG, $fieldids, $DB;
$fields = $info['MOD']['#']['FIELDS']['0']['#']['FIELD'];
@ -187,7 +185,7 @@ function data_fields_restore_mods ($old_data_id, $new_data_id, $info, $restore)
$field -> param9 = backup_todb($fie_info['#']['PARAM9']['0']['#']);
$field -> param10 = backup_todb($fie_info['#']['PARAM10']['0']['#']);
$newid = insert_record ("data_fields",$field);
$newid = $DB->insert_record ("data_fields",$field);
$fieldids[$oldid] = $newid; //so we can use them in sub tables that depends on both fieldid and recordid
@ -215,8 +213,7 @@ function data_fields_restore_mods ($old_data_id, $new_data_id, $info, $restore)
}
function data_records_restore_mods ($old_data_id, $new_data_id, $info, $restore) {
global $CFG, $fieldids;
global $CFG, $fieldids, $DB;
$status = true;
@ -244,7 +241,7 @@ function data_records_restore_mods ($old_data_id, $new_data_id, $info, $restore)
$record->groupid= $group->new_id;
}
$newid = insert_record ("data_records",$record);
$newid = $DB->insert_record ("data_records",$record);
//Do some output
if (($i+1) % 50 == 0) {
@ -273,8 +270,7 @@ function data_records_restore_mods ($old_data_id, $new_data_id, $info, $restore)
}
function data_content_restore_mods ($old_record_id, $new_record_id, $old_data_id, $new_data_id, $recinfo, $restore) {
global $CFG, $fieldids;
global $CFG, $fieldids, $DB;
$status = true;
@ -294,7 +290,7 @@ function data_content_restore_mods ($old_record_id, $new_record_id, $old_data_id
$content -> content2 = backup_todb($con_info['#']['CONTENT2']['0']['#']);
$content -> content3 = backup_todb($con_info['#']['CONTENT3']['0']['#']);
$content -> content4 = backup_todb($con_info['#']['CONTENT4']['0']['#']);
$newid = insert_record ("data_content",$content);
$newid = $DB->insert_record ("data_content",$content);
//Do some output
if (($i+1) % 50 == 0) {
@ -374,8 +370,7 @@ function data_restore_files ($old_data_id, $new_data_id, $old_field_id, $new_fie
}
function data_ratings_restore_mods ($oldid, $newid, $info, $rec_info) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -392,7 +387,7 @@ function data_ratings_restore_mods ($oldid, $newid, $info, $rec_info) {
$rating -> userid = backup_todb($rat_info['#']['USERID']['0']['#']);
$rating -> rating = backup_todb($rat_info['#']['RATING']['0']['#']);
if (! insert_record ("data_ratings",$rating)) {
if (! $DB->insert_record ("data_ratings",$rating)) {
$status = false;
}
}
@ -400,8 +395,7 @@ function data_ratings_restore_mods ($oldid, $newid, $info, $rec_info) {
}
function data_comments_restore_mods ($oldid, $newid, $info, $rec_info) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -420,7 +414,7 @@ function data_comments_restore_mods ($oldid, $newid, $info, $rec_info) {
$comment -> content = backup_todb($com_info['#']['CONTENT']['0']['#']);
$comment -> created = backup_todb($com_info['#']['CREATED']['0']['#']);
$comment -> modified = backup_todb($com_info['#']['MODIFIED']['0']['#']);
if (! insert_record ("data_comments",$comment)) {
if (! $DB->insert_record ("data_comments",$comment)) {
$status = false;
}

23
mod/feedback/restorelib.php
View File

@ -29,8 +29,7 @@
define('FEEDBACK_MULTICHOICERESTORE_TYPE_SEP', '>>>>>');
function feedback_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
// $allValues = array();
// $allTrackings = array();
@ -63,7 +62,7 @@
$feedback->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
//The structure is equal to the db, so insert the feedback
$newid = insert_record ("feedback",$feedback);
$newid = $DB->insert_record ("feedback",$feedback);
//create events
// the open-event
@ -178,7 +177,7 @@
$item->position = backup_todb($item_info['#']['POSITION']['0']['#']);
$item->required = backup_todb($item_info['#']['REQUIRED']['0']['#']);
//put this new item into the database
$newitemid = insert_record('feedback_item', $item);
$newitemid = $DB->insert_record('feedback_item', $item);
//Now check if want to restore user data and do it.
if ($restore_userdata) {
@ -192,10 +191,10 @@
$value->completed = 0;
$value->tmp_completed = backup_todb($value_info['#']['COMPLETED']['0']['#']);
$value->value = backup_todb($value_info['#']['VAL']['0']['#']);
$value->value = addslashes($value->value);
$value->value = $value->value;
$value->course_id = backup_todb($value_info['#']['COURSE_ID']['0']['#']);
//put this new value into the database
$newvalueid = insert_record('feedback_value', $value);
$newvalueid = $DB->insert_record('feedback_value', $value);
$value->id = $newvalueid;
// $allValues[] = $value;
}
@ -224,7 +223,7 @@
}
//save the tracking
$newtrackingid = insert_record('feedback_tracking', $tracking);
$newtrackingid = $DB->insert_record('feedback_tracking', $tracking);
$tracking->id = $newtrackingid;
// $allTrackings[] = $tracking;
}
@ -255,25 +254,25 @@
$oldcompletedid = backup_todb($completed_info['#']['ID']['0']['#']);
//save the completed
$newcompletedid = insert_record('feedback_completed', $completed);
$newcompletedid = $DB->insert_record('feedback_completed', $completed);
//the newcompletedid have to be changed at every values
$tochangevals = get_records('feedback_value', 'tmp_completed', $oldcompletedid);
$tochangevals = $DB->get_records('feedback_value', array('tmp_completed'=>$oldcompletedid));
if($tochangevals) {
foreach($tochangevals as $tmpVal) {
$tmpVal->completed = $newcompletedid;
$tmpVal->tmp_completed = 0;
update_record('feedback_value', $tmpVal);
$DB->update_record('feedback_value', $tmpVal);
}
}
//the newcompletedid have to be changed at every tracking
$tochangetracks = get_records('feedback_tracking', 'completed', $oldcompletedid);
$tochangetracks = $DB->get_records('feedback_tracking', array('completed'=>$oldcompletedid));
if($tochangetracks) {
foreach($tochangetracks as $tmpTrack) {
$tmpTrack->completed = $newcompletedid;
$tmpTrack->tmp_completed = 0;
update_record('feedback_tracking', $tmpTrack);
$DB->update_record('feedback_tracking', $tmpTrack);
}
}
}

86
mod/forum/restorelib.php
View File

@ -33,8 +33,7 @@
//-----------------------------------------------------------
function forum_restore_mods($mod,$restore) {
global $CFG,$DB;
global $CFG, $DB;
$status = true;
@ -91,7 +90,7 @@
}
}
$newid = insert_record("forum", $forum);
$newid = $DB->insert_record("forum", $forum);
//Do some output
@ -124,7 +123,7 @@
// If forum type is single, just recreate the initial discussion/post automatically
// if it hasn't been created still (because no user data was selected on backup or
// restore.
if ($forum->type == 'single' && !record_exists('forum_discussions', 'forum', $newid)) {
if ($forum->type == 'single' && !$DB->record_exists('forum_discussions', array('forum'=>$newid))) {
//Load forum/lib.php
require_once ($CFG->dirroot.'/mod/forum/lib.php');
// Calculate the default format
@ -146,7 +145,7 @@
$sdid = forum_add_discussion($sd, $sd->intro, $forum);
//Now, mark the initial post of the discussion as mailed!
if ($sdid) {
set_field ('forum_posts','mailed', '1', 'discussion', $sdid);
$DB->set_field ('forum_posts','mailed', '1', array('discussion'=>$sdid));
}
}
@ -159,7 +158,7 @@
// was made pre Moodle 1.7.
if (isset($forum->open) && isset($forum->assesspublic)) {
$forummod = get_record('modules', 'name', 'forum');
$forummod = $DB->get_record('modules', array('name'=>'forum'));
if (!$teacherroles = get_roles_with_capability('moodle/legacy:teacher', CAP_ALLOW)) {
notice('Default teacher role was not found. Roles and permissions '.
@ -188,8 +187,7 @@
//This function restores the forum_subscriptions
function forum_subscriptions_restore_mods($forum_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -221,7 +219,7 @@
}
//The structure is equal to the db, so insert the forum_subscription
$newid = insert_record ("forum_subscriptions",$subscription);
$newid = $DB->insert_record ("forum_subscriptions",$subscription);
//Do some output
if (($i+1) % 50 == 0) {
@ -248,8 +246,7 @@
//This function restores the forum_discussions
function forum_discussions_restore_mods($forum_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -306,7 +303,7 @@
}
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("forum_discussions",$discussion);
$newid = $DB->insert_record ("forum_discussions",$discussion);
//Do some output
if (($i+1) % 50 == 0) {
@ -332,7 +329,7 @@
if ($rec) {
//Put its new firstpost
$discussion->firstpost = $rec->new_id;
if ($post = get_record("forum_posts", "id", $discussion->firstpost)) {
if ($post = $DB->get_record("forum_posts", array("id"=>$discussion->firstpost))) {
$discussion->userid = $post->userid;
}
} else {
@ -344,7 +341,7 @@
$temp_discussion->firstpost = $discussion->firstpost;
$temp_discussion->userid = $discussion->userid;
//Update discussion (only firstpost and userid will be changed)
$status = update_record("forum_discussions",$temp_discussion);
$status = $DB->update_record("forum_discussions",$temp_discussion);
//echo "Updated firstpost ".$old_firstpost." to ".$temp_discussion->firstpost."<br />"; //Debug
} else {
$status = false;
@ -356,8 +353,7 @@
//This function restores the forum_read
function forum_read_restore_mods($forum_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -415,7 +411,7 @@
//The structure is equal to the db, so insert the forum_read
$newid = 0;
if ($toinsert) {
$newid = insert_record ("forum_read",$read);
$newid = $DB->insert_record ("forum_read",$read);
}
//Do some output
@ -443,8 +439,7 @@
//This function restores the forum_posts
function forum_posts_restore_mods($new_forum_id,$discussion_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -485,7 +480,7 @@
}
//The structure is equal to the db, so insert the forum_posts
$newid = insert_record ("forum_posts",$post);
$newid = $DB->insert_record ("forum_posts",$post);
//Do some output
if (($i+1) % 50 == 0) {
@ -504,9 +499,9 @@
$newid);
//Get old forum id from backup_ids
$rec = get_record("backup_ids","backup_code",$restore->backup_unique_code,
"table_name","forum",
"new_id",$new_forum_id);
$rec =$DB->get_record("backup_ids", array("backup_code"=>$restore->backup_unique_code,
"table_name"=>"forum",
"new_id"=>$new_forum_id));
//Now copy moddata associated files
$status = forum_restore_files ($rec->old_id, $new_forum_id,
$oldid, $newid, $restore);
@ -520,7 +515,7 @@
}
//Now we get every post in this discussion_id and recalculate its parent post
$posts = get_records ("forum_posts","discussion",$discussion_id);
$posts = $DB->get_records ("forum_posts",array("discussion"=>$discussion_id));
if ($posts) {
//Iterate over each post
foreach ($posts as $post) {
@ -539,7 +534,7 @@
$temp_post->parent = $post->parent;
//echo "Updated parent ".$old_parent." to ".$temp_post->parent."<br />"; //Debug
//Update post (only parent will be changed)
$status = update_record("forum_posts",$temp_post);
$status = $DB->update_record("forum_posts",$temp_post);
}
}
@ -549,7 +544,6 @@
//This function copies the forum related info from backup temp dir to course moddata folder,
//creating it if needed and recoding everything (forum id and post id)
function forum_restore_files ($oldforid, $newforid, $oldpostid, $newpostid, $restore) {
global $CFG;
$status = true;
@ -602,8 +596,7 @@
//This function restores the forum_ratings
function forum_ratings_restore_mods($new_post_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -637,7 +630,7 @@
}
//The structure is equal to the db, so insert the forum_ratings
$newid = insert_record ("forum_ratings",$rating);
$newid = $DB->insert_record ("forum_ratings",$rating);
//Do some output
if (($i+1) % 50 == 0) {
@ -665,24 +658,23 @@
//This function converts texts in FORMAT_WIKI to FORMAT_MARKDOWN for
//some texts in the module
function forum_restore_wiki2markdown ($restore) {
global $CFG;
global $CFG, $DB;
$status = true;
//Convert forum_posts->message
if ($records = get_records_sql ("SELECT p.id, p.message, p.format
FROM {$CFG->prefix}forum_posts p,
{$CFG->prefix}forum_discussions d,
{$CFG->prefix}forum f,
{$CFG->prefix}backup_ids b
WHERE d.id = p.discussion AND
f.id = d.forum AND
f.course = $restore->course_id AND
p.format = ".FORMAT_WIKI. " AND
b.backup_code = $restore->backup_unique_code AND
b.table_name = 'forum_posts' AND
b.new_id = p.id")) {
if ($records = $DB->get_records_sql("SELECT p.id, p.message, p.format
FROM {forum_posts} p,
{forum_discussions} d,
{forum} f,
{backup_ids} b
WHERE d.id = p.discussion AND
f.id = d.forum AND
f.course = ? AND
p.format = ".FORMAT_WIKI. " AND
b.backup_code = ? AND
b.table_name = 'forum_posts' AND
b.new_id = p.id", array($restore->course_id, $restore->backup_unique_code))) {
foreach ($records as $record) {
//Rebuild wiki links
$record->message = restore_decode_wiki_content($record->message, $restore);
@ -690,7 +682,7 @@
$wtm = new WikiToMarkdown();
$record->message = $wtm->convert($record->message, $restore->course_id);
$record->format = FORMAT_MARKDOWN;
$status = update_record('forum_posts', addslashes_object($record));
$status = $DB->update_record('forum_posts', $record);
//Do some output
$i++;
if (($i+1) % 1 == 0) {
@ -1130,7 +1122,7 @@
//working in the backup/restore process. It's called from restore_decode_content_links()
//function in restore process
function forum_decode_content_links_caller($restore) {
global $CFG;
global $CFG, $DB;
$status = true;
//Process every POST (message) in the course
@ -1148,8 +1140,8 @@
$result = restore_decode_content_links_worker($content,$restore);
if ($result != $content) {
//Update record
$post->message = addslashes($result);
$status = update_record("forum_posts",$post);
$post->message = $result;
$status = $DB->update_record("forum_posts",$post);
if (debugging()) {
if (!defined('RESTORE_SILENTLY')) {
echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';

38
mod/glossary/restorelib.php
View File

@ -30,8 +30,7 @@
//This function executes all the restore procedure about this mod
function glossary_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -113,11 +112,11 @@
}
//The structure is equal to the db, so insert the glossary
$newid = insert_record ("glossary",$glossary);
$newid = $DB->insert_record ("glossary",$glossary);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","glossary")." \"".format_string(stripslashes($glossary->name),true)."\"</li>";
echo "<li>".get_string("modulename","glossary")." \"".format_string($glossary->name,true)."\"</li>";
}
backup_flush(300);
@ -141,8 +140,7 @@
//This function restores the glossary_entries
function glossary_entries_restore_mods($old_glossary_id,$new_glossary_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -189,7 +187,7 @@
//If it's a teacher entry or userinfo was selected, restore the entry
if ($entry->teacherentry or restore_userdata_selected($restore,'glossary',$old_glossary_id)) {
//The structure is equal to the db, so insert the glossary_entries
$newid = insert_record ("glossary_entries",$entry);
$newid = $DB->insert_record ("glossary_entries",$entry);
//Do some output
if (($i+1) % 50 == 0) {
@ -226,8 +224,7 @@
//This function restores the glossary_comments
function glossary_comments_restore_mods($old_entry_id,$new_entry_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -262,7 +259,7 @@
}
//The structure is equal to the db, so insert the glossary_comments
$newid = insert_record ("glossary_comments",$comment);
$newid = $DB->insert_record ("glossary_comments",$comment);
//Do some output
if (($i+1) % 50 == 0) {
@ -287,8 +284,7 @@
//This function restores the glossary_ratings
function glossary_ratings_restore_mods($old_entry_id,$new_entry_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -315,7 +311,7 @@
}
//The structure is equal to the db, so insert the glossary_ratings
$newid = insert_record ("glossary_ratings",$rating);
$newid = $DB->insert_record ("glossary_ratings",$rating);
//Do some output
if (($i+1) % 50 == 0) {
@ -338,8 +334,7 @@
//This function restores the glossary_alias table
function glossary_alias_restore_mods($old_entry_id,$new_entry_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -355,7 +350,7 @@
$alias->alias = backup_todb(trim($alias_info['#']['ALIAS_TEXT']['0']['#']));
//The structure is equal to the db, so insert the glossary_comments
$newid = insert_record ("glossary_alias",$alias);
$newid = $DB->insert_record ("glossary_alias",$alias);
//Do some output
if (($i+1) % 50 == 0) {
@ -378,8 +373,7 @@
//This function restores the glossary_categories
function glossary_categories_restore_mods($old_glossary_id,$new_glossary_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -401,7 +395,7 @@
$category->name = backup_todb($cat_info['#']['NAME']['0']['#']);
$category->usedynalink = backup_todb($cat_info['#']['USEDYNALINK']['0']['#']);
$newid = insert_record ("glossary_categories",$category);
$newid = $DB->insert_record ("glossary_categories",$category);
//Do some output
if (($i+1) % 50 == 0) {
@ -430,8 +424,7 @@
//This function restores the glossary_entries_categories
function glossary_entries_categories_restore_mods($old_category_id,$new_category_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -455,7 +448,7 @@
$entry_category->entryid = $entry->new_id;
}
$newid = insert_record ("glossary_entries_categories",$entry_category);
$newid = $DB->insert_record ("glossary_entries_categories",$entry_category);
//Do some output
if (($i+1) % 50 == 0) {
@ -479,7 +472,6 @@
//This function copies the glossary related info from backup temp dir to course moddata folder,
//creating it if needed and recoding everything (glossary id and entry id)
function glossary_restore_files ($oldgloid, $newgloid, $oldentryid, $newentryid, $restore) {
global $CFG;
$status = true;

6
mod/hotpot/restorelib.php
View File

@ -296,6 +296,8 @@ function hotpot_restore_record(&$restore, $status, &$xml, $table, $foreign_keys,
// if the $record->$secondarykey value does not already exist in $table
// maintain a cache of info on table columns
global $DB;
static $table_columns = array();
if (empty($table_columns[$table])) {
global $CFG, $DB;
@ -387,7 +389,7 @@ function hotpot_restore_record(&$restore, $status, &$xml, $table, $foreign_keys,
// if there is a secondary key field ...
if ($secondary_key) {
// check to see if a record with the same value already exists
$key_record = get_record($table, $secondary_key, $record->$secondary_key);
$key_record = $DB->get_record($table, array($secondary_key=>$record->$secondary_key));
if ($key_record) {
// set new record id from already existing record
$record->id = $key_record->id;
@ -395,7 +397,7 @@ function hotpot_restore_record(&$restore, $status, &$xml, $table, $foreign_keys,
}
if (empty($record->id)) {
// add the $record (and get new id)
$record->id = insert_record($table, $record);
$record->id = $DB->insert_record($table, $record);
}
// check $record was added (or found)
if (is_numeric($record->id)) {

7
mod/label/restorelib.php
View File

@ -18,8 +18,7 @@
//This function executes all the restore procedure about this mod
function label_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -40,11 +39,11 @@
$label->timemodified = $info['MOD']['#']['TIMEMODIFIED']['0']['#'];
//The structure is equal to the db, so insert the label
$newid = insert_record ("label",$label);
$newid = $DB->insert_record ("label",$label);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","label")." \"".format_string(stripslashes($label->name),true)."\"</li>";
echo "<li>".get_string("modulename","label")." \"".format_string($label->name,true)."\"</li>";
}
backup_flush(300);

62
mod/lesson/restorelib.php
View File

@ -40,8 +40,7 @@
//This function executes all the restore procedure about this mod
function lesson_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -101,11 +100,11 @@
$lesson->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
//The structure is equal to the db, so insert the lesson
$newid = insert_record("lesson", $lesson);
$newid = $DB->insert_record("lesson", $lesson);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","lesson")." \"".format_string(stripslashes($lesson->name),true)."\"</li>";
echo "<li>".get_string("modulename","lesson")." \"".format_string($lesson->name,true)."\"</li>";
}
backup_flush(300);
@ -147,8 +146,7 @@
//This function restores the lesson_pages
function lesson_pages_restore_mods($lessonid,$info,$restore,$userdata=false) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -179,11 +177,11 @@
$page->contents = backup_todb($page_info['#']['CONTENTS']['0']['#']);
//The structure is equal to the db, so insert the lesson_pages
$newid = insert_record ("lesson_pages",$page);
$newid = $DB->insert_record ("lesson_pages",$page);
//Fix the forwards link of the previous page
if ($prevpageid) {
if (!set_field("lesson_pages", "nextpageid", $newid, "id", $prevpageid)) {
if (!$DB->set_field("lesson_pages", "nextpageid", $newid, array("id"=>$prevpageid))) {
print_error("Lesson restorelib: unable to update link");
}
}
@ -213,7 +211,7 @@
if (($page->qtype == 3 && $page->qoption) ||
$page->qtype == 5) {
// get all the attempt records for this page
if ($attempts = get_records("lesson_attempts", "pageid", $newid)) {
if ($attempts = $DB->get_records("lesson_attempts", array("pageid"=>$newid))) {
foreach ($attempts as $attempt) {
unset($newuseranswer);
if ($attempt->useranswer != NULL) {
@ -227,7 +225,7 @@
// get the useranswer in the right format
$attempt->useranswer = implode(",", $newuseranswer);
// update it
update_record("lesson_attempts", $attempt);
$DB->update_record("lesson_attempts", $attempt);
}
}
}
@ -247,13 +245,13 @@
//We've restored all the pages and answers, we now need to fix the jumps in the
//answer records if they are absolute
if ($answers = get_records("lesson_answers", "lessonid", $lessonid)) {
if ($answers = $DB->get_records("lesson_answers", array("lessonid"=>$lessonid))) {
foreach ($answers as $answer) {
if ($answer->jumpto > 0) {
// change the absolute page id
$page = backup_getid($restore->backup_unique_code,"lesson_pages",$answer->jumpto);
if ($page) {
if (!set_field("lesson_answers", "jumpto", $page->new_id, "id", $answer->id)) {
if (!$DB->set_field("lesson_answers", "jumpto", $page->new_id, array("id"=>$answer->id))) {
print_error("Lesson restorelib: unable to reset jump");
}
}
@ -266,8 +264,7 @@
//This function restores the lesson_answers
function lesson_answers_restore($lessonid,$pageid,$info,$restore,$userdata=false) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -285,8 +282,8 @@
$newanswer->pageid = $pageid;
$newanswer->timecreated = $time;
$newanswer->timemodified = 0;
insert_record('lesson_answers', $newanswer);
insert_record('lesson_answers', $newanswer);
$DB->insert_record('lesson_answers', $newanswer);
$DB->insert_record('lesson_answers', $newanswer); // TODO: why is this here twice?
}
}
}
@ -317,7 +314,7 @@
$answer->response = backup_todb($answer_info['#']['RESPONSE']['0']['#']);
//The structure is equal to the db, so insert the lesson_answers
$newid = insert_record ("lesson_answers",$answer);
$newid = $DB->insert_record ("lesson_answers",$answer);
//Do some output
if (($i+1) % 10 == 0) {
@ -350,8 +347,7 @@
//This function restores the attempts
function lesson_attempts_restore($lessonid, $pageid, $answerid, $info, $restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -385,7 +381,7 @@
}
//The structure is equal to the db, so insert the lesson_attempt
$newid = insert_record ("lesson_attempts",$attempt);
$newid = $DB->insert_record ("lesson_attempts",$attempt);
//Do some output
if (($i+1) % 50 == 0) {
@ -405,8 +401,7 @@
//This function restores the lesson_grades
function lesson_grades_restore_mods($lessonid, $info, $restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -438,7 +433,7 @@
}
//The structure is equal to the db, so insert the lesson_grade
$newid = insert_record ("lesson_grades",$grade);
$newid = $DB->insert_record ("lesson_grades",$grade);
//Do some output
if (($i+1) % 50 == 0) {
@ -464,8 +459,7 @@
//This function restores the lesson_branch
function lesson_branch_restore($lessonid, $pageid, $info, $restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -497,7 +491,7 @@
}
//The structure is equal to the db, so insert the lesson_attempt
$newid = insert_record ("lesson_branch",$branch);
$newid = $DB->insert_record ("lesson_branch",$branch);
//Do some output
if (($i+1) % 50 == 0) {
@ -517,8 +511,7 @@
//This function restores the lesson_timer
function lesson_timer_restore_mods($lessonid, $info, $restore) {
global $CFG;
global $CFG, $DB;
$status = true;
//Get the timer array (optional)
@ -547,7 +540,7 @@
}
//The structure is equal to the db, so insert the lesson_grade
$newid = insert_record ("lesson_timer",$time);
$newid = $DB->insert_record ("lesson_timer",$time);
//Do some output
if (($i+1) % 50 == 0) {
@ -571,8 +564,7 @@
//This function restores the lesson_high_scores
function lesson_high_scores_restore_mods($lessonid, $info, $restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -602,7 +594,7 @@
}
//The structure is equal to the db, so insert the lesson_grade
$newid = insert_record ("lesson_high_scores",$highscore);
$newid = $DB->insert_record ("lesson_high_scores",$highscore);
//Do some output
if (($i+1) % 50 == 0) {
@ -626,8 +618,7 @@
//This function restores the lesson_default
function lesson_default_restore_mods($info, $restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -677,7 +668,7 @@
$default->maxhighscores = backup_todb($default_info['#']['MAXHIGHSCORES']['0']['#']);
//The structure is equal to the db, so insert the lesson_grade
$newid = insert_record ("lesson_default",$default);
$newid = $DB->insert_record ("lesson_default",$default);
if ($newid) {
backup_putid($restore->backup_unique_code,'lesson_default',
@ -709,7 +700,6 @@
//lesson_decode_content_links_caller() function in each module
//in the restore process
function lesson_decode_content_links ($content,$restore) {
global $CFG;
$result = $content;

34
mod/quiz/restorelib.php
View File

@ -37,8 +37,7 @@
include_once("$CFG->dirroot/question/restorelib.php");
function quiz_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -94,11 +93,11 @@
$quiz->questions = quiz_recode_layout($quiz->questions, $restore);
//The structure is equal to the db, so insert the quiz
$newid = insert_record ("quiz",$quiz);
$newid = $DB->insert_record ("quiz",$quiz);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","quiz")." \"".format_string(stripslashes($quiz->name),true)."\"</li>";
echo "<li>".get_string("modulename","quiz")." \"".format_string($quiz->name,true)."\"</li>";
}
backup_flush(300);
@ -133,8 +132,7 @@
//This function restores the quiz_question_instances
function quiz_question_instances_restore_mods($quiz_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -168,7 +166,7 @@
}
//The structure is equal to the db, so insert the quiz_question_instances
$newid = insert_record ("quiz_question_instances",$instance);
$newid = $DB->insert_record ("quiz_question_instances",$instance);
//Do some output
if (($i+1) % 10 == 0) {
@ -195,6 +193,8 @@
//This function restores the quiz_question_instances
function quiz_feedback_restore_mods($quiz_id, $info, $restore, $quiz) {
global $DB;
$status = true;
//Get the quiz_feedback array
@ -218,7 +218,7 @@
$feedback->maxgrade = backup_todb($feedback_info['#']['MAXGRADE']['0']['#']);
//The structure is equal to the db, so insert the quiz_question_instances
$newid = insert_record('quiz_feedback', $feedback);
$newid = $DB->insert_record('quiz_feedback', $feedback);
if ($newid) {
//We have the newid, update backup_ids
@ -233,7 +233,7 @@
$feedback->feedbacktext = '';
$feedback->mingrade = 0;
$feedback->maxgrade = $quiz->grade + 1;
insert_record('quiz_feedback', $feedback);
$DB->insert_record('quiz_feedback', $feedback);
}
return $status;
@ -241,8 +241,7 @@
//This function restores the quiz_question_versions
function quiz_question_versions_restore_mods($quiz_id,$info,$restore) {
global $CFG, $USER;
global $CFG, $USER, $DB;
$status = true;
@ -299,7 +298,7 @@
}
//The structure is equal to the db, so insert the quiz_question_versions
$newid = insert_record ("quiz_question_versions",$version);
$newid = $DB->insert_record ("quiz_question_versions",$version);
//Do some output
if (($i+1) % 10 == 0) {
@ -326,8 +325,7 @@
//This function restores the quiz_attempts
function quiz_attempts_restore_mods($quiz_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -374,7 +372,7 @@
$attempt->layout = quiz_recode_layout($attempt->layout, $restore);
//The structure is equal to the db, so insert the quiz_attempts
$newid = insert_record ("quiz_attempts",$attempt);
$newid = $DB->insert_record ("quiz_attempts",$attempt);
//Do some output
if (($i+1) % 10 == 0) {
@ -404,8 +402,7 @@
//This function restores the quiz_grades
function quiz_grades_restore_mods($quiz_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -441,7 +438,7 @@
}
//The structure is equal to the db, so insert the quiz_grades
$newid = insert_record ("quiz_grades",$grade);
$newid = $DB->insert_record ("quiz_grades",$grade);
//Do some output
if (($i+1) % 10 == 0) {
@ -471,7 +468,6 @@
//quiz_decode_content_links_caller() function in each module
//in the restore process
function quiz_decode_content_links ($content,$restore) {
global $CFG;
$result = $content;

170
mod/quiz/restorelibpre15.php
View File

@ -97,8 +97,7 @@
//STEP 1. Restore categories/questions and associated structures
// (course independent)
function quiz_restore_pre15_question_categories($category,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -127,7 +126,7 @@
if (!$quiz_cat->stamp) {
$quiz_cat->stamp = make_unique_id_code();
}
$newid = insert_record ("question_categories",$quiz_cat);
$newid = $DB->insert_record ("question_categories",$quiz_cat);
}
//Do some output
@ -163,8 +162,7 @@
}
function quiz_restore_pre15_questions ($old_category_id,$new_category_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -223,17 +221,17 @@
//Check if the question exists
//by category and stamp
$question_exists = get_record ("question","category",$question->category,
"stamp",$question->stamp);
$question_exists = $DB->get_record ("question", array("category"=>$question->category,
"stamp"=>$question->stamp));
//If the stamp doesn't exists, check if question exists
//by category, name and questiontext and calculate stamp
//Mantains pre Beta 1.1 compatibility !!
if (!$question->stamp) {
$question->stamp = make_unique_id_code();
$question->version = 1;
$question_exists = get_record ("question","category",$question->category,
"name",$question->name,
"questiontext",$question->questiontext);
$question_exists = $DB->get_record ("question", array("category"=>$question->category,
"name"=>$question->name,
"questiontext"=>$question->questiontext));
}
//If the question exists, only record its id
@ -243,10 +241,10 @@
//Else, create a new question
} else {
//The structure is equal to the db, so insert the question
$newid = insert_record ("question",$question);
$newid = $DB->insert_record ("question",$question);
//If it is a random question, parent = id
if ($newid && $question->qtype == RANDOM) {
set_field ('question', 'parent', $newid, 'id', $newid);
$DB->set_field ('question', 'parent', $newid, array('id'=>$newid));
}
$creatingnewquestion = true;
}
@ -328,8 +326,7 @@
}
function quiz_restore_pre15_answers ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -354,7 +351,7 @@
$answer->feedback = backup_todb($ans_info['#']['FEEDBACK']['0']['#']);
//The structure is equal to the db, so insert the question_answers
$newid = insert_record ("question_answers",$answer);
$newid = $DB->insert_record ("question_answers",$answer);
//Do some output
if (($i+1) % 50 == 0) {
@ -381,8 +378,7 @@
}
function quiz_restore_pre15_map_answers ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -415,9 +411,9 @@
//mappings in backup_ids to use them later where restoring responses (user level).
//Get the answer from DB (by question, answer and fraction)
$db_answer = get_record ("question_answers","question",$new_question_id,
"answer",$answer->answer,
"fraction",$answer->fraction);
$db_answer = $DB->get_record ("question_answers", array("question"=>$new_question_id,
"answer"=>$answer->answer,
"fraction"=>$answer->fraction));
//Do some output
if (($i+1) % 50 == 0) {
@ -443,8 +439,7 @@
}
function quiz_restore_pre15_shortanswer ($old_question_id,$new_question_id,$info,$restore,$restrictto = '') {
global $CFG;
global $CFG, $DB;
$status = true;
@ -488,7 +483,7 @@
//The structure is equal to the db, so insert the question_shortanswer
//Only if there aren't restrictions or there are restriction concordance
if (empty($restrictto) || (!empty($restrictto) && $shortanswer->answers == $restrictto)) {
$newid = insert_record ("question_shortanswer",$shortanswer);
$newid = $DB->insert_record ("question_shortanswer",$shortanswer);
}
//Do some output
@ -511,8 +506,7 @@
}
function quiz_restore_pre15_truefalse ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -544,7 +538,7 @@
}
//The structure is equal to the db, so insert the question_truefalse
$newid = insert_record ("question_truefalse",$truefalse);
$newid = $DB->insert_record ("question_truefalse",$truefalse);
//Do some output
if (($i+1) % 50 == 0) {
@ -566,8 +560,7 @@
}
function quiz_restore_pre15_multichoice ($old_question_id,$new_question_id,$info,$restore, $restrictto = '') {
global $CFG;
global $CFG, $DB;
$status = true;
@ -612,7 +605,7 @@
//The structure is equal to the db, so insert the question_shortanswer
//Only if there aren't restrictions or there are restriction concordance
if (empty($restrictto) || (!empty($restrictto) && $multichoice->answers == $restrictto)) {
$newid = insert_record ("question_multichoice",$multichoice);
$newid = $DB->insert_record ("question_multichoice",$multichoice);
}
//Do some output
@ -635,8 +628,7 @@
}
function quiz_restore_pre15_match ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -663,7 +655,7 @@
$match_sub->answertext = backup_todb($mat_info['#']['ANSWERTEXT']['0']['#']);
//The structure is equal to the db, so insert the question_match_sub
$newid = insert_record ("question_match_sub",$match_sub);
$newid = $DB->insert_record ("question_match_sub",$match_sub);
//Do some output
if (($i+1) % 50 == 0) {
@ -697,7 +689,7 @@
$match->subquestions = $subquestions_field;
//The structure is equal to the db, so insert the question_match_sub
$newid = insert_record ("question_match",$match);
$newid = $DB->insert_record ("question_match",$match);
if (!$newid) {
$status = false;
@ -707,8 +699,7 @@
}
function quiz_restore_pre15_map_match ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -740,9 +731,9 @@
//mappings in backup_ids to use them later where restoring responses (user level).
//Get the match_sub from DB (by question, questiontext and answertext)
$db_match_sub = get_record ("question_match_sub","question",$new_question_id,
"questiontext",$match_sub->questiontext,
"answertext",$match_sub->answertext);
$db_match_sub = $DB->get_record ("question_match_sub", array("question"=>$new_question_id,
"questiontext"=>$match_sub->questiontext,
"answertext"=>$match_sub->answertext));
//Do some output
if (($i+1) % 50 == 0) {
if (!defined('RESTORE_SILENTLY')) {
@ -768,8 +759,7 @@
}
function quiz_restore_pre15_randomsamatch ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -788,7 +778,7 @@
$randomsamatch->choose = backup_todb($ran_info['#']['CHOOSE']['0']['#']);
//The structure is equal to the db, so insert the question_randomsamatch
$newid = insert_record ("question_randomsamatch",$randomsamatch);
$newid = $DB->insert_record ("question_randomsamatch",$randomsamatch);
//Do some output
if (($i+1) % 50 == 0) {
@ -810,8 +800,7 @@
}
function quiz_restore_pre15_numerical ($old_question_id,$new_question_id,$info,$restore, $restrictto = '') {
global $CFG;
global $CFG, $DB;
$status = true;
@ -847,7 +836,7 @@
//The structure is equal to the db, so insert the question_numerical
//Only if there aren't restrictions or there are restriction concordance
if (empty($restrictto) || (!empty($restrictto) && in_array($numerical->answer,explode(",",$restrictto)))) {
$newid = insert_record ("question_numerical",$numerical);
$newid = $DB->insert_record ("question_numerical",$numerical);
}
//Do some output
@ -875,8 +864,7 @@
}
function quiz_restore_pre15_calculated ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -910,7 +898,7 @@
}
//The structure is equal to the db, so insert the question_calculated
$newid = insert_record ("question_calculated",$calculated);
$newid = $DB->insert_record ("question_calculated",$calculated);
//Do some output
if (($i+1) % 50 == 0) {
@ -945,7 +933,7 @@
$status = true;
//We need some question fields here so we get the full record from DB
$parentquestion = get_record('question','id',$new_question_id);
$parentquestion = $DB->get_record('question', array('id'=>$new_question_id));
//We need to store all the positions with their created questions
//to be able to calculate the sequence field
@ -1002,7 +990,7 @@
$question->stamp = make_unique_id_code();
//Save the new question to DB
$newid = insert_record('question', $question);
$newid = $DB->insert_record('question', $question);
if ($newid) {
$createdquestions[$multianswer->positionkey] = $newid;
@ -1050,7 +1038,7 @@
$multianswerdb = new object;
$multianswerdb->question = $parentquestion->id;
$multianswerdb->sequence = implode(",",$createdquestions);
$mid = insert_record('question_multianswer', $multianswerdb);
$mid = $DB->insert_record('question_multianswer', $multianswerdb);
if (!$mid) {
$status = false;
@ -1061,8 +1049,7 @@
}
function quiz_restore_pre15_numerical_units ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1082,7 +1069,7 @@
$numerical_unit->unit = backup_todb($nu_info['#']['UNIT']['0']['#']);
//The structure is equal to the db, so insert the question_numerical_units
$newid = insert_record ("question_numerical_units",$numerical_unit);
$newid = $DB->insert_record ("question_numerical_units",$numerical_unit);
if (!$newid) {
$status = false;
@ -1093,8 +1080,7 @@
}
function quiz_restore_pre15_dataset_definitions ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1132,11 +1118,9 @@
} else {
//The category isn't 0, so it's a category question dataset_definition, we have to see if it exists
//Look for a definition with the same category, name and type
if ($definitionrec = get_record_sql("SELECT d.*
FROM {$CFG->prefix}question_dataset_definitions d
WHERE d.category = '$dataset_definition->category' AND
d.name = '$dataset_definition->name' AND
d.type = '$dataset_definition->type'")) {
if ($definitionrec = $DB->get_records('question_dataset_definitions', array('category'=>$dataset_definition->category,
'name'=>$dataset_definition->name,
'type'=>$dataset_definition->type))) {
//Such dataset_definition exist. Now we must check if it has enough itemcount
if ($definitionrec->itemcount < $dataset_definition->itemcount) {
//We haven't enough itemcount, so we have to create the definition as an individual question one.
@ -1156,7 +1140,7 @@
//If we've to create the definition, do it
if ($create_definition) {
//The structure is equal to the db, so insert the question_dataset_definitions
$newid = insert_record ("question_dataset_definitions",$dataset_definition);
$newid = $DB->insert_record ("question_dataset_definitions",$dataset_definition);
if ($newid) {
//Restore question_dataset_items
$status = quiz_restore_pre15_dataset_items($newid,$dd_info,$restore);
@ -1168,7 +1152,7 @@
if ($newid) {
$question_dataset->question = $new_question_id;
$question_dataset->datasetdefinition = $newid;
$newid = insert_record ("question_datasets",$question_dataset);
$newid = $DB->insert_record ("question_datasets",$question_dataset);
}
if (!$newid) {
@ -1180,8 +1164,7 @@
}
function quiz_restore_pre15_dataset_items ($definitionid,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1201,7 +1184,7 @@
$dataset_item->value = backup_todb($di_info['#']['VALUE']['0']['#']);
//The structure is equal to the db, so insert the question_dataset_items
$newid = insert_record ("question_dataset_items",$dataset_item);
$newid = $DB-insert_record ("question_dataset_items",$dataset_item);
if (!$newid) {
$status = false;
@ -1214,8 +1197,7 @@
//STEP 2. Restore quizzes and associated structures
// (course dependent)
function quiz_restore_pre15_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1292,11 +1274,11 @@
$quiz->review = $review;
//The structure is equal to the db, so insert the quiz
$newid = insert_record ("quiz",$quiz);
$newid = $DB->insert_record ("quiz",$quiz);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","quiz")." \"".format_string(stripslashes($quiz->name),true)."\"</li>";
echo "<li>".get_string("modulename","quiz")." \"".format_string($quiz->name,true)."\"</li>";
}
backup_flush(300);
@ -1329,8 +1311,7 @@
//This function restores the quiz_question_instances (old quiz_question_grades)
function quiz_question_instances_restore_pre15_mods($quiz_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1359,7 +1340,7 @@
}
//The structure is equal to the db, so insert the quiz_question_grades
$newid = insert_record ("quiz_question_instances",$grade);
$newid = $DB->insert_record ("quiz_question_instances",$grade);
//Do some output
if (($i+1) % 10 == 0) {
@ -1386,8 +1367,7 @@
//This function restores the quiz_question_versions
function quiz_question_versions_restore_pre15_mods($quiz_id,$info,$restore) {
global $CFG, $USER;
global $CFG, $USER, $DB;
$status = true;
@ -1432,7 +1412,7 @@
}
//The structure is equal to the db, so insert the quiz_question_versions
$newid = insert_record ("quiz_question_versions",$version);
$newid = $DB->insert_record ("quiz_question_versions",$version);
//Do some output
if (($i+1) % 10 == 0) {
@ -1459,8 +1439,7 @@
//This function restores the quiz_attempts
function quiz_attempts_restore_pre15_mods($quiz_id,$info,$restore,$quizquestions) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1506,7 +1485,7 @@
$attempt->uniqueid = question_new_attempt_uniqueid();
//The structure is equal to the db, so insert the quiz_attempts
$newid = insert_record ("quiz_attempts",$attempt);
$newid = $DB->insert_record ("quiz_attempts",$attempt);
//Do some output
if (($i+1) % 10 == 0) {
@ -1535,8 +1514,7 @@
//This function restores the question_states (old quiz_responses)
function question_states_restore_pre15_mods($attempt_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1577,7 +1555,7 @@
//We have to recode the answer field
//It depends of the question type !!
//We get the question first
$question = get_record("question","id",$response->question);
$question = $DB->get_record("question", array("id"=>$response->question));
//It exists
if ($question) {
//Depending of the qtype, we make different recodes
@ -1692,7 +1670,7 @@
case 9: //MULTIANSWER QTYPE
//The answer is a comma separated list of hypen separated multianswer ids and answers. We must recode them.
//We need to have the sequence of questions here to be able to detect qtypes
$multianswerdb = get_record('question_multianswer','question',$response->question);
$multianswerdb = $DB->get_record('question_multianswer',array('question'=>$response->question));
//Make an array of sequence to easy access
$sequencearr = explode(",",$multianswerdb->sequence);
$answer_field = "";
@ -1713,7 +1691,7 @@
continue;
}
//Calculate question type
$questiondb = get_record('question','id',$sequencearr[$counter-1]);
$questiondb = $DB->get_record('question', array('id'=>$sequencearr[$counter-1]));
$questiontype = $questiondb->qtype;
//Now, depending of the answertype field in question_multianswer
//we do diferent things
@ -1756,7 +1734,7 @@
}
//The structure is equal to the db, so insert the question_states
$newid = insert_record ("question_states",$response);
$newid = $DB->insert_record ("question_states",$response);
//Do some output
if (($i+1) % 10 == 0) {
@ -1783,8 +1761,7 @@
//This function restores the quiz_grades
function quiz_grades_restore_pre15_mods($quiz_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -1815,7 +1792,7 @@
}
//The structure is equal to the db, so insert the quiz_grades
$newid = insert_record ("quiz_grades",$grade);
$newid = $DB->insert_record ("quiz_grades",$grade);
//Do some output
if (($i+1) % 10 == 0) {
@ -1843,19 +1820,18 @@
//This function converts texts in FORMAT_WIKI to FORMAT_MARKDOWN for
//some texts in the module
function quiz_restore_pre15_wiki2markdown ($restore) {
global $CFG;
global $CFG, $DB;
$status = true;
//Convert question->questiontext
if ($records = get_records_sql ("SELECT q.id, q.questiontext, q.questiontextformat
FROM {$CFG->prefix}question q,
{$CFG->prefix}backup_ids b
WHERE b.backup_code = $restore->backup_unique_code AND
b.table_name = 'question' AND
q.id = b.new_id AND
q.questiontextformat = ".FORMAT_WIKI)) {
if ($records = $DB->get_records_sql ("SELECT q.id, q.questiontext, q.questiontextformat
FROM {question} q,
{backup_ids} b
WHERE b.backup_code = ? AND
b.table_name = 'question' AND
q.id = b.new_id AND
q.questiontextformat = ".FORMAT_WIKI, array($restore->backup_unique_code))) {
foreach ($records as $record) {
//Rebuild wiki links
$record->questiontext = restore_decode_wiki_content($record->questiontext, $restore);
@ -1863,7 +1839,7 @@
$wtm = new WikiToMarkdown();
$record->questiontext = $wtm->convert($record->questiontext, $restore->course_id);
$record->questiontextformat = FORMAT_MARKDOWN;
$status = update_record('question', addslashes_object($record));
$status = $DB->update_record('question', addslashes_object($record));
//Do some output
$i++;
if (($i+1) % 1 == 0) {

7
mod/resource/restorelib.php
View File

@ -18,8 +18,7 @@
//This function executes all the restore procedure about this mod
function resource_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -79,11 +78,11 @@
}
//The structure is equal to the db, so insert the resource
$newid = insert_record ("resource",$resource);
$newid = $DB->insert_record ("resource",$resource);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","resource")." \"".format_string(stripslashes($resource->name),true)."\"</li>";
echo "<li>".get_string("modulename","resource")." \"".format_string($resource->name,true)."\"</li>";
}
backup_flush(300);

52
mod/scorm/restorelib.php
View File

@ -28,8 +28,7 @@
//This function executes all the restore procedure about this mod
function scorm_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -125,10 +124,10 @@
$scorm->timemodified = time();
//The structure is equal to the db, so insert the scorm
$newid = insert_record ("scorm",$scorm);
$newid = $DB->insert_record ("scorm",$scorm);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","scorm")." \"".format_string(stripslashes($scorm->name),true)."\"</li>";
echo "<li>".get_string("modulename","scorm")." \"".format_string($scorm->name,true)."\"</li>";
}
backup_flush(300);
@ -145,7 +144,7 @@
if ($status) {
$launchsco = backup_getid($restore->backup_unique_code,"scorm_scoes",$oldlaunch);
$scorm->launch = $launchsco->new_id;
update_record('scorm',$scorm);
$DB->update_record('scorm',$scorm);
}
}
@ -161,8 +160,7 @@
//This function restores the scorm_scoes
function scorm_scoes_restore_mods($scorm_id,$info,$restore,$oldmodid) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -191,7 +189,7 @@
}
//The structure is equal to the db, so insert the scorm_scoes
$newid = insert_record ("scorm_scoes",$sco);
$newid = $DB->insert_record ("scorm_scoes",$sco);
if ($newid) {
//We have the newid, update backup_ids
@ -221,8 +219,7 @@
function scorm_scoes_seq_objective_restore_mods($sco_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -248,7 +245,7 @@
$objective->minnormalizedmeasure = backup_todb($obj_info['#']['MINNORMALIZEDMEASURE']['0']['#']);
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("scorm_seq_objective",$objective);
$newid = $DB->insert_record ("scorm_seq_objective",$objective);
if ($newid) {
//We have the newid, update backup_ids
@ -280,8 +277,7 @@
function scorm_scoes_seq_rolluprule_restore_mods($sco_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -308,7 +304,7 @@
$rolluprule->action = backup_todb($rol_info['#']['ACTION']['0']['#']);
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("scorm_seq_rolluprule",$rolluprule);
$newid = $DB->insert_record ("scorm_seq_rolluprule",$rolluprule);
if ($newid) {
//We have the newid, update backup_ids
@ -338,8 +334,7 @@
}
function scorm_scoes_seq_ruleconds_restore_mods($sco_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -364,7 +359,7 @@
$rulecond->action = backup_todb($rul_info['#']['ACTION']['0']['#']);
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("scorm_seq_ruleconds",$rulecond);
$newid = $DB->insert_record ("scorm_seq_ruleconds",$rulecond);
if ($newid) {
//We have the newid, update backup_ids
@ -394,7 +389,6 @@
}
function scorm_scoes_seq_rulecond_restore_mods($sco_id,$rulecondid,$info,$restore) {
global $CFG;
$status = true;
@ -422,7 +416,7 @@
$rulecondd->cond = backup_todb($ruld_info['#']['COND']['0']['#']);
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("scorm_seq_rulecond",$rulecondd);
$newid = $DB->insert_record ("scorm_seq_rulecond",$rulecondd);
if ($newid) {
//We have the newid, update backup_ids
@ -450,8 +444,7 @@
}
function scorm_scoes_seq_rolluprulecond_restore_mods($sco_id,$rolluprule,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -477,7 +470,7 @@
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("scorm_seq_rolluprulecond",$rolluprulecond);
$newid = $DB->insert_record ("scorm_seq_rolluprulecond",$rolluprulecond);
if ($newid) {
//We have the newid, update backup_ids
@ -505,8 +498,7 @@
}
function scorm_scoes_seq_mapinfo_restore_mods($sco_id,$objectiveid,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -535,7 +527,7 @@
//The structure is equal to the db, so insert the forum_discussions
$newid = insert_record ("scorm_seq_mapinfo",$mapinfo);
$newid = $DB->insert_record ("scorm_seq_mapinfo",$mapinfo);
if ($newid) {
//We have the newid, update backup_ids
@ -560,8 +552,7 @@
//This function restores the scorm_scoes_track
function scorm_scoes_tracks_restore_mods($scorm_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
$scotracks = NULL;
@ -597,7 +588,7 @@
$scotrack->timemodified = time();
//The structure is equal to the db, so insert the scorm_scoes_track
$newid = insert_record ("scorm_scoes_track",$scotrack);
$newid = $DB->insert_record ("scorm_scoes_track",$scotrack);
//Do some output
if (($i+1) % 50 == 0) {
@ -617,8 +608,7 @@
//This function restores the scorm_scoes_track from Moodle 1.4
function scorm_scoes_tracks_restore_mods_pre15 ($scorm_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
$scousers = NULL;
@ -675,7 +665,7 @@
}
//The structure is equal to the db, so insert the scorm_scoes_track
$newid = insert_record ("scorm_scoes_track",$scotrack);
$newid = $DB->insert_record ("scorm_scoes_track",$scotrack);
}
$pos++;
}

17
mod/survey/restorelib.php
View File

@ -24,8 +24,7 @@
function survey_restore_mods($mod,$restore) {
global $CFG,$DB;
global $CFG, $DB;
$status = true;
@ -50,11 +49,11 @@
$survey->questions = backup_todb($info['MOD']['#']['QUESTIONS']['0']['#']);
//The structure is equal to the db, so insert the survey
$newid = insert_record ("survey",$survey);
$newid = $DB->insert_record ("survey",$survey);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","survey")." \"".format_string(stripslashes($survey->name),true)."\"</li>";
echo "<li>".get_string("modulename","survey")." \"".format_string($survey->name,true)."\"</li>";
}
backup_flush(300);
@ -83,8 +82,7 @@
//This function restores the survey_answers
function survey_answers_restore_mods($survey_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -117,7 +115,7 @@
}
//The structure is equal to the db, so insert the survey_answers
$newid = insert_record ("survey_answers",$answer);
$newid = $DB->insert_record ("survey_answers",$answer);
//Do some output
if (($i+1) % 50 == 0) {
@ -144,8 +142,7 @@
//This function restores the survey_analysis
function survey_analysis_restore_mods($survey_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -175,7 +172,7 @@
}
//The structure is equal to the db, so insert the survey_analysis
$newid = insert_record ("survey_analysis",$analys);
$newid = $DB->insert_record ("survey_analysis",$analys);
//Do some output
if (($i+1) % 50 == 0) {

17
mod/wiki/restorelib.php
View File

@ -23,8 +23,7 @@
//-----------------------------------------------------------
function wiki_restore_mods($mod,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -60,11 +59,11 @@
$wiki->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']);
//The structure is equal to the db, so insert the wiki
$newid = insert_record ("wiki",$wiki);
$newid = $DB->insert_record ("wiki",$wiki);
//Do some output
if (!defined('RESTORE_SILENTLY')) {
echo "<li>".get_string("modulename","wiki")." \"".format_string(stripslashes($wiki->name),true)."\"</li>";
echo "<li>".get_string("modulename","wiki")." \"".format_string($wiki->name,true)."\"</li>";
}
backup_flush(300);
@ -89,8 +88,7 @@
//This function restores the wiki_entries
function wiki_entries_restore_mods($old_wiki_id,$new_wiki_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -128,7 +126,7 @@
}
//The structure is equal to the db, so insert the wiki_entries
$newid = insert_record ("wiki_entries",$entry);
$newid = $DB->insert_record ("wiki_entries",$entry);
//Do some output
if (($i+1) % 50 == 0) {
@ -159,8 +157,7 @@
//This function restores the wiki_pages
function wiki_pages_restore_mods($old_entry_id,$new_entry_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -199,7 +196,7 @@
$page->userid = $user->new_id;
}
//The structure is equal to the db, so insert the wiki_pages
$newid = insert_record ("wiki_pages",$page);
$newid = $DB->insert_record ("wiki_pages",$page);
//Do some output
if (($i+1) % 50 == 0) {

69
question/restorelib.php
View File

@ -138,6 +138,8 @@
}
function restore_question_category($category, $restore){
global $DB;
$status = true;
//Skip empty categories (some backups can contain them)
if (!empty($category->id)) {
@ -180,7 +182,7 @@
//does cat exist ?? if it does we check if the cat and questions already exist whether we have
//add permission or not if we have no permission to add questions to SYSTEM or COURSECAT context
//AND the question does not already exist then we create questions in COURSE context.
if (!$fcat = get_record('question_categories','contextid', $question_cat->contextid, 'stamp', $question_cat->stamp)){
if (!$fcat = $DB->get_record('question_categories', array('contextid'=>$question_cat->contextid, 'stamp'=>$question_cat->stamp))) {
//no preexisting cat
if ((($tocontext->contextlevel == CONTEXT_SYSTEM) || ($tocontext->contextlevel == CONTEXT_COURSECAT))
&& !has_capability('moodle/question:add', $tocontext)){
@ -189,7 +191,7 @@
$tocontext = get_context_instance(CONTEXT_COURSE, $restore->course_id);
}
$question_cat->contextid = $tocontext->id;
if (!$fcat = get_record('question_categories','contextid', $question_cat->contextid, 'stamp', $question_cat->stamp)){
if (!$fcat = $DB->get_record('question_categories', array('contextid'=>$question_cat->contextid, 'stamp'=>$question_cat->stamp))) {
$question_cat->id = insert_record ("question_categories", $question_cat);
} else {
$question_cat = $fcat;
@ -294,8 +296,7 @@
}
function restore_questions ($old_category_id, $best_question_cat, $info, $restore) {
global $CFG, $QTYPES;
global $CFG, $QTYPES, $DB;
$status = true;
$restored_questions = array();
@ -347,7 +348,7 @@
//Check if the question exists by category, stamp, and version
//first check for the question in the context specified in backup
$existingquestion = get_record ("question", "category", $best_question_cat->id, "stamp", $question->stamp,"version",$question->version);
$existingquestion = $DB->get_record ("question", array("category"=>$best_question_cat->id, "stamp"=>$question->stamp,"version"=>$question->version));
//If the question exists, only record its id
//always use existing question, no permissions check here
if ($existingquestion) {
@ -364,8 +365,8 @@
$course_question_cat = clone($best_question_cat);
$course_question_cat->contextid = $coursecontext->id;
//create cat if it doesn't exist
if (!$fcat = get_record('question_categories','contextid', $course_question_cat->contextid, 'stamp', $course_question_cat->stamp)){
$course_question_cat->id = insert_record ("question_categories", $course_question_cat);
if (!$fcat = $DB->get_record('question_categories', array('contextid'=>$course_question_cat->contextid, 'stamp'=>$course_question_cat->stamp))) {
$course_question_cat->id = $DB->insert_record("question_categories", $course_question_cat);
backup_putid($restore->backup_unique_code, "question_categories", $old_category_id, $course_question_cat->id);
} else {
$course_question_cat = $fcat;
@ -382,7 +383,7 @@
}
if (!$existingquestion){
//The structure is equal to the db, so insert the question
$question->id = insert_record ("question", $question);
$question->id = $DB->insert_record ("question", $question);
$creatingnewquestion = true;
} else {
$question = $existingquestion;
@ -394,7 +395,7 @@
// see: $QTYPES['random']->get_question_options()
if ($question->qtype == 'random' && $creatingnewquestion) {
$question->parent = $question->id;
$status = set_field('question', 'parent', $question->parent, 'id', $question->id);
$status = $DB->set_field('question', 'parent', $question->parent, array('id'=>$question->id));
}
//Save newid to backup tables
@ -434,7 +435,7 @@
if ($parent = backup_getid($restore->backup_unique_code,"question",$question->parent)) {
$question->parent = $parent->new_id;
if ($question->parent != $restored_questions[$i]->parent) {
if (!set_field('question', 'parent', $question->parent, 'id', $newid)) {
if (!$DB->set_field('question', 'parent', $question->parent, array('id'=>$newid))) {
echo 'Could not update parent '.$question->parent.' for question '.$oldid.'<br />';
$status = false;
}
@ -491,8 +492,7 @@
}
function question_restore_answers ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
$qtype = backup_todb($info['#']['QTYPE']['0']['#']);
@ -524,7 +524,7 @@
}
//The structure is equal to the db, so insert the question_answers
$newid = insert_record ("question_answers",$answer);
$newid = $DB->insert_record ("question_answers",$answer);
//Do some output
if (($i+1) % 50 == 0) {
@ -551,8 +551,7 @@
}
function question_restore_map_answers ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -585,8 +584,8 @@
//mappings in backup_ids to use them later where restoring states (user level).
//Get the answer from DB (by question and answer)
$db_answer = get_record ("question_answers","question",$new_question_id,
"answer",$answer->answer);
$db_answer = $DB->get_record ("question_answers", array("question"=>$new_question_id,
"answer"=>$answer->answer));
//Do some output
if (($i+1) % 50 == 0) {
@ -612,8 +611,7 @@
}
function question_restore_numerical_units($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -634,7 +632,7 @@
// Check to see if this until already exists in the database, which it might, for
// Historical reasons.
$unit = backup_todb($nu_info['#']['UNIT']['0']['#']);
if (!record_exists('question_numerical_units', 'question', $new_question_id, 'unit', $unit)) {
if (!$DB->record_exists('question_numerical_units', array('question'=>$new_question_id, 'unit'=>$unit))) {
//Now, build the question_numerical_UNITS record structure.
$numerical_unit = new stdClass;
@ -643,7 +641,7 @@
$numerical_unit->unit = $unit;
//The structure is equal to the db, so insert the question_numerical_units
$newid = insert_record("question_numerical_units", $numerical_unit);
$newid = $DB->insert_record("question_numerical_units", $numerical_unit);
if (!$newid) {
$status = false;
@ -655,8 +653,7 @@
}
function question_restore_dataset_definitions ($old_question_id,$new_question_id,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -697,11 +694,9 @@
} else {
//The category isn't 0, so it's a category question dataset_definition, we have to see if it exists
//Look for a definition with the same category, name and type
if ($definitionrec = get_record_sql("SELECT d.*
FROM {$CFG->prefix}question_dataset_definitions d
WHERE d.category = '$dataset_definition->category' AND
d.name = '$dataset_definition->name' AND
d.type = '$dataset_definition->type'")) {
if ($definitionrec = $DB->get_records('question_dataset_definitions', array('category'=>$dataset_definition->category,
'name'=>$dataset_definition->name,
'type'=>$dataset_definition->type))) {
//Such dataset_definition exist. Now we must check if it has enough itemcount
if ($definitionrec->itemcount < $dataset_definition->itemcount) {
//We haven't enough itemcount, so we have to create the definition as an individual question one.
@ -721,7 +716,7 @@
//If we've to create the definition, do it
if ($create_definition) {
//The structure is equal to the db, so insert the question_dataset_definitions
$newid = insert_record ("question_dataset_definitions",$dataset_definition);
$newid = $DB->insert_record ("question_dataset_definitions",$dataset_definition);
if ($newid) {
//Restore question_dataset_items
$status = question_restore_dataset_items($newid,$dd_info,$restore);
@ -734,7 +729,7 @@
$question_dataset = new stdClass;
$question_dataset->question = $new_question_id;
$question_dataset->datasetdefinition = $newid;
$newid = insert_record ("question_datasets",$question_dataset);
$newid = $DB->insert_record ("question_datasets",$question_dataset);
}
if (!$newid) {
@ -746,8 +741,7 @@
}
function question_restore_dataset_items ($definitionid,$info,$restore) {
global $CFG;
global $CFG, $DB;
$status = true;
@ -768,7 +762,7 @@
$dataset_item->value = backup_todb($di_info['#']['VALUE']['0']['#']);
//The structure is equal to the db, so insert the question_dataset_items
$newid = insert_record ("question_dataset_items",$dataset_item);
$newid = $DB->insert_record ("question_dataset_items",$dataset_item);
if (!$newid) {
$status = false;
@ -781,8 +775,7 @@
//This function restores the question_states
function question_states_restore_mods($attempt_id,$info,$restore) {
global $CFG, $QTYPES;
global $CFG, $QTYPES, $DB;
$status = true;
@ -833,7 +826,7 @@
//We have to recode the answer field
//It depends of the question type !!
//We get the question first
if (!$question = get_record("question","id",$state->question)) {
if (!$question = $DB->get_record("question", array("id"=>$state->question))) {
print_error("Can't find the record for question $state->question for which I am trying to restore a state");
}
//Depending on the qtype, we make different recodes
@ -842,7 +835,7 @@
}
//The structure is equal to the db, so insert the question_states
$newid = insert_record ("question_states",$state);
$newid = $DB->insert_record ("question_states",$state);
//Do some output
if (($i+1) % 10 == 0) {
@ -913,7 +906,7 @@
}
//The structure is equal to the db, so insert the question_sessions
$newid = insert_record ("question_sessions",$session);
$newid = $DB->insert_record ("question_sessions",$session);
}

3
question/type/calculated/questiontype.php
View File

@ -1016,6 +1016,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -1044,7 +1045,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
}
//The structure is equal to the db, so insert the question_calculated
$newid = insert_record ("question_calculated",$calculated);
$newid = $DB->insert_record ("question_calculated",$calculated);
//Do some output
if (($i+1) % 50 == 0) {

5
question/type/match/questiontype.php
View File

@ -458,6 +458,7 @@ class question_match_qtype extends default_questiontype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -486,7 +487,7 @@ class question_match_qtype extends default_questiontype {
$match_sub->answertext = backup_todb($mat_info['#']['ANSWERTEXT']['0']['#']);
//The structure is equal to the db, so insert the question_match_sub
$newid = insert_record ("question_match_sub",$match_sub);
$newid = $DB->insert_record ("question_match_sub",$match_sub);
//Do some output
if (($i+1) % 50 == 0) {
@ -521,7 +522,7 @@ class question_match_qtype extends default_questiontype {
$match->subquestions = $subquestions_field;
//The structure is equal to the db, so insert the question_match_sub
$newid = insert_record ("question_match",$match);
$newid = $DB->insert_record ("question_match",$match);
if (!$newid) {
$status = false;

8
question/type/multianswer/questiontype.php
View File

@ -546,6 +546,7 @@ class embedded_cloze_qtype extends default_questiontype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -585,7 +586,7 @@ class embedded_cloze_qtype extends default_questiontype {
//We have the answers field recoded to its new ids
$multianswer->sequence = $sequence_field;
//The structure is equal to the db, so insert the question_multianswer
$newid = insert_record("question_multianswer", $multianswer);
$newid = $DB->insert_record("question_multianswer", $multianswer);
//Save ids in backup_ids
if ($newid) {
@ -609,6 +610,7 @@ class embedded_cloze_qtype extends default_questiontype {
}
function restore_map($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -634,8 +636,8 @@ class embedded_cloze_qtype extends default_questiontype {
//mappings in backup_ids to use them later where restoring states (user level).
//Get the multianswer from DB (by question and positionkey)
$db_multianswer = get_record ("question_multianswer","question",$new_question_id,
"positionkey",$multianswer->positionkey);
$db_multianswer = $DB->get_record ("question_multianswer",array("question"=>$new_question_id,
"positionkey"=>$multianswer->positionkey));
//Do some output
if (($i+1) % 50 == 0) {
if (!defined('RESTORE_SILENTLY')) {

3
question/type/multichoice/questiontype.php
View File

@ -437,6 +437,7 @@ class question_multichoice_qtype extends default_questiontype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -493,7 +494,7 @@ class question_multichoice_qtype extends default_questiontype {
$multichoice->answers = $answers_field;
//The structure is equal to the db, so insert the question_shortanswer
$newid = insert_record ("question_multichoice",$multichoice);
$newid = $DB->insert_record ("question_multichoice",$multichoice);
//Do some output
if (($i+1) % 50 == 0) {

3
question/type/numerical/questiontype.php
View File

@ -433,6 +433,7 @@ class question_numerical_qtype extends question_shortanswer_qtype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -460,7 +461,7 @@ class question_numerical_qtype extends question_shortanswer_qtype {
}
//The structure is equal to the db, so insert the question_numerical
$newid = insert_record ("question_numerical", $numerical);
$newid = $DB->insert_record ("question_numerical", $numerical);
//Do some output
if (($i+1) % 50 == 0) {

3
question/type/randomsamatch/questiontype.php
View File

@ -300,6 +300,7 @@ class question_randomsamatch_qtype extends question_match_qtype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -315,7 +316,7 @@ class question_randomsamatch_qtype extends question_match_qtype {
$randomsamatch->choose = backup_todb($ran_info['#']['CHOOSE']['0']['#']);
//The structure is equal to the db, so insert the question_randomsamatch
$newid = insert_record ("question_randomsamatch",$randomsamatch);
$newid = $DB->insert_record ("question_randomsamatch",$randomsamatch);
//Do some output
if (($i+1) % 50 == 0) {

3
question/type/shortanswer/questiontype.php
View File

@ -274,6 +274,7 @@ class question_shortanswer_qtype extends default_questiontype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -313,7 +314,7 @@ class question_shortanswer_qtype extends default_questiontype {
$shortanswer->answers = $answers_field;
//The structure is equal to the db, so insert the question_shortanswer
$newid = insert_record ("question_shortanswer",$shortanswer);
$newid = $DB->insert_record ("question_shortanswer",$shortanswer);
//Do some output
if (($i+1) % 50 == 0) {

3
question/type/truefalse/questiontype.php
View File

@ -279,6 +279,7 @@ class question_truefalse_qtype extends default_questiontype {
* This is used in question/restorelib.php
*/
function restore($old_question_id,$new_question_id,$info,$restore) {
global $DB;
$status = true;
@ -312,7 +313,7 @@ class question_truefalse_qtype extends default_questiontype {
}
//The structure is equal to the db, so insert the question_truefalse
$newid = insert_record ("question_truefalse", $truefalse);
$newid = $DB->insert_record ("question_truefalse", $truefalse);
//Do some output
if (($i+1) % 50 == 0) {