WebSVN – Moodle – Diff – /report/log/classes/renderable.php

     public $origin;
     /** @var int group id */
+    public $groupid;
+    /** @var int forces the use of a course filter in site context */
-    public $groupid;
+    public $sitecoursefilter;
-    /** @var table_log table log which will be used for rendering logs */
-    public $tablelog;
+    /** @var table_log table log which will be used for rendering logs */
+    public $tablelog;
-    /**
+    /** @var array Index of delegated sections (indexed by component and itemid) */
-     * @var array group ids
-     * @deprecated since Moodle 4.4 - please do not use this public property
+    protected $delegatedbycm;
      * @todo MDL-81155 remove this property as it is not used anymore.
-     */
+    /** @var bool if the page is activity page */
-    public $grouplist;
+    public $isactivitypage;
      * @param int $date date (optional) timestamp of start of the day for which logs will be displayed.
      * @param string $logformat log format.
      * @param int $page (optional) page number.
      * @param int $perpage (optional) number of records to show per page.
      * @param string $order (optional) sortorder of fetched records
+     * @param string $origin (optional) origin of the event.
+     * @param bool $isactivitypage (optional) if the page is activity page.
+     * @param int $sitecoursefilter (optional) use a course filter in site context.
      */
-    public function __construct($logreader = "", $course = 0, $userid = 0, $modid = 0, $action = "", $groupid = 0, $edulevel = -1,
+    public function __construct(
+        $logreader = "",
+        $course = 0,
+        $userid = 0,
+        $modid = 0,
+        $action = "",
+        $groupid = 0,
+        $edulevel = -1,
+        $showcourses = false,
+        $showusers = false,
+        $showreport = true,
-            $showcourses = false, $showusers = false, $showreport = true, $showselectorform = true, $url = "", $date = 0,
+        $showselectorform = true,
+        $url = "",
+        $date = 0,
+        $logformat='showashtml',
+        $page = 0,
+        $perpage = 100,
-            $logformat='showashtml', $page = 0, $perpage = 100, $order = "timecreated ASC", $origin ='') {
+        $order = "timecreated ASC",
+        $origin ='',
+        bool $isactivitypage = false,
+        $sitecoursefilter = 0,
+    ) {
-        global $PAGE;
+        global $PAGE, $SITE;
         // Use first reader as selected reader, if not passed.
         if (empty($logreader)) {
         $this->selectedlogreader = $logreader;
         $url->param('logreader', $logreader);
         // Use site course id, if course is empty.
+        if (!empty($course) && is_int($course)) {
+            $courseid = $course;
-        if (!empty($course) && is_int($course)) {
+            try {
+                $course = get_course($courseid);
+            } catch (dml_missing_record_exception) {
+                // Missing courses may have be deleted, so display them in site context.
+                $course = $SITE;
+                $sitecoursefilter = $courseid;
             $course = get_course($course);
+        }
         $this->course = $course;
         $this->showusers = $showusers;
         $this->showreport = $showreport;
         $this->showselectorform = $showselectorform;
         $this->logformat = $logformat;
         $this->origin = $origin;
+        $this->isactivitypage = $isactivitypage;
+        $this->sitecoursefilter = $sitecoursefilter;
+    }
     /**
      * Get a list of enabled sql_reader objects/name
      * Helper function to return list of activities to show in selection filter.
+     *
      * @return array list of activities.
      */
     public function get_activities_list() {
-        $activities = array();
+        $activities = [];
+        $disabled = [];
         // For site just return site errors option.
         $sitecontext = context_system::instance();
         if ($this->course->id == SITEID && has_capability('report/log:view', $sitecontext)) {
             $activities["site_errors"] = get_string("siteerrors");
-            return $activities;
+            return [$activities, $disabled];
+        }
+        $modinfo = get_fast_modinfo($this->course);
+        if (!$this->delegatedbycm) {
+            $this->delegatedbycm = $modinfo->get_sections_delegated_by_cm();
+        }
         $modinfo = get_fast_modinfo($this->course);
         if (!empty($modinfo->cms)) {
             $section = 0;
-            $thissection = array();
-            foreach ($modinfo->cms as $cm) {
+            $thissection = array();
-                // Exclude activities that aren't visible or have no view link (e.g. label). Account for folders displayed inline.
+            foreach ($modinfo->cms as $cm) {
-                if (!$cm->uservisible || (!$cm->has_view() && strcmp($cm->modname, 'folder') !== 0)) {
+                if (!$modname = $this->get_activity_name($cm)) {
+                    continue;
                     continue;
+                if ($cm->sectionnum > 0 and $section <> $cm->sectionnum) {
+                    $sectioninfo = $modinfo->get_section_info($cm->sectionnum);
+                    // Don't show subsections here. We are showing them in the corresponding module.
+                    if ($sectioninfo->get_component_instance()) {
+                        continue;
+                    }
                 if ($cm->sectionnum > 0 and $section <> $cm->sectionnum) {
                     $activities[] = $thissection;
                     $thissection = array();
-                }
-                $section = $cm->sectionnum;
-                $modname = strip_tags($cm->get_formatted_name());
-                if (core_text::strlen($modname) > 55) {
-                    $modname = core_text::substr($modname, 0, 50)."...";
-                }
-                if (!$cm->visible) {
                     $modname = "(".$modname.")";
                 $section = $cm->sectionnum;
                 $key = get_section_name($this->course, $cm->sectionnum);
                 if (!isset($thissection[$key])) {
-                    $thissection[$key] = array();
+                    $thissection[$key] = [];
+                }
+                $thissection[$key][$cm->id] = $modname;
+                // Check if the module is delegating a section.
+                if (array_key_exists($cm->id, $this->delegatedbycm)) {
+                    $delegated = $this->delegatedbycm[$cm->id];
+                    $modules = (empty($delegated->sequence)) ? [] : explode(',', $delegated->sequence);
+                    $thissection[$key] = $thissection[$key] + $this->get_delegated_section_activities($modinfo, $modules);
                     $disabled[] = $cm->id;
                 $thissection[$key][$cm->id] = $modname;
+            }
             if (!empty($thissection)) {
                 $activities[] = $thissection;
+            }
+        }
+        return [$activities, $disabled];
+    }
+    /**
+     * Helper function to return list of activities in a delegated section.
+     *
+     * @param course_modinfo $modinfo
+     * @param array $cms List of cm ids in the section.
+     * @return array list of activities.
+     */
+    protected function get_delegated_section_activities(course_modinfo $modinfo, array $cmids): array {
+        $activities = [];
+        $indenter = '&nbsp;&nbsp;&nbsp;&nbsp;';
+        foreach ($cmids as $cmid) {
+            $cm = $modinfo->cms[$cmid];
+            if ($modname = $this->get_activity_name($cm)) {
+                $activities[$cmid] = $indenter.$modname;
+            }
+        }
         return $activities;
+    }
+    /**
+     * Helper function to return the name to show in the dropdown.
+     *
+     * @param cm_info $cm
+     * @return string The name.
+     */
+    private function get_activity_name(cm_info $cm): string {
+        // Exclude activities that aren't visible or have no view link (e.g. label). Account for folders displayed inline.
+        // Activities delegating sections might not have a URL, but should be return a name to be shown.
+        $tobeshown = (strcmp($cm->modname, 'folder') == 0) || array_key_exists($cm->id, $this->delegatedbycm);
+        if (!$cm->uservisible || (!$cm->has_view() && !$tobeshown)) {
+            return '';
+        }
+        $modname = strip_tags($cm->get_formatted_name());
+        if (core_text::strlen($modname) > 55) {
+            $modname = core_text::substr($modname, 0, 50)."...";
+        }
+        if (!$cm->visible) {
+            $modname = "(".$modname.")";
+        }
+        return $modname;
+    }
     /**
      * Helper function to get selected group.
+     *
                     } else {
                         $courses[$course->id] = format_string(get_course_display_name_for_list($course));
+                    }
+                }
+            }
+            // If filtering by a missing course, add a placeholder.
+            if (!empty($this->sitecoursefilter)) {
+                $courses[$this->sitecoursefilter] = get_string('missingcourse', 'report_log', [
+                    'instanceid' => $this->sitecoursefilter,
+                ]);
+            }
             core_collator::asort($courses);
+        }
         return $courses;
+    }
+        }
         $cgroups = groups_get_all_groups($this->course->id, $userid);
         if (!empty($cgroups)) {
             $grouplist = array_column($cgroups, 'name', 'id');
+        }
-        $this->grouplist = $grouplist; // Keep compatibility with MDL-41465.
         return $grouplist;
+    }
     /**
         $filter->edulevel = $this->edulevel;
         $filter->action = $this->action;
         $filter->date = $this->date;
         $filter->orderby = $this->order;
         $filter->origin = $this->origin;
+        $filter->sitecoursefilter = $this->sitecoursefilter;
         // If showing site_errors.
         if ('site_errors' === $this->modid) {
             $filter->siteerrors = true;
             $filter->modid = 0;
+        }

Proyectos de Subversion Moodle

(root)/report/log/classes/renderable.php – Rev 1 → 1441