Some slight cleanup (optimisation) of print_section and print_section_block

diff --git a/course/format/social.php b/course/format/social.php
index 6f01d8107127a8fb20cf2c17db50937bb4c769c8..7188f7e6ca36e0e15309e2849041d048c92d9e1e 100644 (file)
--- a/course/format/social.php
+++ b/course/format/social.php
@@ -28,7 +28,7 @@
 
 /// Then, print all the available resources (Section 0)
       print_section_block(get_string("activities"), $course, $sections[0], 
-                          $mods, $modnames, $modnamesused, true, "100%", isediting($course->id));
+                          $mods, $modnames, $modnamesused, true, "100%");
 
 
 /// Print all the recent activity

diff --git a/course/lib.php b/course/lib.php
index c77ca9e29d395f23aacacb7c0b7c3e4e5f4f3089..ebcdb27d1eb88aa81ad6d476e8842e32ca954f87 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -551,9 +551,18 @@ function set_section_visible($courseid, $sectionnumber, $visibility) {
 }
 
 function print_section_block($heading, $course, $section, $mods, $modnames, $modnamesused, 
-                             $absolute=true, $width="100%", $isediting=false) {
+                             $absolute=true, $width="100%") {
 
     global $CFG;
+    static $isteacher;
+    static $isediting;
+
+    if (!isset($isteacher)) {
+        $isteacher = isteacher($course->id);
+    }
+    if (!isset($isediting)) {
+        $isediting = isediting($course->id);
+    }
 
     $modinfo = unserialize($course->modinfo);
     $moddata = array();
@@ -565,19 +574,25 @@ function print_section_block($heading, $course, $section, $mods, $modnames, $mod
         $sectionmods = explode(",", $section->sequence);
 
         foreach ($sectionmods as $modnumber) {
+            if (empty($mods[$modnumber])) {
+                continue;
+            }
             $mod = $mods[$modnumber];
             if ($isediting) {
                 $editbuttons = make_editing_buttons($mod->id, $absolute, $mod->visible);
             }
-            if ($mod->visible or isteacher($course->id)) {
+            if ($mod->visible or $isteacher) {
                 $instancename = urldecode($modinfo[$modnumber]->name);
                 if ($mod->visible) {
                     $link_css = "";
                 } else {
                     $link_css = " class=\"dimmed\" ";
                 }
-                $modicon[] = "<img src=\"$CFG->wwwroot/mod/$mod->modname/icon.gif\" height=\"16\" width=\"16\" alt=\"$mod->modfullname\">";
-                $moddata[] = "<a title=\"$mod->modfullname\" $link_css href=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">$instancename</a><BR>$editbuttons";
+                $modicon[] = "<img src=\"$CFG->wwwroot/mod/$mod->modname/icon.gif\"".
+                             " height=\"16\" width=\"16\" alt=\"$mod->modfullname\">";
+                $moddata[] = "<a title=\"$mod->modfullname\" $link_css ".
+                             "href=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">$instancename</a>".
+                             "<br />$editbuttons";
             }
         }
     }
@@ -594,7 +609,17 @@ function print_section_block($heading, $course, $section, $mods, $modnames, $mod
 
 
 function print_section($course, $section, $mods, $modnamesused, $absolute=false, $width="100%") {
+/// Prints a section full of activity modules
     global $CFG;
+    static $isteacher;
+    static $isediting;
+
+    if (!isset($isteacher)) {
+        $isteacher = isteacher($course->id);
+    }
+    if (!isset($isediting)) {
+        $isediting = isediting($course->id);
+    }
 
     $modinfo = unserialize($course->modinfo);
 
@@ -608,22 +633,23 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                 continue;
             }
             $mod = $mods[$modnumber];
-            if ($mod->visible or isteacher($course->id)) {
+            if ($mod->visible or $isteacher) {
                 $instancename = urldecode($modinfo[$modnumber]->name);
                 if ($mod->visible) {
                     $link_css = "";
                 } else {
                     $link_css = " class=\"dimmed\" ";
                 }
-                echo "<img src=\"$CFG->wwwroot/mod/$mod->modname/icon.gif\" height=16 width=16 alt=\"$mod->modfullname\">";
-                echo " <font size=2><a title=\"$mod->modfullname\" $link_css";
-                echo "   href=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">$instancename</a></font>";
+                echo "<img src=\"$CFG->wwwroot/mod/$mod->modname/icon.gif\"".
+                     " height=16 width=16 alt=\"$mod->modfullname\">".
+                     " <font size=2><a title=\"$mod->modfullname\" $link_css ".
+                     " href=\"$CFG->wwwroot/mod/$mod->modname/view.php?id=$mod->id\">$instancename</a></font>";
             }
             if (isediting($course->id)) {
                 echo "&nbsp;&nbsp;";
                 echo make_editing_buttons($mod->id, $absolute, $mod->visible);
             }
-            if ($mod->visible or isteacher($course->id)) {
+            if ($mod->visible or $isteacher) {
                 echo "<br />\n";
             }
         }

diff --git a/index.php b/index.php
index 12e4d56c0a9f36265f1c2358087a57533e92d19a..11de6152d52647418389d81f6ca20dfabfb2e9b5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -53,7 +53,7 @@
          if ($sections[0]->sequence or isediting($site->id)) {
              get_all_mods($site->id, $mods, $modnames, $modnamesplural, $modnamesused);
              print_section_block(get_string("mainmenu"), $site, $sections[0], 
-                                 $mods, $modnames, $modnamesused, true, $side, isediting($site->id));
+                                 $mods, $modnames, $modnamesused, true, $side);
          }
 
          if (isadmin()) {