MDL-35339 avoid using get_all_sections(), get_all_mods() and field se…

…ction.sequence directly
NoelDeMartin · Oct 15, 2012 · 71a56e0 · 71a56e0
1 parent ecfe814
commit 71a56e0
Show file tree

Hide file tree

Showing 31 changed files with 65 additions and 154 deletions.
diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
@@ -29,10 +29,10 @@ function get_content() {
         require_once($CFG->dirroot.'/course/lib.php');
         $context = context_course::instance($course->id);
         $isediting = $this->page->user_is_editing() && has_capability('moodle/course:manageactivities', $context);
-        $modinfo = get_fast_modinfo($course);
 
 /// extra fast view mode
         if (!$isediting) {
+            $modinfo = get_fast_modinfo($course);
             if (!empty($modinfo->sections[0])) {
                 $options = array('overflowdiv'=>true);
                 foreach($modinfo->sections[0] as $cmid) {
@@ -62,7 +62,7 @@ function get_content() {
 /// slow & hacky editing mode
         $ismoving = ismoving($course->id);
         $section  = get_course_section(0, $course->id);
-
+        $modinfo = get_fast_modinfo($course);
         get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
 
         $groupbuttons = $course->groupmode;
@@ -82,14 +82,13 @@ function get_content() {
             $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         }
 
-        if (!empty($section->sequence)) {
-            $sectionmods = explode(',', $section->sequence);
+        if (!empty($modinfo->sections[0])) {
             $options = array('overflowdiv'=>true);
-            foreach ($sectionmods as $modnumber) {
-                if (empty($mods[$modnumber])) {
+            foreach ($modinfo->sections[0] as $modnumber) {
+                $mod = $modinfo->cms[$modnumber];
+                if (!$mod->uservisible) {
                     continue;
                 }
-                $mod = $mods[$modnumber];
                 if (!$ismoving) {
                     if ($groupbuttons) {
                         if (! $mod->groupmodelink = $groupbuttonslink) {

diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
@@ -64,11 +64,8 @@ function get_content() {
 
 /// slow & hacky editing mode
         $ismoving = ismoving($course->id);
-        $sections = get_all_sections($course->id);
-
-        if(!empty($sections) && isset($sections[0])) {
-            $section = $sections[0];
-        }
+        $modinfo = get_fast_modinfo($course);
+        $section = $modinfo->get_section_info(0);
 
         if (!empty($section)) {
             get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
@@ -91,14 +88,13 @@ function get_content() {
             $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
         }
 
-        if (!empty($section) && !empty($section->sequence)) {
-            $sectionmods = explode(',', $section->sequence);
+        if (!empty($modinfo->sections[0])) {
             $options = array('overflowdiv'=>true);
-            foreach ($sectionmods as $modnumber) {
-                if (empty($mods[$modnumber])) {
+            foreach ($modinfo->sections[0] as $modnumber) {
+                $mod = $modinfo->cms[$modnumber];
+                if (!$mod->uservisible) {
                     continue;
                 }
-                $mod = $mods[$modnumber];
                 if (!$ismoving) {
                     if ($groupbuttons) {
                         if (! $mod->groupmodelink = $groupbuttonslink) {

diff --git a/course/externallib.php b/course/externallib.php
@@ -105,13 +105,12 @@ public static function get_course_contents($courseid, $options = array()) {
 
             //retrieve sections
             $modinfo = get_fast_modinfo($course);
-            $sections = get_all_sections($course->id);
+            $sections = $modinfo->get_section_info_all();
 
             //for each sections (first displayed to last displayed)
             foreach ($sections as $key => $section) {
 
-                $showsection = (has_capability('moodle/course:viewhiddensections', $context) or $section->visible or !$course->hiddensections);
-                if (!$showsection) {
+                if (!$section->uservisible) {
                     continue;
                 }
 

diff --git a/course/recent.php b/course/recent.php
@@ -91,11 +91,9 @@
     $hiddenfilter = "AND cs.visible = 1";
 }
 $sections = array();
-$rawsections = array_slice(get_all_sections($course->id), 0, $course->numsections+1, true);
-$canviewhidden = has_capability('moodle/course:viewhiddensections', $context);
-foreach ($rawsections as $section) {
-    if ($canviewhidden || !empty($section->visible)) {
-        $sections[$section->section] = $section;
+foreach ($modinfo->get_section_info_all() as $i => $section) {
+    if (!empty($section->uservisible)) {
+        $sections[$i] = $section;
     }
 }
 
@@ -115,20 +113,18 @@
     }
 
 } else if (is_numeric($param->modid)) {
-    $section = $sections[$modinfo->cms[$param->modid]->sectionnum];
-    $section->sequence = $param->modid;
-    $sections = array($section->sequence=>$section);
+    $sectionnum = $modinfo->cms[$param->modid]->sectionnum;
+    $filter_modid = $param->modid;
+    $sections = array($sectionnum => $sections[$sectionnum]);
 }
 
 
-if (is_null($modinfo->groups)) {
-    $modinfo->groups = groups_get_user_groups($course->id); // load all my groups and cache it in modinfo
-}
+$modinfo->get_groups(); // load all my groups and cache it in modinfo
 
 $activities = array();
 $index = 0;
 
-foreach ($sections as $section) {
+foreach ($sections as $sectionnum => $section) {
 
     $activity = new stdClass();
     $activity->type = 'section';
@@ -141,17 +137,11 @@
     $activity->visible = $section->visible;
     $activities[$index++] = $activity;
 
-    if (empty($section->sequence)) {
+    if (empty($modinfo->sections[$sectionnum])) {
         continue;
     }
 
-    $sectionmods = explode(",", $section->sequence);
-
-    foreach ($sectionmods as $cmid) {
-        if (!isset($mods[$cmid]) or !isset($modinfo->cms[$cmid])) {
-            continue;
-        }
-
+    foreach($modinfo->sections[$sectionnum] as $cmid) {
         $cm = $modinfo->cms[$cmid];
 
         if (!$cm->uservisible) {
@@ -162,6 +152,10 @@
             continue;
         }
 
+        if (!empty($filter_modid) and $cmid != $filter_modid) {
+            continue;
+        }
+
         $libfile = "$CFG->dirroot/mod/$cm->modname/lib.php";
 
         if (file_exists($libfile)) {

diff --git a/course/recent_form.php b/course/recent_form.php
@@ -36,7 +36,6 @@ function definition() {
         $mform =& $this->_form;
         $context = context_course::instance($COURSE->id);
         $modinfo = get_fast_modinfo($COURSE);
-        $sections = get_all_sections($COURSE->id);
 
         $mform->addElement('header', 'filters', get_string('managefilters')); //TODO: add better string
 
@@ -127,7 +126,7 @@ function definition() {
         }
 
         foreach ($modinfo->sections as $section=>$cmids) {
-            $options["section/$section"] = "-- ".get_section_name($COURSE, $sections[$section])." --";
+            $options["section/$section"] = "-- ".get_section_name($COURSE, $section)." --";
             foreach ($cmids as $cmid) {
                 $cm = $modinfo->cms[$cmid];
                 if (empty($modsused[$cm->modname]) or !$cm->uservisible) {

diff --git a/course/resources.php b/course/resources.php
@@ -65,9 +65,6 @@
 
 $modinfo = get_fast_modinfo($course);
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 $cms = array();
 $resources = array();
 foreach ($modinfo->cms as $cm) {
@@ -116,7 +113,7 @@
         $printsection = '';
         if ($cm->sectionnum !== $currentsection) {
             if ($cm->sectionnum) {
-                $printsection = get_section_name($course, $sections[$cm->sectionnum]);
+                $printsection = get_section_name($course, $cm->sectionnum);
             }
             if ($currentsection !== '') {
                 $table->data[] = 'hr';

diff --git a/mod/assignment/index.php b/mod/assignment/index.php
@@ -37,9 +37,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 
 $timenow = time();
 
@@ -74,7 +71,7 @@
     if ($usesections) {
         if ($cm->sectionnum !== $currentsection) {
             if ($cm->sectionnum) {
-                $printsection = get_section_name($course, $sections[$cm->sectionnum]);
+                $printsection = get_section_name($course, $cm->sectionnum);
             }
             if ($currentsection !== "") {
                 $table->data[] = 'hr';

diff --git a/mod/assignment/type/online/all.php b/mod/assignment/type/online/all.php
@@ -47,8 +47,6 @@
 // get all the assignments in the course
 $assignments = get_all_instances_in_course('assignment',$course, $USER->id );
 
-$sections = get_all_sections($course->id);
-
 // array to hold display data
 $views = array();
 
@@ -98,7 +96,7 @@
     $view = new stdClass;
 
     // start to build view object
-    $view->section = get_section_name($course, $sections[$assignment->section]);
+    $view->section = get_section_name($course, $assignment->section);
 
     $view->name = $assignment->name;
     $view->submitted = $submitted;

diff --git a/mod/book/index.php b/mod/book/index.php
@@ -57,9 +57,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 
 $table = new html_table();
 $table->attributes['class'] = 'generaltable mod_index';
@@ -80,7 +77,7 @@
         $printsection = '';
         if ($book->section !== $currentsection) {
             if ($book->section) {
-                $printsection = get_section_name($course, $sections[$book->section]);
+                $printsection = get_section_name($course, $book->section);
             }
             if ($currentsection !== '') {
                 $table->data[] = 'hr';

diff --git a/mod/chat/index.php b/mod/chat/index.php
@@ -38,9 +38,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 
 /// Print the list of instances (your module will probably extend this)
 
@@ -69,7 +66,7 @@
     $printsection = '';
     if ($chat->section !== $currentsection) {
         if ($chat->section) {
-            $printsection = get_section_name($course, $sections[$chat->section]);
+            $printsection = get_section_name($course, $chat->section);
         }
         if ($currentsection !== '') {
             $table->data[] = 'hr';

diff --git a/mod/choice/index.php b/mod/choice/index.php
@@ -29,9 +29,6 @@
     }
 
     $usesections = course_format_uses_sections($course->format);
-    if ($usesections) {
-        $sections = get_all_sections($course->id);
-    }
 
     $sql = "SELECT cha.*
               FROM {choice} ch, {choice_answers} cha
@@ -76,7 +73,7 @@
             $printsection = "";
             if ($choice->section !== $currentsection) {
                 if ($choice->section) {
-                    $printsection = get_section_name($course, $sections[$choice->section]);
+                    $printsection = get_section_name($course, $choice->section);
                 }
                 if ($currentsection !== "") {
                     $table->data[] = 'hr';

diff --git a/mod/data/index.php b/mod/data/index.php
@@ -56,9 +56,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 
 $timenow  = time();
 $strname  = get_string('name');
@@ -120,7 +117,7 @@
     if ($usesections) {
         if ($data->section !== $currentsection) {
             if ($data->section) {
-                $printsection = get_section_name($course, $sections[$data->section]);
+                $printsection = get_section_name($course, $data->section);
             }
             if ($currentsection !== '') {
                 $table->data[] = 'hr';

diff --git a/mod/feedback/index.php b/mod/feedback/index.php
@@ -61,9 +61,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 
 /// Print the list of instances (your module will probably extend this)
 
@@ -105,7 +102,7 @@
     $link = '<a '.$dimmedclass.' href="'.$viewurl->out().'">'.$feedback->name.'</a>';
 
     if ($usesections) {
-        $tabledata = array (get_section_name($course, $sections[$feedback->section]), $link);
+        $tabledata = array (get_section_name($course, $feedback->section), $link);
     } else {
         $tabledata = array ($link);
     }

diff --git a/mod/folder/index.php b/mod/folder/index.php
@@ -54,9 +54,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-if ($usesections) {
-    $sections = get_all_sections($course->id);
-}
 
 $table = new html_table();
 $table->attributes['class'] = 'generaltable mod_index';
@@ -77,7 +74,7 @@
         $printsection = '';
         if ($folder->section !== $currentsection) {
             if ($folder->section) {
-                $printsection = get_section_name($course, $sections[$folder->section]);
+                $printsection = get_section_name($course, $folder->section);
             }
             if ($currentsection !== '') {
                 $table->data[] = 'hr';

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
@@ -219,7 +219,6 @@
         $modinfo = get_fast_modinfo($course);
         if (isset($modinfo->instances['forum'])) {
             $forummenu = array();
-            $sections = get_all_sections($course->id);
             // Check forum types and eliminate simple discussions.
             $forumcheck = $DB->get_records('forum', array('course' => $course->id),'', 'id, type');
             foreach ($modinfo->instances['forum'] as $forumcm) {
@@ -228,7 +227,7 @@
                     continue;
                 }
                 $section = $forumcm->sectionnum;
-                $sectionname = get_section_name($course, $sections[$section]);
+                $sectionname = get_section_name($course, $section);
                 if (empty($forummenu[$section])) {
                     $forummenu[$section] = array($sectionname => array());
                 }

diff --git a/mod/forum/index.php b/mod/forum/index.php
@@ -104,7 +104,6 @@
 }
 
 $usesections = course_format_uses_sections($course->format);
-$sections = get_all_sections($course->id);
 
 $table = new html_table();
 
@@ -358,7 +357,7 @@
             $forum->intro = shorten_text(format_module_intro('forum', $forum, $cm->id), $CFG->forum_shortpost);
 
             if ($cm->sectionnum != $currentsection) {
-                $printsection = get_section_name($course, $sections[$cm->sectionnum]);
+                $printsection = get_section_name($course, $cm->sectionnum);
                 if ($currentsection) {
                     $learningtable->data[] = 'hr';
                 }