From 01e3838853e7ce20fbcd44eb22d251c16f0b12ee Mon Sep 17 00:00:00 2001 From: mattc-catalyst Date: Thu, 5 Jul 2007 04:55:24 +0000 Subject: [PATCH] MDL-9473: Initialise navlinks array before use Author: Matt Clarkson --- course/mod.php | 1 + course/modedit.php | 1 + grade/report.php | 2 +- grade/report/grader/preferences.php | 1 + lib/moodlelib.php | 3 ++- lib/pagelib.php | 2 +- mod/assignment/index.php | 1 + mod/assignment/lib.php | 3 ++- mod/chat/index.php | 1 + mod/chat/report.php | 3 ++- mod/choice/index.php | 1 + mod/choice/report.php | 1 + mod/choice/view.php | 1 + mod/data/edit.php | 2 ++ mod/data/field/latlong/kml.php | 1 + mod/data/import.php | 1 + mod/data/index.php | 1 + mod/data/lib.php | 2 ++ mod/data/templates.php | 1 + mod/data/view.php | 1 + mod/exercise/assessments.php | 1 + mod/exercise/index.php | 1 + mod/exercise/submissions.php | 1 + mod/exercise/upload.php | 1 + mod/exercise/view.php | 1 + mod/forum/discuss.php | 1 + mod/forum/index.php | 1 + mod/forum/markposts.php | 1 + mod/forum/post.php | 4 +++- mod/forum/search.php | 2 ++ mod/forum/settracking.php | 1 + mod/forum/subscribe.php | 1 + mod/forum/subscribers.php | 1 + mod/forum/user.php | 2 +- mod/forum/view.php | 1 + mod/glossary/comment.php | 1 + mod/glossary/comments.php | 1 + mod/glossary/deleteentry.php | 1 + mod/glossary/edit.php | 1 + mod/glossary/editcategories.php | 1 + mod/glossary/export.php | 1 + mod/glossary/exportentry.php | 1 + mod/glossary/formats.php | 1 + mod/glossary/import.php | 1 + mod/glossary/index.php | 1 + mod/glossary/showentry.php | 1 + mod/glossary/view.php | 1 + mod/hotpot/index.php | 1 + mod/hotpot/report.php | 1 + mod/hotpot/review.php | 1 + mod/hotpot/view.php | 2 ++ mod/journal/edit.php | 1 + mod/journal/index.php | 1 + mod/journal/report.php | 1 + mod/journal/view.php | 1 + mod/lesson/import.php | 1 + mod/lesson/importppt.php | 1 + mod/lesson/index.php | 2 +- mod/lesson/locallib.php | 2 +- mod/lesson/pagelib.php | 3 ++- mod/quiz/attempt.php | 1 + mod/quiz/edit.php | 3 ++- mod/quiz/index.php | 2 +- mod/quiz/report/default.php | 1 + mod/quiz/review.php | 3 ++- mod/resource/index.php | 2 +- mod/scorm/index.php | 1 + mod/scorm/player.php | 2 ++ mod/scorm/report.php | 1 + mod/scorm/view.php | 1 + mod/survey/index.php | 1 + mod/survey/report.php | 1 + mod/survey/save.php | 1 + mod/survey/view.php | 1 + mod/wiki/admin.php | 1 + mod/wiki/index.php | 1 + mod/wiki/view.php | 1 + mod/workshop/assess.php | 1 + mod/workshop/assessments.php | 1 + mod/workshop/index.php | 1 + mod/workshop/submissions.php | 1 + mod/workshop/upload.php | 1 + mod/workshop/view.php | 1 + mod/workshop/viewassessment.php | 1 + 84 files changed, 97 insertions(+), 14 deletions(-) diff --git a/course/mod.php b/course/mod.php index 76ee94afcc..828da8efcb 100644 --- a/course/mod.php +++ b/course/mod.php @@ -672,6 +672,7 @@ $focuscursor = "form.name"; } + $navlinks = array(); $navlinks[] = array('name' => $strmodulenameplural, 'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => $streditinga, 'link' => '', 'type' => 'action'); $navigation = build_navigation($navlinks); diff --git a/course/modedit.php b/course/modedit.php index bcef6aa9ee..fa01f3c804 100644 --- a/course/modedit.php +++ b/course/modedit.php @@ -299,6 +299,7 @@ $streditinga = get_string("editinga", "moodle", $fullmodulename); $strmodulenameplural = get_string("modulenameplural", $module->name); + $navlinks = array(); $navlinks[] = array('name' => $strmodulenameplural, 'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id", 'type' => 'activity'); if (isset($navlinksinstancename)) { $navlinks[] = $navlinksinstancename; diff --git a/grade/report.php b/grade/report.php index 20e60f9be8..6d07a835df 100644 --- a/grade/report.php +++ b/grade/report.php @@ -81,7 +81,7 @@ /// Print the header $strgrades = get_string('grades'); - + $navlinks = array(); $navlinks[] = array('name' => $strgrades, 'link' => $CFG->wwwroot . '/grade/index.php?id='.$courseid, 'type' => 'misc'); $navlinks[] = array('name' => $reportnames[$report], 'link' => '', 'type' => 'misc'); diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php index 7e3117bc2a..a2914fed86 100644 --- a/grade/report/grader/preferences.php +++ b/grade/report/grader/preferences.php @@ -59,6 +59,7 @@ $strgrades = get_string('grades'); $strgraderreport = get_string('graderreport', 'grades'); $strgradepreferences = get_string('gradepreferences', 'grades'); +$navlinks = array(); $navlinks[] = array('name' => $strgrades, 'link' => $CFG->wwwroot . '/grade/index.php?id='.$courseid, 'type' => 'misc'); $navlinks[] = array('name' => $strgraderreport, 'link' => $CFG->wwwroot . '/grade/report.php?id=' . $courseid . '&report=grader', 'type' => 'misc'); diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 602c5847ba..a669f443bf 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -7027,7 +7027,8 @@ function build_navigation($extranavlinks) { global $CFG, $COURSE; $navigation = ''; - + $navlinks = array(); + //Site name if ($site = get_site()) { $navlinks[] = array('name' => format_string($site->shortname), 'link' => "$CFG->wwwroot/", 'type' => 'home'); diff --git a/lib/pagelib.php b/lib/pagelib.php index 9a8a29412c..f5498cdca2 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -622,7 +622,7 @@ class page_generic_activity extends page_base { $title = str_replace($search, $replace, $title); } - + $navlinks = array(); $navlinks[] = array('name' => get_string('modulenameplural', $this->activityname), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/index.php?id={$this->courserecord->id}", 'type' => 'activity'); $navlinks[] = array('name' => format_string($this->activityrecord->name), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/view.php?id={$this->modulerecord->id}", 'type' => 'activityinstance'); diff --git a/mod/assignment/index.php b/mod/assignment/index.php index c5b21aa628..5e35a94980 100644 --- a/mod/assignment/index.php +++ b/mod/assignment/index.php @@ -22,6 +22,7 @@ $strsubmitted = get_string("submitted", "assignment"); $strgrade = get_string("grade"); + $navlinks = array(); $navlinks[] = array('name' => $strassignments, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 90ff4f6ca6..318df34975 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -958,7 +958,8 @@ class assignment_base { $tabindex = 1; //tabindex for quick grading tabbing; Not working for dropdowns yet add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id); - + + $navlinks = array(); $navlinks[] = array('name' => $this->strassignments, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($this->assignment->name,true), 'link' => "view.php?a={$this->assignment->id}", 'type' => 'activityinstance'); $navlinks[] = array('name' => $this->strsubmissions, 'link' => '', 'type' => 'title'); diff --git a/mod/chat/index.php b/mod/chat/index.php index 20d3d45f15..84daca9740 100644 --- a/mod/chat/index.php +++ b/mod/chat/index.php @@ -22,6 +22,7 @@ /// Print the header + $navlinks = array(); $navlinks[] = array('name' => $strchats, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/chat/report.php b/mod/chat/report.php index e45ef97f88..3fc45643b8 100644 --- a/mod/chat/report.php +++ b/mod/chat/report.php @@ -34,7 +34,8 @@ $strseesession = get_string('seesession', 'chat'); $strdeletesession = get_string('deletesession', 'chat'); - + $navlinks = array(); + /// Print a session if one has been specified if ($start and $end and !$confirmdelete) { // Show a full transcript diff --git a/mod/choice/index.php b/mod/choice/index.php index 46c93c5555..c3a76da859 100644 --- a/mod/choice/index.php +++ b/mod/choice/index.php @@ -15,6 +15,7 @@ $strchoice = get_string("modulename", "choice"); $strchoices = get_string("modulenameplural", "choice"); + $navlinks = array(); $navlinks[] = array('name' => $strchoices, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/choice/report.php b/mod/choice/report.php index 9d1654983f..fc00007a7d 100644 --- a/mod/choice/report.php +++ b/mod/choice/report.php @@ -40,6 +40,7 @@ if (!$download) { + $navlinks = array(); $navlinks[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($choice->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strresponses, 'link' => '', 'type' => 'title'); diff --git a/mod/choice/view.php b/mod/choice/view.php index 9d47fe8977..e5364dade8 100644 --- a/mod/choice/view.php +++ b/mod/choice/view.php @@ -58,6 +58,7 @@ if ($action == 'delchoice') { /// Display the choice and possibly results + $navlinks = array(); $navlinks[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($choice->name), 'link' => '', 'type' => 'activityinstance'); diff --git a/mod/data/edit.php b/mod/data/edit.php index 1dec9c9553..3b062e1293 100755 --- a/mod/data/edit.php +++ b/mod/data/edit.php @@ -69,6 +69,7 @@ $strdatabases = get_string("modulenameplural", "data"); $navigation = "id\">$strdatabases ->"; + $navlinks = array(); $navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); @@ -113,6 +114,7 @@ /// Print the page header $strdata = get_string('modulenameplural','data'); + $navlinks = array(); $navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/data/field/latlong/kml.php b/mod/data/field/latlong/kml.php index 07c3650245..e701f97b96 100644 --- a/mod/data/field/latlong/kml.php +++ b/mod/data/field/latlong/kml.php @@ -57,6 +57,7 @@ require_course_login($course, true, $cm); /// If it's hidden then it's don't show anything. :) if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities',get_context_instance(CONTEXT_MODULE, $cm->id))) { + $navlinks = array(); $navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/data/import.php b/mod/data/import.php index ba244de15a..eca88aea12 100755 --- a/mod/data/import.php +++ b/mod/data/import.php @@ -76,6 +76,7 @@ /// Print the page header $strdata = get_string('modulenameplural','data'); + $navlinks = array(); $navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/data/index.php b/mod/data/index.php index 7fb16b3bf0..1b7057f401 100755 --- a/mod/data/index.php +++ b/mod/data/index.php @@ -42,6 +42,7 @@ $strname = get_string('name'); $strdata = get_string('modulename','data'); + $navlinks = array(); $navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/data/lib.php b/mod/data/lib.php index 68a21573d5..3b6ebb1cf4 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1687,6 +1687,8 @@ function data_print_header($course, $cm, $data, $currenttab='') { global $CFG, $displaynoticegood, $displaynoticebad; $strdata = get_string('modulenameplural','data'); + + $navlinks = array(); $navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => $data->name, 'link' => '', 'type' => 'activityinstance'); diff --git a/mod/data/templates.php b/mod/data/templates.php index ec659501eb..fc21c0a9e5 100755 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -96,6 +96,7 @@ $meta .= '//]]>'."\n"; $meta .= ''."\n"; + $navlinks = array(); $navlinks[] = array('name' => $strdata, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/data/view.php b/mod/data/view.php index 5255e316ba..ddff7c5cca 100755 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -94,6 +94,7 @@ if (empty($cm->visible) and !has_capability('mod/data:managetemplates', $context)) { $strdatabases = get_string("modulenameplural", "data"); + $navlinks = array(); $navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/exercise/assessments.php b/mod/exercise/assessments.php index 0c26a84f08..d6b4e2290c 100644 --- a/mod/exercise/assessments.php +++ b/mod/exercise/assessments.php @@ -62,6 +62,7 @@ $strassessments = get_string("assessments", "exercise"); // ... print the header and... + $navlinks = array(); $navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strassessments, 'link' => '', 'type' => 'title'); diff --git a/mod/exercise/index.php b/mod/exercise/index.php index ce83ef45c0..5be04f65e5 100644 --- a/mod/exercise/index.php +++ b/mod/exercise/index.php @@ -24,6 +24,7 @@ $strdeadline = get_string("deadline", "exercise"); $strsubmitted = get_string("submitted", "assignment"); + $navlinks = array(); $navlinks[] = array('name' => $strexercises, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/exercise/submissions.php b/mod/exercise/submissions.php index 02ab23978d..529b7907aa 100644 --- a/mod/exercise/submissions.php +++ b/mod/exercise/submissions.php @@ -50,6 +50,7 @@ $strsubmissions = get_string("submissions", "exercise"); // ... print the header and... + $navlinks = array(); $navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title'); diff --git a/mod/exercise/upload.php b/mod/exercise/upload.php index 58b50c6ae8..375f125be8 100644 --- a/mod/exercise/upload.php +++ b/mod/exercise/upload.php @@ -28,6 +28,7 @@ $strexercise = get_string("modulename", "exercise"); $strupload = get_string("upload"); + $navlinks = array(); $navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($exercise->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strupload, 'link' => '', 'type' => 'title'); diff --git a/mod/exercise/view.php b/mod/exercise/view.php index 83ca9f378d..3cf1b12375 100644 --- a/mod/exercise/view.php +++ b/mod/exercise/view.php @@ -47,6 +47,7 @@ $strexercise = get_string("modulename", "exercise"); // ...display header... + $navlinks = array(); $navlinks[] = array('name' => $strexercises, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($exercise->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index c0dc30fb2c..c7ac29ef7e 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -97,6 +97,7 @@ unset($SESSION->fromdiscussion); + $navlinks = array(); $navlinks[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name,true), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => format_string($discussion->name,true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title'); diff --git a/mod/forum/index.php b/mod/forum/index.php index e710694d5e..20b2846e9c 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -451,6 +451,7 @@ /// Output the page + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => '', 'type' => 'activity'); print_header("$course->shortname: $strforums", $course->fullname, diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php index d927720a01..e8899ab164 100644 --- a/mod/forum/markposts.php +++ b/mod/forum/markposts.php @@ -33,6 +33,7 @@ } $strforums = get_string('modulenameplural', 'forum'); + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); diff --git a/mod/forum/post.php b/mod/forum/post.php index cade93fb1b..47f357cc80 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -58,6 +58,7 @@ require_login(); } + $navlinks = array(); $navlinks[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name,true), 'link' => '../forum/index.php?id=$course->id', 'type' => 'activityinstance'); @@ -410,6 +411,7 @@ $course = get_record('course', 'id', $forum->course); $strforums = get_string("modulenameplural", "forum"); + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => $forum->name, 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => format_string($post->subject, true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title'); @@ -634,7 +636,7 @@ $strforums = get_string("modulenameplural", "forum"); - + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => $forum->name, 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); diff --git a/mod/forum/search.php b/mod/forum/search.php index fe6f08389d..9cd5cc9a4a 100644 --- a/mod/forum/search.php +++ b/mod/forum/search.php @@ -97,6 +97,7 @@ $strsearchresults = get_string("searchresults", "forum"); $strpage = get_string("page"); + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity'); if (!$search || $showform) { @@ -119,6 +120,7 @@ $searchform = forum_search_form($course, $search); + $navlinks = array(); $navlinks[] = array('name' => $strsearch, 'link' => "search.php?id=$course->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => s($search, true), 'link' => '', 'type' => 'link'); $navigation = build_navigation($navlinks); diff --git a/mod/forum/settracking.php b/mod/forum/settracking.php index f1d270de44..e1d7517507 100644 --- a/mod/forum/settracking.php +++ b/mod/forum/settracking.php @@ -31,6 +31,7 @@ } $strforums = get_string('modulenameplural', 'forum'); + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index e9bc2166a5..03a665b414 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -52,6 +52,7 @@ } $strforums = get_string('modulenameplural', 'forum'); + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php index 9c5fa8228c..8663eecd9a 100644 --- a/mod/forum/subscribers.php +++ b/mod/forum/subscribers.php @@ -36,6 +36,7 @@ $strsubscribers = get_string("subscribers", "forum"); $strforums = get_string("forums", "forum"); + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strsubscribers, 'link' => '', 'type' => 'title'); diff --git a/mod/forum/user.php b/mod/forum/user.php index 498e974bc6..a346ca38c4 100644 --- a/mod/forum/user.php +++ b/mod/forum/user.php @@ -39,7 +39,7 @@ $strmode = get_string($mode, 'forum'); $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $syscontext)); - // TODO: add new cookie tail here! + $navlinks = array(); $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'core'); $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id", 'type' => 'title'); $navlinks[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title'); diff --git a/mod/forum/view.php b/mod/forum/view.php index 960a1f0783..50e8a9c4f1 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -64,6 +64,7 @@ /// Print header. + $navlinks = array(); $navlinks[] = array('name' => $strforums, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($forum->name), 'link' => "view.php?f=$forum->id", 'type' => 'activityinstance'); diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php index 84713712e0..99c423a868 100644 --- a/mod/glossary/comment.php +++ b/mod/glossary/comment.php @@ -223,6 +223,7 @@ function glossary_comment_print_header($course, $cm, $glossary, $entry, $action) $strglossary = get_string('modulename', 'glossary'); $strcomments = get_string('comments', 'glossary'); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strcomments, 'link' => "comments.php?id=$cm->id&eid=$entry->id", 'type' => 'title'); diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php index 98566a68c2..ffdaa34f2d 100644 --- a/mod/glossary/comments.php +++ b/mod/glossary/comments.php @@ -42,6 +42,7 @@ $strcomments = get_string("comments", "glossary"); $straddcomment = get_string("addcomment", "glossary"); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strcomments, 'link' => '', 'type' => 'title'); diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php index 51793f43bd..4f9db3b5e4 100644 --- a/mod/glossary/deleteentry.php +++ b/mod/glossary/deleteentry.php @@ -39,6 +39,7 @@ $strareyousuredelete = get_string("areyousuredelete","glossary"); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php index e4b44f8440..2a3b9ca006 100644 --- a/mod/glossary/edit.php +++ b/mod/glossary/edit.php @@ -192,6 +192,7 @@ $strglossary = get_string("modulename", "glossary"); $strglossaries = get_string("modulenameplural", "glossary"); $stredit = empty($e) ? get_string('addentry', 'glossary') : get_string("edit"); +$navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $stredit, 'link' => '', 'type' => 'title'); diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index e0733f8edb..6e42ba869a 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -47,6 +47,7 @@ $strglossaries = get_string("modulenameplural", "glossary"); $strglossary = get_string("modulename", "glossary"); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id&tab=GLOSSARY_CATEGORY_VIEW", 'type' => 'activityinstance'); $navlinks[] = array('name' => get_string("categories","glossary"), 'link' => '', 'type' => 'title'); diff --git a/mod/glossary/export.php b/mod/glossary/export.php index 0c6cb4002d..8978492bbe 100644 --- a/mod/glossary/export.php +++ b/mod/glossary/export.php @@ -37,6 +37,7 @@ $strexportfile = get_string("exportfile", "glossary"); $strexportentries = get_string('exportentries', 'glossary'); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php index 2745107a74..fd03e01c89 100644 --- a/mod/glossary/exportentry.php +++ b/mod/glossary/exportentry.php @@ -38,6 +38,7 @@ $entryalreadyexist = get_string('entryalreadyexist','glossary'); $entryexported = get_string('entryexported','glossary'); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php index ba8fb855be..f1c55a6e2d 100644 --- a/mod/glossary/formats.php +++ b/mod/glossary/formats.php @@ -51,6 +51,7 @@ $strmodulename = get_string("modulename", "glossary"); $strdisplayformats = get_string("displayformats","glossary"); + $navlinks = array(); $navlinks[] = array('name' => $stradmin, 'link' => "../../$CFG->admin/index.php", 'type' => 'core'); $navlinks[] = array('name' => $strconfiguration, 'link' => "../../$CFG->admin/configure.php", 'type' => 'core'); $navlinks[] = array('name' => $strmanagemodules, 'link' => "../../$CFG->admin/modules.php", 'type' => 'core'); diff --git a/mod/glossary/import.php b/mod/glossary/import.php index db18e27176..114d59984e 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -45,6 +45,7 @@ $strsearch = get_string("search"); $strimportentries = get_string('importentriesfromxml', 'glossary'); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strimportentries, 'link' => '', 'type' => 'title'); diff --git a/mod/glossary/index.php b/mod/glossary/index.php index 54d314526b..b3209f2458 100644 --- a/mod/glossary/index.php +++ b/mod/glossary/index.php @@ -27,6 +27,7 @@ /// Print the header + $navlinks = array(); $navlinks[] = array('name' => $strglossarys, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php index 937b88cb3a..11d84b4d83 100644 --- a/mod/glossary/showentry.php +++ b/mod/glossary/showentry.php @@ -49,6 +49,7 @@ $CFG->framename = "newwindow"; if ($course->id != SITEID) { + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => '', 'type' => 'activity'); $navlinks[] = array('name' => $strsearch, 'link' => '', 'type' => 'title'); diff --git a/mod/glossary/view.php b/mod/glossary/view.php index b400bb0e6a..44f99b5681 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -224,6 +224,7 @@ $strsearch = get_string("search"); $strwaitingapproval = get_string('waitingapproval', 'glossary'); + $navlinks = array(); $navlinks[] = array('name' => $strglossaries, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($glossary->name), 'link' => "view.php?id=$id", 'type' => 'activityinstance'); diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php index b583f41460..6bec8c5277 100644 --- a/mod/hotpot/index.php +++ b/mod/hotpot/index.php @@ -37,6 +37,7 @@ $title = format_string($course->shortname) . ": $strmodulenameplural"; $heading = $course->fullname; + $navlinks = array(); $navlinks[] = array('name' => $strmodulenameplural, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php index 761279b247..aa602b0ecc 100644 --- a/mod/hotpot/report.php +++ b/mod/hotpot/report.php @@ -402,6 +402,7 @@ function hotpot_print_report_heading(&$course, &$cm, &$hotpot, &$mode) { $title = format_string($course->shortname) . ": $hotpot->name"; $heading = $course->fullname; + $navlinks = array(); $navlinks[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity'); $navlinks[] = array('name' => $hotpot->name, 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); diff --git a/mod/hotpot/review.php b/mod/hotpot/review.php index d37a6d499d..57bc10d031 100644 --- a/mod/hotpot/review.php +++ b/mod/hotpot/review.php @@ -53,6 +53,7 @@ $title = format_string($course->shortname) . ": $hotpot->name"; $heading = $course->fullname; + $navlinks = array(); $navlinks[] = array('name' => $strmodulenameplural, 'link' => 'index.php?id='.$course->id, 'type' => 'activity'); $navlinks[] = array('name' => get_string("review", "quiz"), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php index 9473f584dc..54d2281959 100644 --- a/mod/hotpot/view.php +++ b/mod/hotpot/view.php @@ -42,6 +42,8 @@ // header strings $title = format_string($course->shortname.': '.$hotpot->name, true); $heading = $course->fullname; + + $navlinks = array(); $navlinks[] = array('name' => get_string("modulenameplural", "hotpot"), 'link' => $CFG->wwwroot.'/mod/hotpot/index.php?id='.$course->id, 'type' => 'activity'); $navlinks[] = array('name' => $hotpot->name, 'link' => '', 'type' => 'activityinstance'); diff --git a/mod/journal/edit.php b/mod/journal/edit.php index aa04b3b858..d3d547c33d 100644 --- a/mod/journal/edit.php +++ b/mod/journal/edit.php @@ -75,6 +75,7 @@ $entry->format = $defaultformat; } + $navlinks = array(); $navlinks[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $stredit, 'link' => '', 'type' => 'action'); diff --git a/mod/journal/index.php b/mod/journal/index.php index b8f11ab3ac..2cdc0e46c7 100644 --- a/mod/journal/index.php +++ b/mod/journal/index.php @@ -17,6 +17,7 @@ $strweek = get_string("week"); $strtopic = get_string("topic"); + $navlinks = array(); $navlinks[] = array('name' => $strjournals, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/journal/report.php b/mod/journal/report.php index b65eb0542a..f2dff499b2 100644 --- a/mod/journal/report.php +++ b/mod/journal/report.php @@ -38,6 +38,7 @@ $strentries = get_string("entries", "journal"); $strjournals = get_string("modulenameplural", "journal"); + $navlinks = array(); $navlinks[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($journal->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strentries, 'link' => '', 'type' => 'title'); diff --git a/mod/journal/view.php b/mod/journal/view.php index 8195662a5d..7233ee88af 100644 --- a/mod/journal/view.php +++ b/mod/journal/view.php @@ -28,6 +28,7 @@ $strjournal = get_string("modulename", "journal"); $strjournals = get_string("modulenameplural", "journal"); + $navlinks = array(); $navlinks[] = array('name' => $strjournals, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($journal->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/lesson/import.php b/mod/lesson/import.php index 3b9ffd72f2..71bfe5345e 100644 --- a/mod/lesson/import.php +++ b/mod/lesson/import.php @@ -35,6 +35,7 @@ $strimportquestions = get_string("importquestions", "lesson"); $strlessons = get_string("modulenameplural", "lesson"); + $navlinks = array(); $navlinks[] = array('name' => $strlesson, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($lesson->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strimportquestions, 'link' => '', 'type' => 'title'); diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php index 81cd9c0dfc..0589972066 100644 --- a/mod/lesson/importppt.php +++ b/mod/lesson/importppt.php @@ -44,6 +44,7 @@ $strimportppt = get_string("importppt", "lesson"); $strlessons = get_string("modulenameplural", "lesson"); + $navlinks = array(); $navlinks[] = array('name' => $strlessons, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($mod->name,true), 'link' => "$CFG->wwwroot/mod/$modname/view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strimportppt, 'link' => '', 'type' => 'title'); diff --git a/mod/lesson/index.php b/mod/lesson/index.php index b144d2973d..a28404b903 100644 --- a/mod/lesson/index.php +++ b/mod/lesson/index.php @@ -29,7 +29,7 @@ /// Print the header - + $navlinks = array(); $navlinks[] = array('name' => $strlessons, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 362ca5450e..0c8044bd42 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -239,7 +239,7 @@ function lesson_print_header($cm, $course, $lesson, $currenttab = '') { } /// Header setup - + $navlinks = array(); $navlinks[] = array('name' => $strlessons, 'link' => "$CFG->wwwroot/mod/lesson/index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => $strname, 'link' => '', 'type' => 'activityinstance'); diff --git a/mod/lesson/pagelib.php b/mod/lesson/pagelib.php index 9f5460ed8b..e12429128d 100644 --- a/mod/lesson/pagelib.php +++ b/mod/lesson/pagelib.php @@ -75,7 +75,8 @@ class page_lesson extends page_generic_activity { if (empty($title)) { $title = "{$this->courserecord->shortname}: $activityname"; } - + + $navlinks = array(); $navlinks[] = array('name' => get_string('modulenameplural', $this->activityname), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/index.php?id={$this->courserecord->id}", 'type' => 'activity'); $navlinks[] = array('name' => format_string($this->activityrecord->name), 'link' => $CFG->wwwroot."/mod/{$this->activityname}/view.php?id={$this->modulerecord->id}", 'type' => 'activityinstance'); diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php index d660e5fb0b..367c3d7a47 100644 --- a/mod/quiz/attempt.php +++ b/mod/quiz/attempt.php @@ -396,6 +396,7 @@ $strupdatemodule = has_capability('moodle/course:manageactivities', $coursecontext) ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz')) : ""; + $navlinks = array(); $navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strattemptnum, 'link' => '', 'type' => 'title'); diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php index 90470a5b25..4930d296d5 100644 --- a/mod/quiz/edit.php +++ b/mod/quiz/edit.php @@ -310,6 +310,7 @@ $strupdatemodule = has_capability('moodle/course:manageactivities', $coursecontext) ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz')) : ""; + $navlinks = array(); $navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?q=$quiz->instance", 'type' => 'activityinstance'); $navlinks[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title'); @@ -349,7 +350,7 @@ $strupdatemodule = has_capability('moodle/course:manageactivities', $coursecontext) ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz')) : ""; - + $navlinks = array(); $navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?q=$quiz->instance", 'type' => 'activityinstance'); $navlinks[] = array('name' => $streditingquiz, 'link' => '', 'type' => 'title'); diff --git a/mod/quiz/index.php b/mod/quiz/index.php index 87b4faacb9..d7d53c4ebd 100644 --- a/mod/quiz/index.php +++ b/mod/quiz/index.php @@ -30,7 +30,7 @@ "; } - + $navlinks = array(); $navlinks[] = array('name' => $strquizzes, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php index 539ec1bec2..d063c6e548 100644 --- a/mod/quiz/report/default.php +++ b/mod/quiz/report/default.php @@ -27,6 +27,7 @@ class quiz_default_report { $strquizzes = get_string("modulenameplural", "quiz"); $strquiz = get_string("modulename", "quiz"); /// Print the page header + $navlinks = array(); $navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($quiz->name), 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/quiz/review.php b/mod/quiz/review.php index fb7cd39765..c47b2dd6e3 100644 --- a/mod/quiz/review.php +++ b/mod/quiz/review.php @@ -124,7 +124,8 @@ $strupdatemodule = has_capability('moodle/course:manageactivities', $coursecontext) ? update_module_button($cm->id, $course->id, get_string('modulename', 'quiz')) : ""; - + + $navlinks = array(); $navlinks[] = array('name' => $strquizzes, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($quiz->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strreview, 'link' => '', 'type' => 'title'); diff --git a/mod/resource/index.php b/mod/resource/index.php index d00c9e2f5a..56cb2e8a67 100644 --- a/mod/resource/index.php +++ b/mod/resource/index.php @@ -27,7 +27,7 @@ $strsummary = get_string("summary"); $strlastmodified = get_string("lastmodified"); - + $navlinks = array(); $navlinks[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/scorm/index.php b/mod/scorm/index.php index 78a017c92c..4b0d4c41c8 100755 --- a/mod/scorm/index.php +++ b/mod/scorm/index.php @@ -25,6 +25,7 @@ $strreport = get_string("report",'scorm'); $strlastmodified = get_string("lastmodified"); + $navlinks = array(); $navlinks[] = array('name' => $strscorms, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/scorm/player.php b/mod/scorm/player.php index 3fd6f69fba..66a8be8caa 100755 --- a/mod/scorm/player.php +++ b/mod/scorm/player.php @@ -46,6 +46,8 @@ $strpopup = get_string('popup','scorm'); $strexit = get_string('exitactivity','scorm'); + $navlinks = array(); + if ($course->id != SITEID) { if ($scorms = get_all_instances_in_course('scorm', $course)) { // The module SCORM/AICC activity with the first id is the course diff --git a/mod/scorm/report.php b/mod/scorm/report.php index d7b07b96bf..19c8f77322 100755 --- a/mod/scorm/report.php +++ b/mod/scorm/report.php @@ -64,6 +64,7 @@ $strattempt = get_string('attempt', 'scorm'); $strname = get_string('name'); + $navlinks = array(); $navlinks[] = array('name' => $strscorms, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); diff --git a/mod/scorm/view.php b/mod/scorm/view.php index 98139ecb7f..f753e3056b 100755 --- a/mod/scorm/view.php +++ b/mod/scorm/view.php @@ -63,6 +63,7 @@ // // Print the page header // + $navlinks = array(); $navlinks[] = array('name' => format_string($scorm->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navigation = build_navigation($navlinks); diff --git a/mod/survey/index.php b/mod/survey/index.php index d537094d6e..7ea8a4fed4 100644 --- a/mod/survey/index.php +++ b/mod/survey/index.php @@ -21,6 +21,7 @@ $strdone = get_string("done", "survey"); $strnotdone = get_string("notdone", "survey"); + $navlinks = array(); $navlinks[] = array('name' => $strsurveys, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/survey/report.php b/mod/survey/report.php index 25c2169d4f..35d5283850 100644 --- a/mod/survey/report.php +++ b/mod/survey/report.php @@ -65,6 +65,7 @@ id\">".format_string($survey->name,true)." -> "; } + $navlinks = array(); $navlinks[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($survey->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strreport, 'link' => '', 'type' => 'title'); diff --git a/mod/survey/save.php b/mod/survey/save.php index ced931c2ab..acbeaa55bd 100644 --- a/mod/survey/save.php +++ b/mod/survey/save.php @@ -33,6 +33,7 @@ $strsurveys = get_string("modulenameplural", "survey"); $strsurveysaved = get_string("surveysaved", "survey"); + $navlinks = array(); $navlinks[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinstance'); $navlinks[] = array('name' => $strsurveysaved, 'link' => '', 'type' => 'title'); diff --git a/mod/survey/view.php b/mod/survey/view.php index 1cbee4464a..b163d4267b 100644 --- a/mod/survey/view.php +++ b/mod/survey/view.php @@ -37,6 +37,7 @@ $strsurveys = get_string("modulenameplural", "survey"); $strsurvey = get_string("modulename", "survey"); + $navlinks = array(); $navlinks[] = array('name' => $strsurveys, 'link' => "index.php?id=$course->id", 'type' => 'activity');; $navlinks[] = array('name' => format_string($survey->name), 'link' => '', 'type' => 'activityinistance'); $navigation = build_navigation($navlinks); diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php index d31e50b223..fbd7431be7 100644 --- a/mod/wiki/admin.php +++ b/mod/wiki/admin.php @@ -114,6 +114,7 @@ default: break; } } + $navlinks = array(); $navlinks[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace'); $navlinks[] = array('name' => get_string("administration","wiki"), 'link' => '', 'type' => 'title'); diff --git a/mod/wiki/index.php b/mod/wiki/index.php index 88bc3358dc..5f7f351643 100644 --- a/mod/wiki/index.php +++ b/mod/wiki/index.php @@ -24,6 +24,7 @@ /// Print the header + $navlinks = array(); $navlinks[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/wiki/view.php b/mod/wiki/view.php index 44fe38afae..36852ec3f5 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -281,6 +281,7 @@ $strwikis = get_string("modulenameplural", "wiki"); $strwiki = get_string("modulename", "wiki"); + $navlinks = array(); $navlinks[] = array('name' => $strwikis, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($wiki->name,true), 'link' => "view.php?id=$moodleID", 'type' => 'activityinstace'); diff --git a/mod/workshop/assess.php b/mod/workshop/assess.php index 12abeb053d..edafaa4d5f 100644 --- a/mod/workshop/assess.php +++ b/mod/workshop/assess.php @@ -61,6 +61,7 @@ if ($frameset == "top") { // removed // because it does not validate MDL-7861 + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strassess, 'link' => '', 'type' => 'title'); diff --git a/mod/workshop/assessments.php b/mod/workshop/assessments.php index fce004fca3..e6c3249b65 100644 --- a/mod/workshop/assessments.php +++ b/mod/workshop/assessments.php @@ -71,6 +71,7 @@ // ... print the header and... + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strassessments, 'link' => '', 'type' => 'title'); diff --git a/mod/workshop/index.php b/mod/workshop/index.php index dfc4287d72..d52d8d245e 100644 --- a/mod/workshop/index.php +++ b/mod/workshop/index.php @@ -23,6 +23,7 @@ $strdeadline = get_string("deadline", "workshop"); $strsubmitted = get_string("submitted", "assignment"); + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => '', 'type' => 'activity'); $navigation = build_navigation($navlinks); diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php index 3bc30892c4..71d9898854 100644 --- a/mod/workshop/submissions.php +++ b/mod/workshop/submissions.php @@ -51,6 +51,7 @@ $strsubmissions = get_string("submissions", "workshop"); // ... print the header and... + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strsubmissions, 'link' => '', 'type' => 'title'); diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php index 0ee3325f0a..05c4fa753c 100644 --- a/mod/workshop/upload.php +++ b/mod/workshop/upload.php @@ -23,6 +23,7 @@ $strworkshop = get_string('modulename', 'workshop'); $strsubmission = get_string('submission', 'workshop'); + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strsubmission, 'link' => '', 'type' => 'title'); diff --git a/mod/workshop/view.php b/mod/workshop/view.php index e2bac48862..fa31516b6f 100644 --- a/mod/workshop/view.php +++ b/mod/workshop/view.php @@ -69,6 +69,7 @@ } // ...display header... + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); if ($straction) { diff --git a/mod/workshop/viewassessment.php b/mod/workshop/viewassessment.php index 4582e9c2db..9207ff3d30 100644 --- a/mod/workshop/viewassessment.php +++ b/mod/workshop/viewassessment.php @@ -58,6 +58,7 @@ /// top frame with the navigation bar and the assessment form if ($frameset == "top") { + $navlinks = array(); $navlinks[] = array('name' => $strworkshops, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => format_string($workshop->name,true), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance'); $navlinks[] = array('name' => $strassess, 'link' => '', 'type' => 'title'); -- 2.39.5