]> git.mjollnir.org Git - moodle.git/commitdiff
Change creation of restorelog file location to protected backupdata folder.
authorthompson697 <thompson697>
Wed, 4 Oct 2006 14:50:50 +0000 (14:50 +0000)
committerthompson697 <thompson697>
Wed, 4 Oct 2006 14:50:50 +0000 (14:50 +0000)
Reassign style and language links

17 files changed:
.cvsignore [new file with mode: 0644]
backup/restorelib.php
mod/assignment/restorelib.php
mod/chat/restorelib.php
mod/choice/restorelib.php
mod/data/restorelib.php
mod/exercise/restorelib.php
mod/forum/restorelib.php
mod/glossary/restorelib.php
mod/hotpot/index.php
mod/hotpot/restorelib.php
mod/journal/restorelib.php
mod/lesson/restorelib.php
mod/quiz/restorelib.php
mod/quiz/restorelibpre15.php
mod/wiki/restorelib.php
mod/workshop/restorelib.php

diff --git a/.cvsignore b/.cvsignore
new file mode 100644 (file)
index 0000000..61f5bb8
--- /dev/null
@@ -0,0 +1,3 @@
+Copy of .project
+config.php
+.project
index dbea6d03beb5444f398a6df6bc894e5e5701c41e..32e7f7b5a03168a100ceea8cf48baaa2076ccd82 100644 (file)
         //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) {
             }
 
             if ($status = restore_open_html($restore,$course_header)){
-                echo "<li>Creating the Restorelog.html in the course Files folder</li>";
+                echo "<li>Creating the Restorelog.html in the course backup folder</li>";
             }
 
         } else {
         $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 .= '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'" />'."\n";
+        }
+        ///Accessibility: added the 'lang' attribute to $direction, used in theme <html> 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,"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"");
         fwrite ($restorelog_file," \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">  ");
-        fwrite ($restorelog_file,"<html dir=\"ltr\" lang=\"en\" xml:lang=\"en\">");
-        fwrite ($restorelog_file,"<head><link rel=\"stylesheet\" type=\"text/css\" href=\"http://at4737.vledev.open.ac.uk/moodle/theme/standard/styles.php\" />");
+        fwrite ($restorelog_file,"<html dir=\"ltr\".$languagehtml.");
+        fwrite ($restorelog_file,"<head>");
+        fwrite ($restorelog_file,$stylesheetshtml);        
         fwrite ($restorelog_file,"<title>".$course_header->course_shortname." Restored </title>");
         fwrite ($restorelog_file,"</head><body><br><h1>The following changes were made during the Restoration of this Course.</h1><br><br>");
         fwrite ($restorelog_file,"The Course ShortName is now - ".$course_header->course_shortname." The FullName is now - ".$course_header->course_fullname."<br><br>");
         $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,"<br>This file was written to directly by each modules restore process.");
         fwrite ($restorelog_file,"<br><br>Log complete.</body></html>");
index 3307f95d78ae6743b893d21eab680da706e216b8..4fa35e45c7a5550c6d687ba4f896e46ae77a086a 100644 (file)
         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
index 6e95d28b8b7e51eda11124276e5c5674daa700df..9435a455884f040818edec160b8a02faf4266425 100644 (file)
 
         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
index 92bd5fa5b776136e944cf7903ec68b2ce773ca56..6ba8c7cb449f54bf134fd9909290a10d6bc8e414 100644 (file)
         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
index ddefa21520e80be4e9c987b72b7208c7740eb223..54f1c3c5935b5b37e0457a11d23b9fe2c80c0b1c 100644 (file)
@@ -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
index 4ea561ffe5544377d2266dfe4422ad1fff0c4c77..eee4c9ab7c502507b698f5ccb1dd96f81b6974ca 100644 (file)
         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
index c0d8c178133bdf0dd05727953e1ffa8fdc835dc3..b8a5fcbd4e26eb0953b1f0772bfe4068b7b60599 100644 (file)
         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
         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];
index d6ccd0ab4988b2dc982b8aef3c814b99c8fdb0f3..a1c9467827b35faacd6882fe29526c38b885ee3c 100644 (file)
         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
index c1eb4a6e8b2db649259218d9a9980a809a02d348..f51a89f72b45cc97afa92c36382c86530eb9f6d4 100644 (file)
         // 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)) {
index cdd04c2e7bb0dbcfdd649805bb5afaa48589cd4a..5f79d481d40969ce3f4bbcb64c2f38c8a8b54fca 100644 (file)
@@ -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
index 0849e0190b7496c04c99392b981d5f004bf4908c..a8eb0276cb69a2f4683ac6ce4ad72165cd1c4e86 100644 (file)
         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
 
         //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];
index f7db37dcf62628c27bab8e0542bf2e43eeb49546..4e29bc5c850137db14eccc831de40c4b5ad70a6d 100644 (file)
         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
index 9a133b938628fedbe94a873bc11642f8f3e72161..d0d973c54f420f6c1a39dac031907430f6878bab 100644 (file)
         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
index b87d7d889c75aacae87ef80ba890ce66b0fff92b..239ecea0265aeee3d71151877f5efc17fbd02e20 100644 (file)
         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
index 71224176a14ec216db7548e17dbbae34dcd12d71..734a27f59da5df1deaab702f0dfa2512cea2635f 100644 (file)
         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
 
         //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];
index f8670e392e34d681467805247a4a7facf28e8fcb..edf66fbf9282746f971a80991ff75cf4a0d72545 100644 (file)
         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
 
         //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];