Changed to hide non-visible grades (mods). Bug #378.

diff --git a/course/grade.php b/course/grade.php
index 9fb0507758b65d7b7af722e0a17d631b3d7e59e5..b1bf0ed5f198a100b73b9270a6f77ada5b5d5fe7 100644 (file)
--- a/course/grade.php
+++ b/course/grade.php
@@ -40,35 +40,37 @@
                 $sectionmods = explode(",", $section->sequence);
                 foreach ($sectionmods as $sectionmod) {
                     $mod = $mods[$sectionmod];
-                    $instance = get_record("$mod->modname", "id", "$mod->instance");
-                    $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
-                    if (file_exists($libfile)) {
-                        require_once($libfile);
-                        $gradefunction = $mod->modname."_grades";
-                        if (function_exists($gradefunction)) {   // Skip modules without grade function
-                            if ($modgrades = $gradefunction($mod->instance)) {
-
-                                $image = "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"".
-                                         "   TITLE=\"$mod->modfullname\">".
-                                         "<IMG BORDER=0 VALIGN=absmiddle SRC=\"../mod/$mod->modname/icon.gif\" ".
-                                         "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\"></A>";
-                                $columnhtml[] = "$image ".
-                                             "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
-                                             "$instance->name".
-                                             "</A>";
+                    if ($mod->visible) {
+                        $instance = get_record("$mod->modname", "id", "$mod->instance");
+                        $libfile = "$CFG->dirroot/mod/$mod->modname/lib.php";
+                        if (file_exists($libfile)) {
+                            require_once($libfile);
+                            $gradefunction = $mod->modname."_grades";
+                            if (function_exists($gradefunction)) {   // Skip modules without grade function
+                                if ($modgrades = $gradefunction($mod->instance)) {
+
+                                    $image = "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\"".
+                                             "   TITLE=\"$mod->modfullname\">".
+                                             "<IMG BORDER=0 VALIGN=absmiddle SRC=\"../mod/$mod->modname/icon.gif\" ".
+                                             "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\"></A>";
+                                    $columnhtml[] = "$image ".
+                                                 "<A HREF=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">".
+                                                 "$instance->name".
+                                                 "</A>";
+        
+                                    if (empty($modgrades->grades[$USER->id])) {
+                                        $grades[]  = "";
+                                    } else {
+                                        $grades[]  = $modgrades->grades[$USER->id];
+                                        $totalgrade += (float)$modgrades->grades[$USER->id];
+                                    }
     
-                                if (empty($modgrades->grades[$USER->id])) {
-                                    $grades[]  = "";
-                                } else {
-                                    $grades[]  = $modgrades->grades[$USER->id];
-                                    $totalgrade += (float)$modgrades->grades[$USER->id];
-                                }
-
-                                if (empty($modgrades->maxgrade)) {
-                                    $maxgrades[] = "";
-                                } else {
-                                    $maxgrades[]    = $modgrades->maxgrade;
-                                    $totalmaxgrade += $modgrades->maxgrade;
+                                    if (empty($modgrades->maxgrade)) {
+                                        $maxgrades[] = "";
+                                    } else {
+                                        $maxgrades[]    = $modgrades->maxgrade;
+                                        $totalmaxgrade += $modgrades->maxgrade;
+                                    }
                                 }
                             }
                         }