Changes to support xml sections generation.

And convert htmlentities an utf8

diff --git a/backup/backup.php b/backup/backup.php
index 0e4a0374d2e1529465ef04fa822ef1fb34a447e9..6a30ba7019f61e9e041cae99e74f5f25135d59c9 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -31,7 +31,7 @@
 
     //Check site
     if (!$site = get_site()) {
-        error("Site not found!");
+        error("Site noto found!");
     }
     
     //Check backup_version

diff --git a/backup/backup_execute.html b/backup/backup_execute.html
index ec6bbd4d82b4c8e53619814079ba5d6e73cb8813..91a8c46947ffc7325c6090563b1eb76c2f26aa3b 100644 (file)
--- a/backup/backup_execute.html
+++ b/backup/backup_execute.html
@@ -127,18 +127,58 @@
         echo "<li>Writing header";
         //Obtain the xml file (create and open) and print prolog information
         $backup_file = backup_open_xml($backup_unique_code);
-        echo "<li>Writing info";
+        echo "<li>Writing general info";
         //Prints general info about backup to file
         if ($backup_file) {
             $status = backup_general_info($backup_file,$preferences);
         }
+        echo "<li>Writing course data";
 
-    
+        //Start new ul (for course)
+        echo "<ul>";
+
+        echo "<li>Course info";
+        //Prints course start (tag and general info)
+        if ($status) {
+            $status = backup_course_start($backup_file,$preferences);
+        }
+        echo "<li>Sections";
+        //Section info
+        if ($status) {
+            $status = backup_sections($backup_file,$preferences);
+        }
+
+        //Module info
+
+        //User info
+        //if ($status) {
+        //    $status = backup_user_info($backup_file,$preferences);
+        //}
+   
+
+
+
+
+
+
+
+
+
+
+
+ 
+        //Prints course end 
+        if ($status) {
+            $status = backup_course_end($backup_file,$preferences);
+        }
         //Close the xml file and xml data
         if ($backup_file) {
-            $status = backup_close_xml($backup_file);
+            backup_close_xml($backup_file);
         }
 
+        //End course contents (close ul)
+        echo "</ul>";
+
         //End xml contents (close ul)
         echo "</ul>";
     }

diff --git a/backup/backup_version.php b/backup/backup_version.php
index 0f9906e27e4ff0663a02410f34d1bb9edc38b86c..87d42346ebd3461a752faaa1f9ee1759d96311c0 100644 (file)
--- a/backup/backup_version.php
+++ b/backup/backup_version.php
@@ -7,4 +7,4 @@
 
 $backup_version = 2003050401;   // The current version is a date (YYYYMMDDXX)
 
-$backup_release = "0.1.0 beta";  // User-friendly version number
+$backup_release = "0.1.1 alpha";  // User-friendly version number

diff --git a/backup/lib.php b/backup/lib.php
index 49e6b7c0f2ffb94d5d2ea551a929f4aba84cdcff..ad1a54d869a7560c4df840bb671c6595c0f86c36 100644 (file)
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -108,20 +108,23 @@
         global $CFG;
 
         $rootdir = $CFG->dataroot."/users";
-        $coursedirs = get_directory_list($rootdir);
-        foreach ($coursedirs as $dir) {
-            //Extracts user id from file path
-            $tok = strtok($dir,"/");
-            if ($tok) {
-               $userid = $tok;
-            } else {
-               $tok = "";
+        //Check if directory exists
+        if (is_dir($rootdir)) {
+            $coursedirs = get_directory_list($rootdir);
+            foreach ($coursedirs as $dir) {
+                //Extracts user id from file path
+                $tok = strtok($dir,"/");
+                if ($tok) {
+                   $userid = $tok;
+                } else {
+                   $tok = "";
+                }
+                //Insert them into backup_files
+                $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
+                                           (backup_code, file_type, path, old_id)
+                                       VALUES
+                                           ('$backup_unique_code','user','$dir','$userid')",false);
             }
-            //Insert them into backup_files
-           $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
-                                      (backup_code, file_type, path, old_id)
-                                  VALUES
-                                      ('$backup_unique_code','user','$dir','$userid')",false);
         }
 
         //Now execute the select
@@ -149,13 +152,16 @@
         global $CFG;
 
         $rootdir = $CFG->dataroot."/$course";
-        $coursedirs = get_directory_list($rootdir,$CFG->moddata);
-        foreach ($coursedirs as $dir) {
-            //Insert them into backup_files
-           $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
-                                      (backup_code, file_type, path)
-                                  VALUES
-                                      ('$backup_unique_code','course','$dir')",false);
+        //Check if directory exists
+        if (is_dir($rootdir)) {
+            $coursedirs = get_directory_list($rootdir,$CFG->moddata);
+            foreach ($coursedirs as $dir) {
+                //Insert them into backup_files
+               $status = execute_sql("INSERT INTO {$CFG->prefix}backup_files
+                                              (backup_code, file_type, path)
+                                       VALUES
+                                          ('$backup_unique_code','course','$dir')",false);
+            }
         }
 
         //Now execute the select
@@ -352,9 +358,9 @@
         $st = start_tag($tag,$level,$endline);
         $co="";
         if ($to_utf) {
-            $co = $content;
+            $co = utf8_encode(htmlspecialchars($content));
         } else {
-            $co = $content;
+            $co = htmlspecialchars($content);
         }
         $et = end_tag($tag,0,true);
         return $st.$co.$et;
@@ -402,9 +408,9 @@
         }
         //The user in backup
         if ($preferences->backup_users == 1) {
-            fwrite ($bf,full_tag("USERS",3,false,"COURSE"));
+            fwrite ($bf,full_tag("USERS",3,false,"course"));
         } else {
-            fwrite ($bf,full_tag("USERS",3,false,"ALL"));
+            fwrite ($bf,full_tag("USERS",3,false,"all"));
         }
         //The logs in backup
         if ($preferences->backup_logs == 1) {
@@ -428,6 +434,105 @@
         fwrite ($bf,end_tag("DETAILS",2,true));
 
 
-        fwrite ($bf,end_tag("INFO",1,true)); 
+        $status = fwrite ($bf,end_tag("INFO",1,true)); 
+
+        return $status;
+    }
+    
+    //Prints course's general info (table course)
+    function backup_course_start ($bf,$preferences) {
+
+        global $CFG;
+
+        $status = true;
+        
+        //Course open tag
+        fwrite ($bf,start_tag("COURSE",1,true));
+
+        //Get info from course
+        $course=false;
+        if ($courses = get_records("course","id",$preferences->backup_course)) {
+            $course = $courses[$preferences->backup_course];
+        }
+        if ($course) {
+            //Prints course info
+            fwrite ($bf,full_tag("ID",2,false,$course->id));
+            //Obtain the category
+            $category = false;
+            if ($categories = get_records("course_categories","id","$course->category")) {
+                $category = $categories[$course->category];
+            }
+            if ($category) {
+                //Prints category info
+                fwrite ($bf,start_tag("CATEGORY",2,true));
+                fwrite ($bf,full_tag("ID",3,false,$course->category));
+                fwrite ($bf,full_tag("NAME",3,false,$category->name));
+                fwrite ($bf,end_tag("CATEGORY",2,true));
+            }
+            //Continues with the course
+            fwrite ($bf,full_tag("PASSWORD",2,false,$course->password));
+            fwrite ($bf,full_tag("FULLNAME",2,false,$course->fullname));
+            fwrite ($bf,full_tag("SHORTNAME",2,false,$course->shortname));
+            fwrite ($bf,full_tag("SUMMARY",2,false,$course->summary));
+            fwrite ($bf,full_tag("FORMAT",2,false,$course->format));
+            fwrite ($bf,full_tag("NEWSITEMS",2,false,$course->newsitems));
+            fwrite ($bf,full_tag("TEACHER",2,false,$course->teacher));
+            fwrite ($bf,full_tag("TEACHERS",2,false,$course->teachers));
+            fwrite ($bf,full_tag("STUDENT",2,false,$course->student));
+            fwrite ($bf,full_tag("STUDENTS",2,false,$course->students));
+            fwrite ($bf,full_tag("GUEST",2,false,$course->guest));
+            fwrite ($bf,full_tag("STARDATE",2,false,$course->stardate));
+            fwrite ($bf,full_tag("NUMSECTIONS",2,false,$course->numsections));
+            fwrite ($bf,full_tag("SHOWRECENT",2,false,$course->showrecent));
+            fwrite ($bf,full_tag("MARKER",2,false,$course->marker));
+            fwrite ($bf,full_tag("TIMECREATED",2,false,$course->timecreated));
+            $status = fwrite ($bf,full_tag("TIMEMODIFIED",2,false,$course->timemodified));
+        } else { 
+           $status = false;
+        } 
+
+       return $status;
+    }
+
+    //Prints course's end tag
+    function backup_course_end ($bf,$preferences) {
+
+        //Course end tag
+        $status = fwrite ($bf,end_tag("COURSE",1,true)); 
+    
+        return $status;
+
+    }
+
+    //Prints course's sections info (table course_sections)
+    function backup_sections ($bf,$preferences) {
+
+        global $CFG;
+
+        $status = true;
+
+
+        //Get info from sections
+        $section=false;
+        if ($sections = get_records("course_sections","course",$preferences->backup_course,"section")) {
+            //Section open tag
+            fwrite ($bf,start_tag("SECTIONS",2,true));
+            //Iterate over every section (ordered by section)     
+            foreach ($sections as $section) {
+                //Begin Section
+                fwrite ($bf,start_tag("SECTION",3,true));
+                fwrite ($bf,full_tag("ID",4,false,$section->id));
+                fwrite ($bf,full_tag("NUMBER",4,false,$section->section));
+                fwrite ($bf,full_tag("SUMMARY",4,false,$section->summary));
+                fwrite ($bf,full_tag("VISIBLE",4,false,$section->visible));
+                //End section
+                fwrite ($bf,start_tag("/SECTION",3,true));
+            }
+            //Section close tag
+            $status = fwrite ($bf,end_tag("SECTIONS",2,true));
+        }
+
+        return $status;
+
     }
 ?>