diff --git a/backup/CHANGES_14_15.txt b/backup/CHANGES_14_15.txt
index 714edc6f70b..fda9bf24458 100644
--- a/backup/CHANGES_14_15.txt
+++ b/backup/CHANGES_14_15.txt
@@ -42,6 +42,6 @@ Now I show the specific detailed status of every item in the process:
25. TODO: Add support for forum_read table in backup and restore.
26. DONE: chat_users->course and chat_users->lang. No changes required!
27. PROG: Make the backup/restore/config/logs/index.php XHTML 1.0 Transitional.
- Done in manual backups, config and logs
+ Done in manual backups, config, logs and restore.
Eloy (stronk7)
23-01-2004
diff --git a/backup/restore_execute.html b/backup/restore_execute.html
index 4031b00f2cb..5490bc89e62 100644
--- a/backup/restore_execute.html
+++ b/backup/restore_execute.html
@@ -77,12 +77,12 @@
//Print course fullname and shortname and category
if ($status) {
echo "
";
- echo "- ".$course_header->course_fullname." (".$course_header->course_shortname.")";
- echo "
- ".get_string("category").": ".$course_header->category->name;
+ echo "
- ".$course_header->course_fullname." (".$course_header->course_shortname.")".'
';
+ echo "- ".get_string("category").": ".$course_header->category->name.'
';
if (!empty($oldidnumber)) {
echo "- ".get_string("nomoreidnumber","moodle",$oldidnumber)."
";
}
- echo "
";
+ echo "";
//Put the destination course_id
$restore->course_id = $course_header->course_id;
}
@@ -91,17 +91,17 @@
if ($course) {
echo "".get_string("usingexistingcourse");
echo "";
- echo "- ".get_string("from").": ".$course_header->course_fullname." (".$course_header->course_shortname.")";
- echo "
- ".get_string("to").": ".$course->fullname." (".$course->shortname.")";
+ echo "
- ".get_string("from").": ".$course_header->course_fullname." (".$course_header->course_shortname.")".'
';
+ echo "- ".get_string("to").": ".$course->fullname." (".$course->shortname.")".'
';
if (($restore->deleting)) {
- echo "- ".get_string("deletingexistingcoursedata");
+ echo "
- ".get_string("deletingexistingcoursedata").'
';
} else {
- echo "- ".get_string("addingdatatoexisting");
+ echo "
- ".get_string("addingdatatoexisting").'
';
}
- echo "
";
+ echo "";
//If we have selected to restore deleting, we do it now.
if ($restore->deleting) {
- echo "".get_string("deletingolddata");
+ echo "".get_string("deletingolddata").'';
$status = remove_course_contents($restore->course_id,false) and
delete_dir_contents($CFG->dataroot."/".$restore->course_id,"backupdata");
if ($status) {
@@ -122,7 +122,7 @@
if($status) {
//If we are deleting and bringing into a course or making a new course, same situation
if($restore->restoreto == 0 || $restore->restoreto == 2) {
- echo ''.get_string('creatingblocks');
+ echo ''.get_string('creatingblocks').'';
if (!$status = restore_create_blocks($restore, $info->backup_block_format, $course_header->blockinfo, $xml_file)) {
notify('Error while creating the course blocks');
}
@@ -133,13 +133,13 @@
if ($status) {
//Into new course
if ($restore->restoreto == 2) {
- echo "".get_string("creatingsections");
+ echo "".get_string("creatingsections").'';
if (!$status = restore_create_sections($restore,$xml_file)) {
notify("Error creating sections in the existing course.");
}
//Into existing course
} else if ($restore->restoreto == 0 or $restore->restoreto == 1) {
- echo "".get_string("checkingsections");
+ echo "".get_string("checkingsections").'';
if (!$status = restore_create_sections($restore,$xml_file)) {
notify("Error creating sections in the existing course.");
}
@@ -196,8 +196,8 @@
//Now print information gathered
echo " (".get_string("new").": ".$new_count.", ".get_string("existing").": ".$exists_count.")";
echo "";
- echo "- ".get_string("students").": ".$student_count;
- echo "
- ".get_string("teachers").": ".$teacher_count;
+ echo "
- ".get_string("students").": ".$student_count.'
';
+ echo "- ".get_string("teachers").": ".$teacher_count.'
';
echo "
";
} else {
notify("No users were found!");
@@ -209,7 +209,7 @@
if ($status and $restore->metacourse) {
//Only to new courses!
if ($restore->restoreto == 2) {
- echo "".get_string("creatingmetacoursedata");
+ echo "".get_string("creatingmetacoursedata");
if (!$status = restore_create_metacourse($restore,$xml_file)) {
notify("Error creating metacourse in the course.");
}
@@ -219,15 +219,15 @@
//Now create categories and questions as needed (STEP1)
if ($status and ($restore->mods['quiz']->restore)) {
- echo "".get_string("creatingcategoriesandquestions")."
";
- if (!$status = restore_create_questions($restore,$xml_file)) {
- notify("Could not restore categories and questions!");
- }
+ echo "".get_string("creatingcategoriesandquestions")."";
+ if (!$status = restore_create_questions($restore,$xml_file)) {
+ notify("Could not restore categories and questions!");
+ }
}
//Now create user_files as needed
if ($status and ($restore->user_files)) {
- echo "".get_string("copyinguserfiles")."
";
+ echo "".get_string("copyinguserfiles");
if (!$status = restore_user_files($restore)) {
notify("Could not restore user files!");
}
@@ -236,13 +236,13 @@
//Inform about user dirs created from backup
echo "";
echo "- ".get_string("userzones").": ".$status;
- echo "
";
+ echo "";
}
}
//Now create course files as needed
if ($status and ($restore->course_files)) {
- echo "".get_string("copyingcoursefiles")."
";
+ echo "".get_string("copyingcoursefiles")."";
if (!$status = restore_course_files($restore)) {
notify("Could not restore course files!");
}
@@ -257,7 +257,7 @@
//Now create scales as needed
if ($status) {
- echo "".get_string("creatingscales");
+ echo "".get_string("creatingscales").'';
if (!$status = restore_create_scales($restore,$xml_file)) {
notify("Could not restore custom scales!");
}
@@ -265,7 +265,7 @@
//Now create groups as needed
if ($status) {
- echo "".get_string("creatinggroups");
+ echo "".get_string("creatinggroups").'';
if (!$status = restore_create_groups($restore,$xml_file)) {
notify("Could not restore groups!");
}
@@ -273,7 +273,7 @@
//Now create events as needed
if ($status) {
- echo "".get_string("creatingevents");
+ echo "".get_string("creatingevents").'';
if (!$status = restore_create_events($restore,$xml_file)) {
notify("Could not restore course events!");
}
@@ -289,7 +289,7 @@
//Now create log entries as needed
if ($status and ($restore->logs)) {
- echo "".get_string("creatinglogentries");
+ echo "".get_string("creatinglogentries");
if (!$status = restore_create_logs($restore,$xml_file)) {
notify("Could not restore logs!");
}
@@ -297,7 +297,7 @@
//Now, if all is OK, adjust the instance field in course_modules !!
if ($status) {
- echo "".get_string("checkinginstances");
+ echo "".get_string("checkinginstances").'';
if (!$status = restore_check_instances($restore)) {
notify("Could not adjust instances in course_modules!");
}
@@ -305,7 +305,7 @@
//Now, if all is OK, adjust activity events
if ($status) {
- echo "".get_string("refreshingevents");
+ echo "".get_string("refreshingevents").'';
if (!$status = restore_refresh_events($restore)) {
notify("Could not refresh events for activities!");
}
@@ -323,7 +323,7 @@
// - course modinfo field
// - categories table
if ($status) {
- echo "".get_string("checkingcourse");
+ echo "".get_string("checkingcourse").'';
//modinfo field
rebuild_course_cache($restore->course_id);
//categories table
@@ -333,7 +333,7 @@
//Cleanup temps (files and db)
if ($status) {
- echo "".get_string("cleaningtempdata");
+ echo "".get_string("cleaningtempdata").'';
if (!$status = clean_temp_data ($restore)) {
notify("Could not clean up temporary data from files and database");
}
@@ -344,7 +344,7 @@
//End the main table
- echo "";
+ echo "";
echo "";
if (!$status) {
@@ -354,9 +354,9 @@
if (!$restore->importing) {
echo $output;
//Print final message
- print_simple_box(get_string("restorefinished"),"CENTER");
+ print_simple_box(get_string("restorefinished"),"center");
} else {
- print_simple_box(get_string("importdatafinished"),"CENTER");
+ print_simple_box(get_string("importdatafinished"),"center");
unset($SESSION->restore);
}
print_continue("$CFG->wwwroot/course/view.php?id=".$restore->course_id);
diff --git a/backup/restore_form.html b/backup/restore_form.html
index 625fd91c72e..9b00a176982 100644
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -102,7 +102,7 @@
?>
-