From eb87ac71c555e83826eb8712ea7a489cde940784 Mon Sep 17 00:00:00 2001 From: thompson697 Date: Wed, 4 Oct 2006 14:50:50 +0000 Subject: [PATCH] Change creation of restorelog file location to protected backupdata folder. Reassign style and language links --- .cvsignore | 3 +++ backup/restorelib.php | 40 +++++++++++++++++++++-------------- mod/assignment/restorelib.php | 7 +++--- mod/chat/restorelib.php | 9 ++++---- mod/choice/restorelib.php | 7 +++--- mod/data/restorelib.php | 7 +++--- mod/exercise/restorelib.php | 7 +++--- mod/forum/restorelib.php | 15 ++++++------- mod/glossary/restorelib.php | 7 +++--- mod/hotpot/index.php | 4 ++-- mod/hotpot/restorelib.php | 4 ++-- mod/journal/restorelib.php | 14 ++++++------ mod/lesson/restorelib.php | 7 +++--- mod/quiz/restorelib.php | 7 +++--- mod/quiz/restorelibpre15.php | 7 +++--- mod/wiki/restorelib.php | 14 ++++++------ mod/workshop/restorelib.php | 14 ++++++------ 17 files changed, 83 insertions(+), 90 deletions(-) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000000..61f5bb8bf8 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,3 @@ +Copy of .project +config.php +.project diff --git a/backup/restorelib.php b/backup/restorelib.php index dbea6d03be..32e7f7b5a0 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -2201,12 +2201,10 @@ //Get admin->id for later use $admin = get_admin(); $adminid = $admin->id; - - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, we check the course_id backup data folder exists + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); - + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //Now, if we have anything in events, we have to restore that //events if ($events) { @@ -5441,7 +5439,7 @@ } if ($status = restore_open_html($restore,$course_header)){ - echo "
  • Creating the Restorelog.html in the course Files folder
  • "; + echo "
  • Creating the Restorelog.html in the course backup folder
  • "; } } else { @@ -5942,16 +5940,27 @@ $status = true; //Open file for writing - //First, we check the "course_id" folder exists and create it as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, we check the course_id backup data folder exists and create it as necessary in CFG->dataroot + if (!$dest_dir = make_upload_directory("$restore->course_id/backupdata")) { // Backup folder + error("Could not create backupdata folder. The site administrator needs to fix the file permissions"); + } $status = check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); + //Add the stylesheet + $stylesheetshtml = ''; + foreach ($CFG->stylesheets as $stylesheet) { + $stylesheetshtml .= ''."\n"; + } + ///Accessibility: added the 'lang' attribute to $direction, used in theme tag. + $language = str_replace('_utf8','',$CFG->lang); + $languagehtml = ''; + $languagehtml .= ' lang="'.$language.'" xml:lang="'.$language.'"'; //Write the header in the new logging file fwrite ($restorelog_file," "); - fwrite ($restorelog_file,""); - fwrite ($restorelog_file,""); + fwrite ($restorelog_file,""); + fwrite ($restorelog_file,$stylesheetshtml); fwrite ($restorelog_file,"".$course_header->course_shortname." Restored "); fwrite ($restorelog_file,"

    The following changes were made during the Restoration of this Course.



    "); fwrite ($restorelog_file,"The Course ShortName is now - ".$course_header->course_shortname." The FullName is now - ".$course_header->course_fullname."

    "); @@ -5976,11 +5985,10 @@ $status = true; //Open file for writing - //First, check that "course_id" folder exists - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check that course_id/backupdata folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; $status = check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //Write the footer to close the logging file fwrite ($restorelog_file,"
    This file was written to directly by each modules restore process."); fwrite ($restorelog_file,"

    Log complete."); diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php index 3307f95d78..4fa35e45c7 100644 --- a/mod/assignment/restorelib.php +++ b/mod/assignment/restorelib.php @@ -34,11 +34,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php index 6e95d28b8b..9435a45588 100644 --- a/mod/chat/restorelib.php +++ b/mod/chat/restorelib.php @@ -33,12 +33,11 @@ if ($data) { //Now get completed xmlized object - $info = $data->info; - //First, we check to "course_id" exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + $info = $data->info; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php index 92bd5fa5b7..6ba8c7cb44 100644 --- a/mod/choice/restorelib.php +++ b/mod/choice/restorelib.php @@ -39,11 +39,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/data/restorelib.php b/mod/data/restorelib.php index ddefa21520..54f1c3c593 100644 --- a/mod/data/restorelib.php +++ b/mod/data/restorelib.php @@ -47,11 +47,10 @@ function data_restore_mods($mod,$restore) { if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/exercise/restorelib.php b/mod/exercise/restorelib.php index 4ea561ffe5..eee4c9ab7c 100644 --- a/mod/exercise/restorelib.php +++ b/mod/exercise/restorelib.php @@ -49,11 +49,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php index c0d8c17813..b8a5fcbd4e 100644 --- a/mod/forum/restorelib.php +++ b/mod/forum/restorelib.php @@ -44,11 +44,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug @@ -271,12 +270,10 @@ if (!empty($info['MOD']['#']['DISCUSSIONS']['0']['#']['DISCUSSION'])) { $discussions = $info['MOD']['#']['DISCUSSIONS']['0']['#']['DISCUSSION']; } - - //First, we check that "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //Iterate over discussions for($i = 0; $i < sizeof($discussions); $i++) { $dis_info = $discussions[$i]; diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php index d6ccd0ab49..a1c9467827 100644 --- a/mod/glossary/restorelib.php +++ b/mod/glossary/restorelib.php @@ -41,11 +41,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php index c1eb4a6e8b..f51a89f72b 100644 --- a/mod/hotpot/index.php +++ b/mod/hotpot/index.php @@ -252,8 +252,8 @@ // so this operation could be done after getting the $totals from the attempts table } $totals = get_records_sql("SELECT $fields FROM $tables WHERE $select GROUP BY a.hotpot"); - - if (ihas_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID)) && empty($usejoin)) { +//remove i here ihas_capability + if (has_capability('mod/hotpot:grade', get_context_instance(CONTEXT_SYSTEM, SITEID)) && empty($usejoin)) { foreach ($hotpots as $hotpot) { $totals[$hotpot->id]->detailcount = 0; if ($ids = get_records('hotpot_attempts', 'hotpot', $hotpot->id)) { diff --git a/mod/hotpot/restorelib.php b/mod/hotpot/restorelib.php index cdd04c2e7b..5f79d481d4 100644 --- a/mod/hotpot/restorelib.php +++ b/mod/hotpot/restorelib.php @@ -110,8 +110,8 @@ function hotpot_restore_mods($mod, $restore) { // if necessary, adjust HotPot date/time fields and write to restorelog if (!empty($restore->course_startdateoffset)) { - // check course_directory exists - $course_dir = "$CFG->dataroot/$restore->course_id"; + // check course backup data directory exists + $course_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($course_dir, true); // open $restorelog and start output for this HotPot diff --git a/mod/journal/restorelib.php b/mod/journal/restorelib.php index 0849e0190b..a8eb0276cb 100644 --- a/mod/journal/restorelib.php +++ b/mod/journal/restorelib.php @@ -34,11 +34,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug @@ -104,11 +103,10 @@ //Get the entries array $entries = $info['MOD']['#']['ENTRIES']['0']['#']['ENTRY']; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //Iterate over entries for($i = 0; $i < sizeof($entries); $i++) { $entry_info = $entries[$i]; diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php index f7db37dcf6..4e29bc5c85 100644 --- a/mod/lesson/restorelib.php +++ b/mod/lesson/restorelib.php @@ -51,11 +51,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php index 9a133b9386..d0d973c54f 100644 --- a/mod/quiz/restorelib.php +++ b/mod/quiz/restorelib.php @@ -54,11 +54,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/quiz/restorelibpre15.php b/mod/quiz/restorelibpre15.php index b87d7d889c..239ecea026 100644 --- a/mod/quiz/restorelibpre15.php +++ b/mod/quiz/restorelibpre15.php @@ -1226,11 +1226,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php index 71224176a1..734a27f59d 100644 --- a/mod/wiki/restorelib.php +++ b/mod/wiki/restorelib.php @@ -34,11 +34,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug @@ -103,11 +102,10 @@ //Get the entries array $entries = $info['MOD']['#']['ENTRIES']['0']['#']['ENTRY']; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //Iterate over entries for($i = 0; $i < sizeof($entries); $i++) { $ent_info = $entries[$i]; diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php index f8670e392e..edf66fbf92 100644 --- a/mod/workshop/restorelib.php +++ b/mod/workshop/restorelib.php @@ -48,11 +48,10 @@ if ($data) { //Now get completed xmlized object $info = $data->info; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //traverse_xmlize($info); //Debug //print_object ($GLOBALS['traverse_array']); //Debug //$GLOBALS['traverse_array']=""; //Debug @@ -352,11 +351,10 @@ //Get the submissions array $submissions = $info['MOD']['#']['SUBMISSIONS']['0']['#']['SUBMISSION']; - //First, we check to "course_id" folder exists and create is as necessary in CFG->dataroot - $dest_dir = $CFG->dataroot."/".$restore->course_id; + //First, we check the course_id backup folder exists in CFG->dataroot + $dest_dir = $CFG->dataroot."/".$restore->course_id."/backupdata"; check_dir_exists($dest_dir,true); - $file = $dest_dir."/restorelog.html"; - $restorelog_file = fopen($file,"a"); + $restorelog_file = fopen("$dest_dir/restorelog.html","a"); //Iterate over submissions for($i = 0; $i < sizeof($submissions); $i++) { $sub_info = $submissions[$i]; -- 2.39.5