Now lesson->name supports filterall

moodle · Apr 24, 2005 · 0a2c259 · 0a2c259
1 parent 1681c80
commit 0a2c259
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 34 deletions.
diff --git a/mod/lesson/import.php b/mod/lesson/import.php
@@ -30,7 +30,7 @@
     $strlessons = get_string("modulenameplural", "lesson");
 
     print_header_simple("$strimportquestions", " $strimportquestions",
-                 "<A HREF=index.php?id=$course->id>$strlessons</A> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>-> $strimportquestions");
+                 "<a href=index.php?id=$course->id>$strlessons</a> -> <a href=\"view.php?id=$cm->id\">".format_string($lesson->name,true)."</a>-> $strimportquestions");
 
     if ($form = data_submitted()) {   /// Filename
 

diff --git a/mod/lesson/index.php b/mod/lesson/index.php
@@ -61,10 +61,10 @@
     foreach ($lessons as $lesson) {
         if (!$lesson->visible) {
             //Show dimmed if the mod is hidden
-            $link = "<A class=\"dimmed\" HREF=\"view.php?id=$lesson->coursemodule\">$lesson->name</A>";
+            $link = "<a class=\"dimmed\" href=\"view.php?id=$lesson->coursemodule\">".format_string($lesson->name,true)."</a>";
         } else {
             //Show normal if the mod is visible
-            $link = "<A HREF=\"view.php?id=$lesson->coursemodule\">$lesson->name</A>";
+            $link = "<a href=\"view.php?id=$lesson->coursemodule\">".format_string($lesson->name,true)."</a>";
         }
 
         if ($lesson->deadline > $timenow) {

diff --git a/mod/lesson/lesson.php b/mod/lesson/lesson.php
@@ -53,9 +53,9 @@
     $strlessonname = $lesson->name;
 
     // ... print the header and...
-    print_header("$course->shortname: $lesson->name", "$course->fullname",
+    print_header("$course->shortname: ".format_string($lesson->name), "$course->fullname",
                  "$navigation <a href=index.php?id=$course->id>$strlessons</a> -> 
-                  <a href=\"view.php?id=$cm->id\">$lesson->name</a>", "", "", true);
+                  <a href=\"view.php?id=$cm->id\">".format_string($lesson->name,true)."</a>", "", "", true);
 
 	// include the appropriate action (check to make sure the file is there first)
 	if (file_exists($CFG->dirroot.'/mod/lesson/action/'.$action.'.php')) {

diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
@@ -173,24 +173,24 @@ function lesson_update_instance($lesson) {
         if ($userid = get_field("user", "id", "username", $lesson->deleteattempts)) {
             if (delete_records("lesson_attempts", "lessonid", $lesson->id, "userid", $userid)) {
                 // email good
-                $message .= "Successfully deleted attempts from \"$lesson->name\" lesson!<br />";
+                $message .= "Successfully deleted attempts from \"".format_string($lesson->name)."\" lesson!<br />";
             } else {
                 // email couldnt delete
-                $message .= "Failed to delete attempts from \"$lesson->name\" lesson!<br />";
+                $message .= "Failed to delete attempts from \"".format_string($lesson->name)."\" lesson!<br />";
             }
             if (delete_records("lesson_grades", "lessonid", $lesson->id, "userid", $userid)) {
                 // email good
-                $message .= "Successfully deleted grades from \"$lesson->name\" lesson!<br />";
+                $message .= "Successfully deleted grades from \"".format_string($lesson->name)."\" lesson!<br />";
             } else {
                 // email couldnt delete
-                $message .= "Failed to delete grades from \"$lesson->name\" lesson!<br />";
+                $message .= "Failed to delete grades from \"".format_string($lesson->name)."\" lesson!<br />";
             }
             if (delete_records("lesson_timer", "lessonid", $lesson->id, "userid", $userid)) {
                 // email good
-                $message .= "Successfully deleted time records from \"$lesson->name\" lesson!<br />";
+                $message .= "Successfully deleted time records from \"".format_string($lesson->name)."\" lesson!<br />";
             } else {
                 // email couldnt delete
-                $message .= "Failed to delete time records from \"$lesson->name\" lesson!<br />";
+                $message .= "Failed to delete time records from \"".format_string($lesson->name)."\" lesson!<br />";
             }
 
         } else {

diff --git a/mod/lesson/report.php b/mod/lesson/report.php
@@ -64,13 +64,13 @@
            '<input type="hidden" name="return" value="true" />'.
            '<input type="submit" value="'. get_string('editlessonsettings', 'lesson') .'" /></form>';
 
-    print_header($course->shortname .': '. $lesson->name, $course->fullname,
-                 "$navigation <A HREF=index.php?id=$course->id>$strlessons</A> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>
+    print_header($course->shortname .': '. format_string($lesson->name), $course->fullname,
+                 "$navigation <A HREF=index.php?id=$course->id>$strlessons</A> -> <a href=\"view.php?id=$cm->id\">".format_string($lesson->name,true)."</a>
                  -> <a href=\"report.php?id=$cm->id\">".get_string("report", "lesson")."</a>",
                   '', '', true, $button,
                   navmenu($course, $cm));
 
-    print_heading(get_string("lesson", "lesson", $lesson->name), "center", 5);
+    print_heading(get_string("lesson", "lesson", format_string($lesson->name)), "center", 5);
 
     // navigational links
     $detaillink = "<a href=\"report.php?id=$cm->id&amp;action=detail\">".get_string("detailedstats", "lesson")."</a>";

diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
@@ -87,7 +87,7 @@ function lesson_restore_mods($mod,$restore) {
             $newid = insert_record("lesson", $lesson);
 
             //Do some output
-            echo "<li>".get_string("modulename","lesson")." \"".$lesson->name."\"</li>";
+            echo "<li>".get_string("modulename","lesson")." \"".format_string(stripslashes($lesson->name),true)."\"</li>";
             backup_flush(300);
 
             if ($newid) {

diff --git a/mod/lesson/view.php b/mod/lesson/view.php
@@ -38,9 +38,9 @@
         if (isteacher($course->id)) {
             $action = 'teacherview';
         } elseif  (time() < $lesson->available) {
-            print_header($course->shortname .': '. $lesson->name, $course->fullname,
+            print_header($course->shortname .': '. format_string($lesson->name), $course->fullname,
                          $navigation .'<a href="index.php?id='. $course->id .'">'. $strlessons .'</a> -> '.
-                         '<a href="view.php?id='. $cm->id .'">'. $lesson->name .'</a>', 
+                         '<a href="view.php?id='. $cm->id .'">'. format_string($lesson->name,true) .'</a>', 
                          '', '', true, '', navmenu($course, $cm));
             print_simple_box_start('center');
             echo '<div align="center">';
@@ -51,8 +51,8 @@
             print_footer($course);
             exit();
         } elseif (time() > $lesson->deadline) {
-            print_header($course->shortname .': '. $lesson->name, $course->fullname,
-                         "$navigation <a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>", '', "", true,
+            print_header($course->shortname .': '. format_string($lesson->name), $course->fullname,
+                         "$navigation <a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">".format_string($lesson->name,true)."</a>", '', "", true,
                           '', navmenu($course, $cm));
             print_simple_box_start('center');
             echo '<div align="center">';
@@ -90,8 +90,8 @@
         $button = '';
     }
 
-    print_header($course->shortname .': '. $lesson->name, $course->fullname,
-                 "$navigation <a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">$lesson->name</a>", '', '', true,
+    print_header($course->shortname .': '. format_string($lesson->name), $course->fullname,
+                 "$navigation <a href=\"index.php?id=$course->id\">$strlessons</a> -> <a href=\"view.php?id=$cm->id\">".format_string($lesson->name,true)."</a>", '', '', true,
                  $button, // took out update_module_button($cm->id, $course->id, $strlesson) and replaced it with $button
                   navmenu($course, $cm));
 
@@ -122,7 +122,7 @@
                 if (isset($_POST['userpassword'])) {
                     echo "<tr align=\"center\" style='color:#DF041E;'><td>".get_string('loginfail', 'lesson') .'</td></tr>';
                 }
-                echo '<tr align="center"><td>'. get_string('passwordprotectedlesson', 'lesson', $lesson->name) .'</td></tr>';
+                echo '<tr align="center"><td>'. get_string('passwordprotectedlesson', 'lesson', format_string($lesson->name)) .'</td></tr>';
                 echo '<tr align="center"><td>'. get_string('enterpassword', 'lesson').' <input type="password" name="userpassword" /></td></tr>';
 
                 echo '<tr align="center"><td>';
@@ -142,7 +142,6 @@
         // display individual pages and their sets of answers
         // if pageid is EOL then the end of the lesson has been reached
                // for flow, changed to simple echo for flow styles, michaelp, moved lesson name and page title down
-       //print_heading($lesson->name);
        $timedflag = false;
        $attemptflag = false;
         if (empty($pageid)) {
@@ -547,7 +546,7 @@
             // now starting to print the page's contents   
             echo "<div align=\"center\">";            
             echo "<em><strong>";
-            echo ($lesson->name) . "</strong></em>";
+            echo format_string($lesson->name) . "</strong></em>";
             if ($page->qtype == LESSON_BRANCHTABLE) {
                 echo ":<br />";
                 print_heading($page->title);
@@ -1035,7 +1034,6 @@
                         }
                     }
                 } else {
-                    //print_string("noattemptrecordsfound", "lesson");                    
                     if ($lesson->timed) {
                         if (isset($_GET["outoftime"])) {
                             if ($_GET["outoftime"] == "normal") {
@@ -1131,7 +1129,7 @@
 
     /*******************teacher view **************************************/
     elseif ($action == 'teacherview') {
-        print_heading_with_help($lesson->name, "overview", "lesson");        
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");        
         // get number of pages
         if ($page = get_record_select("lesson_pages", "lessonid = $lesson->id AND prevpageid = 0")) {
             $npages = 1;
@@ -1531,7 +1529,7 @@
 
     /*******************essay view **************************************/ // 6/29/04
     elseif ($action == 'essayview') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
 
         // get lesson pages that are essay
         if (!$pages = get_records_select("lesson_pages", "lessonid = $lesson->id AND qtype = ".LESSON_ESSAY)) {
@@ -1614,7 +1612,7 @@
 
     /*******************grade essays **************************************/ // 6/29/04
     elseif ($action == 'essaygrade') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
 
         $attemptid = required_param('attemptid', PARAM_INT);
 
@@ -1692,7 +1690,7 @@
 
     /*******************update grade**************************************/ // 6/29/04
     elseif ($action == 'updategrade') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
 
         confirm_sesskey();
 
@@ -1742,7 +1740,7 @@
 
     /*******************email essay **************************************/ // 6/29/04
     elseif ($action == 'emailessay') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
 
            confirm_sesskey();
 
@@ -1821,15 +1819,15 @@
 
     /*******************high scores **************************************/
     elseif ($action == 'highscores') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
 
         if (!$grades = get_records_select("lesson_grades", "lessonid = $lesson->id", "completed")) {
             $grades = array();
         }
 
         echo "<div align=\"center\">";
         $titleinfo->maxhighscores = $lesson->maxhighscores;
-        $titleinfo->name = $lesson->name;
+        $titleinfo->name = format_string($lesson->name);
         echo get_string("topscorestitle", "lesson", $titleinfo)."<br><br>";
 
         if (!$highscores = get_records_select("lesson_high_scores", "lessonid = $lesson->id")) {
@@ -1870,7 +1868,7 @@
     }
     /*******************update high scores **************************************/
     elseif ($action == 'updatehighscores') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
 
         confirm_sesskey();
 
@@ -1949,7 +1947,7 @@
     }
     /*******************name for highscores **************************************/
     elseif ($action == 'nameforhighscores') {
-        print_heading_with_help($lesson->name, "overview", "lesson");
+        print_heading_with_help(format_string($lesson->name,true), "overview", "lesson");
         echo "<div align=\"center\">";
         if (isset($_POST['name'])) {
             $name = trim(clean_param($_POST['name'], PARAM_CLEAN));