From e09087bc76e8a419296f6c4134f7571fe99b0e52 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Mon, 7 Feb 2005 23:33:17 +0000
Subject: [PATCH] Some minor changes to each module to XHTMLise the restore
 process

---
 mod/assignment/restorelib.php |  6 +-----
 mod/attendance/restorelib.php |  6 +-----
 mod/chat/restorelib.php       |  6 +-----
 mod/choice/restorelib.php     |  6 +-----
 mod/dialogue/restorelib.php   |  6 +-----
 mod/exercise/restorelib.php   |  6 +-----
 mod/forum/restorelib.php      | 10 +++-------
 mod/glossary/restorelib.php   |  6 +-----
 mod/journal/restorelib.php    |  6 +-----
 mod/label/restorelib.php      |  6 +-----
 mod/lesson/restorelib.php     |  6 +-----
 mod/quiz/restorelib.php       | 14 +++-----------
 mod/resource/restorelib.php   | 12 ++++--------
 mod/scorm/restorelib.php      |  6 +-----
 mod/survey/restorelib.php     |  6 +-----
 mod/wiki/restorelib.php       |  6 +-----
 mod/workshop/restorelib.php   |  6 +-----
 17 files changed, 24 insertions(+), 96 deletions(-)

diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index 269ad1a270..a858ec89e6 100644
--- 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 9920f4bf00..316c5c8ff0 100644
--- 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 5500b52214..2aba8d79c9 100644
--- 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 c40ba25b3a..57e9b382ce 100644
--- 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 b5e6f12460..24133021b3 100644
--- 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 f9bb3673ed..2b21cd0df1 100644
--- 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 a6cc037934..dbe06736db 100644
--- 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 0aa1420931..a9b392d5d4 100644
--- 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 4cc4a1d02f..fba290aecd 100644
--- 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 342536189b..450efdf04d 100644
--- 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 d3d9378e67..3bda5cf4bf 100644
--- 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 6535318ae1..55d205e3a3 100644
--- 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 c063b1068c..19c328d955 100644
--- 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 672d4cd656..1aaeeeba9d 100755
--- 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 5715a0e3d2..8e343bac40 100644
--- 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 4a45055996..b0c88f4964 100644
--- 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 3c5a299626..318d981757 100644
--- 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;
         }
-- 
2.39.5