Some minor changes to each module to XHTMLise the restore process

diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index 269ad1a2707b752038fd008ebb7bfb541e3dd98a..a858ec89e6472cb5ec78d1121133c392ab2b0672 100644 (file)
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -63,7 +63,7 @@
             $newid = insert_record ("assignment",$assignment);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","assignment")." \"".$assignment->name."\"<br />";
+            echo "<li>".get_string("modulename","assignment")." \"".$assignment->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -78,10 +78,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-        
         } else {
             $status = false;
         }

diff --git a/mod/attendance/restorelib.php b/mod/attendance/restorelib.php
index 9920f4bf001dbaa5a7657cf5fc3555a5cdb1c937..316c5c8ff0ef02c35a0fd245b5d6aad5975d950e 100644 (file)
--- a/mod/attendance/restorelib.php
+++ b/mod/attendance/restorelib.php
@@ -54,7 +54,7 @@
             $newid = insert_record ("attendance",$attendance);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","attendance")." \"".$attendance->name."\"<br />";
+            echo "<li>".get_string("modulename","attendance")." \"".$attendance->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -69,10 +69,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php
index 5500b5221497ed9e3b6a59cabcb78525a91e993a..2aba8d79c91a04cb957815cd8b3ff3abf15148b1 100644 (file)
--- a/mod/chat/restorelib.php
+++ b/mod/chat/restorelib.php
@@ -52,7 +52,7 @@
             $newid = insert_record ("chat",$chat);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","chat")." \"".$chat->name."\"<br />";
+            echo "<li>".get_string("modulename","chat")." \"".$chat->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -67,10 +67,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-        
         } else {
             $status = false;
         }

diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php
index c40ba25b3a0505f00d6efdafbf7a56522f2d4490..57e9b382cef902b31af13729241db6f645d71b06 100644 (file)
--- a/mod/choice/restorelib.php
+++ b/mod/choice/restorelib.php
@@ -78,7 +78,7 @@
             $newid = insert_record ("choice",$choice);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","choice")." \"".$choice->name."\"<br />";
+            echo "<li>".get_string("modulename","choice")." \"".$choice->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -93,10 +93,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/dialogue/restorelib.php b/mod/dialogue/restorelib.php
index b5e6f124601ada8c442fd69bff0124d9a351d61d..24133021b3e992c62c068e7e5afd5f78486f1a8e 100644 (file)
--- a/mod/dialogue/restorelib.php
+++ b/mod/dialogue/restorelib.php
@@ -57,7 +57,7 @@
             $newid = insert_record ("dialogue",$dialogue);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","dialogue")." \"".$dialogue->name."\"<br />";
+            echo "<li>".get_string("modulename","dialogue")." \"".$dialogue->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -72,10 +72,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/exercise/restorelib.php b/mod/exercise/restorelib.php
index f9bb3673ed153f3df657855d9e813db78ec20364..2b21cd0df1e9e1ee0089c8f89cf5761c60178791 100644 (file)
--- a/mod/exercise/restorelib.php
+++ b/mod/exercise/restorelib.php
@@ -75,7 +75,7 @@
             $newid = insert_record ("exercise",$exercise);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","exercise")." \"".$exercise->name."\"<br />";
+            echo "<li>".get_string("modulename","exercise")." \"".$exercise->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -89,10 +89,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-        
         } else {
             $status = false;
         }

diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index a6cc0379346c41494e94e801bd6a2ee9d14f0cf6..dbe06736dbe26abbb4f2c12a83c0e99bdb97a242 100644 (file)
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -90,7 +90,7 @@
             }
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","forum")." \"".$forum->name."\"<br />";
+            echo "<li>".get_string("modulename","forum")." \"".$forum->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -109,10 +109,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }
@@ -846,7 +842,7 @@
 
         //Check we are restoring forums
         if ($restore->mods['forum']->restore == 1) {
-            echo "<li>".get_string("from")." ".get_string("modulenameplural","forum");
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","forum").'</li>';
             //Get all course posts
             if ($posts = get_records_sql ("SELECT p.id, p.message
                                        FROM {$CFG->prefix}forum_posts p,
@@ -919,7 +915,7 @@
 
         //Check we are restoring resources
         if ($restore->mods['resource']->restore == 1) {
-            echo "<li>".get_string("from")." ".get_string("modulenameplural","resource");
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","resource").'</li>';
             //Get all course resources
             if ($resources = get_records_sql ("SELECT r.id, r.alltext
                                        FROM {$CFG->prefix}resource r

diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php
index 0aa14209316ba23c8aec467761aa3096c493f712..a9b392d5d408c828d3ac5b77e048a79a49ba9c66 100644 (file)
--- a/mod/glossary/restorelib.php
+++ b/mod/glossary/restorelib.php
@@ -113,7 +113,7 @@
             $newid = insert_record ("glossary",$glossary);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","glossary")." \"".$glossary->name."\"<br />";
+            echo "<li>".get_string("modulename","glossary")." \"".$glossary->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -127,10 +127,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/journal/restorelib.php b/mod/journal/restorelib.php
index 4cc4a1d02ff4cfbc527408a9945c3b4bcc20614d..fba290aecd8138afc08f221f39e09677ce8bfff6 100644 (file)
--- a/mod/journal/restorelib.php
+++ b/mod/journal/restorelib.php
@@ -59,7 +59,7 @@
             $newid = insert_record ("journal",$journal);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","journal")." \"".$journal->name."\"<br />";
+            echo "<li>".get_string("modulename","journal")." \"".$journal->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -74,10 +74,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php
index 342536189b0bc5f8901902cee4e4bdd257d3e42b..450efdf04db802db8d77d13d709fceee1090f478 100644 (file)
--- a/mod/label/restorelib.php
+++ b/mod/label/restorelib.php
@@ -43,7 +43,7 @@
             $newid = insert_record ("label",$label);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","label")." \"".$label->name."\"<br />";
+            echo "<li>".get_string("modulename","label")." \"".$label->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -54,10 +54,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
index d3d9378e67609d656a7cc4b06e7bc5a957e9e21d..3bda5cf4bfc9c0a83f43ccc016692bb10a0cf110 100644 (file)
--- a/mod/lesson/restorelib.php
+++ b/mod/lesson/restorelib.php
@@ -87,7 +87,7 @@
             $newid = insert_record("lesson", $lesson);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","lesson")." \"".$lesson->name."\"<br>";
+            echo "<li>".get_string("modulename","lesson")." \"".$lesson->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -119,10 +119,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 6535318ae1f1153f8df71063e6c204223f62d277..55d205e3a3fa2224953f857beb93ac489ec8bb17 100644 (file)
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -269,10 +269,10 @@
 
             //Do some output
             if ($status) {
-                echo "<ul><li>".get_string("category")." \"".$quiz_cat->name."\"<br />";
+                echo "<li>".get_string("category")." \"".$quiz_cat->name."\"</li>";
             } else {
                 //We must never arrive here !!
-                echo "<ul><li>".get_string("category")." \"".$quiz_cat->name."\" Error!<br />";
+                echo "<li>".get_string("category")." \"".$quiz_cat->name."\" Error!</li>";
             }
             backup_flush(300);
 
@@ -286,10 +286,6 @@
             } else {
                 $status = false;
             }
-            
-
-            //Finalize ul
-            echo "</ul>";
         }
 
         return $status;
@@ -1350,7 +1346,7 @@
             $newid = insert_record ("quiz",$quiz);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","quiz")." \"".$quiz->name."\"<br />";
+            echo "<li>".get_string("modulename","quiz")." \"".$quiz->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -1371,10 +1367,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php
index c063b1068c84275fc7e6250a34f4857de6f76ea3..19c328d955ac2f3498676e9267aef65500b54a85 100644 (file)
--- a/mod/resource/restorelib.php
+++ b/mod/resource/restorelib.php
@@ -82,7 +82,7 @@
             $newid = insert_record ("resource",$resource);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","resource")." \"".$resource->name."\"<br />";
+            echo "<li>".get_string("modulename","resource")." \"".$resource->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -93,10 +93,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-
         } else {
             $status = false;
         }
@@ -184,7 +180,7 @@
 
         //Check we are restoring assignments
         if ($restore->mods['assignment']->restore == 1) {
-            echo "<li>".get_string("from")." ".get_string("modulenameplural","assignment");
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","assignment").'</li>';
             //Get all course assignments
             if ($assignments = get_records_sql ("SELECT a.id, a.description
                                        FROM {$CFG->prefix}assignment a
@@ -220,7 +216,7 @@
 
         //Check we are restoring forums
         if ($restore->mods['forum']->restore == 1) {
-            echo "<li>".get_string("from")." ".get_string("modulenameplural","forum");
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","forum").'</li>';
             //Get all course posts
             if ($posts = get_records_sql ("SELECT p.id, p.message
                                        FROM {$CFG->prefix}forum_posts p,
@@ -293,7 +289,7 @@
 
         //Check we are restoring resources
         if ($restore->mods['resource']->restore == 1) {
-            echo "<li>".get_string("from")." ".get_string("modulenameplural","resource");
+            echo "<li>".get_string("from")." ".get_string("modulenameplural","resource").'</li>';
             //Get all course resources
             if ($resources = get_records_sql ("SELECT r.id, r.alltext
                                        FROM {$CFG->prefix}resource r

diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php
index 672d4cd656133c159a49ff245f849e0e8e7b759a..1aaeeeba9d96be8f8214b35dbf78024aea3432e2 100755 (executable)
--- a/mod/scorm/restorelib.php
+++ b/mod/scorm/restorelib.php
@@ -59,7 +59,7 @@
             //The structure is equal to the db, so insert the scorm
             $newid = insert_record ("scorm",$scorm);
             //Do some output     
-            echo "<ul><li>".get_string("modulename","scorm")." \"".$scorm->name."\"<br />";
+            echo "<li>".get_string("modulename","scorm")." \"".$scorm->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -82,10 +82,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php
index 5715a0e3d2ee2f107ba5d219ef7b1246f21c3466..8e343bac40b641bebcbdb8db9ad74eecb9dbe52e 100644 (file)
--- a/mod/survey/restorelib.php
+++ b/mod/survey/restorelib.php
@@ -53,7 +53,7 @@
             $newid = insert_record ("survey",$survey);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","survey")." \"".$survey->name."\"<br />";
+            echo "<li>".get_string("modulename","survey")." \"".$survey->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -72,10 +72,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php
index 4a4505599642e41ee75200fe999ffa96567b775d..b0c88f4964b05603728187fb80973bb69493d272 100644 (file)
--- a/mod/wiki/restorelib.php
+++ b/mod/wiki/restorelib.php
@@ -55,7 +55,7 @@
             $newid = insert_record ("wiki",$wiki);
 
             //Do some output
-            echo "<ul><li>".get_string("modulename","wiki")." \"".$wiki->name."\"<br />";
+            echo "<li>".get_string("modulename","wiki")." \"".$wiki->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -67,10 +67,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul
-            echo "</ul>";
-
         } else {
             $status = false;
         }

diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php
index 3c5a29962646b8b39392576b16695fe4d24b5947..318d981757aa4374bd8c8647dfbce55659ef6c53 100644 (file)
--- a/mod/workshop/restorelib.php
+++ b/mod/workshop/restorelib.php
@@ -89,7 +89,7 @@
             $newid = insert_record ("workshop",$workshop);
 
             //Do some output     
-            echo "<ul><li>".get_string("modulename","workshop")." \"".$workshop->name."\"<br />";
+            echo "<li>".get_string("modulename","workshop")." \"".$workshop->name."\"</li>";
             backup_flush(300);
 
             if ($newid) {
@@ -106,10 +106,6 @@
             } else {
                 $status = false;
             }
-
-            //Finalize ul        
-            echo "</ul>";
-        
         } else {
             $status = false;
         }