MDL-12945 fixing mod indexes broken by previous commit; merged from MOODLE_19_STABLE

diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index dbae8289d27f1a9ca3e86e39046a4a298eef2a41..7409f57847c5f74707d57a67345123871c6636b3 100644 (file)
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -51,27 +51,14 @@
 
     $types = assignment_types();
 
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['assignment'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 
-        if (!file_exists($CFG->dirroot.'/mod/assignment/type/'.$cm->assignmenttype.'/assignment.class.php')) {
-            continue;
-        }
-
-        require_once ($CFG->dirroot.'/mod/assignment/type/'.$cm->assignmenttype.'/assignment.class.php');
-        $assignmentclass = 'assignment_'.$cm->assignmenttype;
-        $assignmentinstance = new $assignmentclass($cm->id, NULL, $cm, $course);
-
-        $submitted = $assignmentinstance->submittedlink(true);
-
-        $grading_info = grade_get_grades($course->id, 'mod', 'assignment', $cm->instance, $USER->id);
-        $grade = $grading_info->items[0]->grades[$USER->id]->str_grade;
-
-        $type = $types[$cm->assignmenttype];
-
-        $due = $cm->timedue ? userdate($cm->timedue) : '-';
+        $cm->timedue        = $cms[$cm->id]->timedue;
+        $cm->assignmenttype = $cms[$cm->id]->assignmenttype;
 
         //Show dimmed if the mod is hidden
         $class = $cm->visible ? '' : 'class="dimmed"';
@@ -89,6 +76,23 @@
             $currentsection = $cm->section;
         }
 
+        if (!file_exists($CFG->dirroot.'/mod/assignment/type/'.$cm->assignmenttype.'/assignment.class.php')) {
+            continue;
+        }
+
+        require_once ($CFG->dirroot.'/mod/assignment/type/'.$cm->assignmenttype.'/assignment.class.php');
+        $assignmentclass = 'assignment_'.$cm->assignmenttype;
+        $assignmentinstance = new $assignmentclass($cm->id, NULL, $cm, $course);
+
+        $submitted = $assignmentinstance->submittedlink(true);
+
+        $grading_info = grade_get_grades($course->id, 'mod', 'assignment', $cm->instance, $USER->id);
+        $grade = $grading_info->items[0]->grades[$USER->id]->str_grade;
+
+        $type = $types[$cm->assignmenttype];
+
+        $due = $cm->timedue ? userdate($cm->timedue) : '-';
+
         if ($course->format == "weeks" or $course->format == "topics") {
             $table->data[] = array ($printsection, $link, $type, $due, $submitted, $grade);
         } else {

diff --git a/mod/chat/index.php b/mod/chat/index.php
index c43730b7ea42415162d4d90cd9b04095a2398cf2..bd20bc172e7a8aadc7763c3acc934e3c92433962 100644 (file)
--- a/mod/chat/index.php
+++ b/mod/chat/index.php
@@ -54,8 +54,10 @@
     }
 
     $currentsection = '';
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['chat'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 

diff --git a/mod/choice/index.php b/mod/choice/index.php
index 85ebfc9fc4db04ce322c1bcc78a6dfb772a451d9..670dcfef74c5d7a8a47b7eacdf37db589b7c6454 100644 (file)
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@@ -51,21 +51,12 @@
 
     $currentsection = "";
 
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['choice'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 
-        if (!empty($answers[$cm->instance])) {
-            $answer = $answers[$cm->instance];
-        } else {
-            $answer = "";
-        }
-        if (!empty($answer->optionid)) {
-            $aa = format_string(choice_get_option_text(null, $answer->optionid));
-        } else {
-            $aa = "";
-        }
         $printsection = "";
         if ($cm->section !== $currentsection) {
             if ($cm->section) {
@@ -80,6 +71,17 @@
         $class = $cm->visible ? '' : 'class="dimmed"';
         $tt_href = "<a $class href=\"view.php?id=$cm->id\">".format_string($cm->name)."</a>";
 
+        if (!empty($answers[$cm->instance])) {
+            $answer = $answers[$cm->instance];
+        } else {
+            $answer = "";
+        }
+        if (!empty($answer->optionid)) {
+            $aa = format_string(choice_get_option_text(null, $answer->optionid));
+        } else {
+            $aa = "";
+        }
+
         if ($course->format == "weeks" || $course->format == "topics") {
             $table->data[] = array ($printsection, $tt_href, $aa);
         } else {

diff --git a/mod/data/index.php b/mod/data/index.php
index bff07217cae5f9a8ea6c3698d8677057d4ad5c01..60b4b7fcf8311fabcb5e3e3829d94ebe4d0ca693 100755 (executable)
--- a/mod/data/index.php
+++ b/mod/data/index.php
@@ -82,11 +82,16 @@
 
     $currentsection = "";
 
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['data'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 
+        $cm->intro       = $cms[$cm->id]->intro;
+        $cm->approval    = $cms[$cm->id]->approval;
+        $cm->rssarticles = $cms[$cm->id]->rssarticles;
+
         $printsection = "";
 
         $class = $cm->visible ? '' : 'class="dimmed"';

diff --git a/mod/glossary/index.php b/mod/glossary/index.php
index 47da6082f9e6ffdd691457bd786c611f087c3d16..f71afc818add7f97e5f166e55184093a47a6265a 100644 (file)
--- a/mod/glossary/index.php
+++ b/mod/glossary/index.php
@@ -6,6 +6,7 @@
     require_once("../../config.php");
     require_once("lib.php");
     require_once("$CFG->libdir/rsslib.php");
+    require_once("$CFG->dirroot/course/lib.php");
 
     $id = required_param('id', PARAM_INT);   // course
 
@@ -67,13 +68,17 @@
 
     $currentsection = "";
 
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['glossary'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 
+        $cm->rsstype      = $cms[$cm->id]->rsstype;
+        $cm->rssarticles  = $cms[$cm->id]->rssarticles;
+
         $class = $cm->visible ? '' : 'class="dimmed"';
-        $link = "<a class=\"dimmed\" href=\"view.php?id=$cm->id\">".format_string($cm->name)."</a>";
+        $link = "<a $class href=\"view.php?id=$cm->id\">".format_string($cm->name)."</a>";
 
         $printsection = "";
         if ($cm->section !== $currentsection) {

diff --git a/mod/resource/index.php b/mod/resource/index.php
index d02b70036af4006029a6fcfd25dbe20f590ffaeb..574e4cde8220760321d587397a25ff412d10eec6 100644 (file)
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -48,11 +48,16 @@
 
     $currentsection = "";
     $options->para = false;
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['resource'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 
+        $cm->summary      = $cms[$cm->id]->summary;
+        $cm->timemodified = $cms[$cm->id]->timemodified;
+
         if ($course->format == "weeks" or $course->format == "topics") {
             $printsection = "";
             if ($cm->section !== $currentsection) {

diff --git a/mod/survey/index.php b/mod/survey/index.php
index beabb848835d0dffb9f982ae060bdd9039ab0608..fcbf432c324ab3002c78e21685d62a0dc3092a4b 100644 (file)
--- a/mod/survey/index.php
+++ b/mod/survey/index.php
@@ -45,8 +45,9 @@
 
     $currentsection = '';
 
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['survey'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 

diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index 1734b30b9331942c2d05bceab83ff8effbb7cb39..883e76c4de83b305f260aed3551eb5da999e8464 100644 (file)
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -58,11 +58,16 @@
         $table->align = array ('LEFT', 'LEFT', 'LEFT', 'LEFT');
     }
 
-    foreach ($cms as $cm) {
-        if (!coursemodule_visible_for_user($cm)) {
+    $modinfo = get_fast_modinfo($course);
+    foreach ($modinfo->instances['wiki'] as $cm) {
+        if (!$cm->uservisible) {
             continue;
         }
 
+        $cm->summary      = $cms[$cm->id]->summary;
+        $cm->wtype        = $cms[$cm->id]->wtype;
+        $cm->timemodified = $cms[$cm->id]->timemodified;
+
         $class = $cm->visible ? '' : 'class="dimmed"';
         $link = '<a '.$class.' href="view.php?id='.$cm->id.'">'.format_string($cm->name).'</a>';