diff --git a/report/log/classes/event/content_viewed.php b/report/log/classes/event/content_viewed.php new file mode 100644 index 00000000000..47f1dedf89c --- /dev/null +++ b/report/log/classes/event/content_viewed.php @@ -0,0 +1,35 @@ +. + +/** + * Event for when some content in log report is viewed. + * + * @package report_log + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace report_log\event; + +/** + * Event triggered, when some content in log report is viewed. + * + * @package report_log + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class content_viewed extends \core\event\content_viewed { +} + diff --git a/report/log/graph.php b/report/log/graph.php index 58a49cb9ff1..aa075ae8403 100644 --- a/report/log/graph.php +++ b/report/log/graph.php @@ -67,7 +67,12 @@ if ($type === "userday.png") { } } -add_to_log($course->id, 'course', 'report log', "report/log/graph.php?user=$user->id&id=$course->id&type=$type&date=$date", $course->id); +// Trigger a content view event. +$event = \report_log\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'log graph'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, 'course', 'report log', "report/log/graph.php?user=$user->id&id=$course->id&type=$type&date=$date", $course->id)); +$event->trigger(); $logs = array(); diff --git a/report/log/index.php b/report/log/index.php index 6c0e7ede425..6468d0427e1 100644 --- a/report/log/index.php +++ b/report/log/index.php @@ -115,7 +115,12 @@ $context = context_course::instance($course->id); require_capability('report/log:view', $context); -add_to_log($course->id, "course", "report log", "report/log/index.php?id=$course->id", $course->id); +// Trigger a content view event. +$event = \report_log\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'logs'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, "course", "report log", "report/log/index.php?id=$course->id", $course->id)); +$event->trigger(); if (!empty($page)) { $strlogs = get_string('logs'). ": ". get_string('page', 'report_log', $page+1); diff --git a/report/log/user.php b/report/log/user.php index 32ed5821233..e8d92573787 100644 --- a/report/log/user.php +++ b/report/log/user.php @@ -62,8 +62,6 @@ if ($mode === 'today') { } } -add_to_log($course->id, 'course', 'report log', "report/log/user.php?id=$user->id&course=$course->id&mode=$mode", $course->id); - $stractivityreport = get_string('activityreport'); $PAGE->set_pagelayout('admin'); @@ -72,6 +70,14 @@ $PAGE->navigation->extend_for_user($user); $PAGE->navigation->set_userid_for_parent_checks($user->id); // see MDL-25805 for reasons and for full commit reference for reversal when fixed. $PAGE->set_title("$course->shortname: $stractivityreport"); $PAGE->set_heading($course->fullname); + +// Trigger a content view event. +$event = \report_log\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'user logs'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, 'course', 'report log', "report/log/user.php?id=$user->id&course=$course->id&mode=$mode", $course->id)); +$event->trigger(); + echo $OUTPUT->header(); if ($mode === 'today') { diff --git a/report/loglive/classes/event/content_viewed.php b/report/loglive/classes/event/content_viewed.php new file mode 100644 index 00000000000..b27c46909e3 --- /dev/null +++ b/report/loglive/classes/event/content_viewed.php @@ -0,0 +1,35 @@ +. + +/** + * Event for when some content in loglive report is viewed. + * + * @package report_loglive + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace report_loglive\event; + +/** + * Event triggered, when some content in loglive report is viewed. + * + * @package report_loglive + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class content_viewed extends \core\event\content_viewed { +} + diff --git a/report/loglive/index.php b/report/loglive/index.php index 782679bc4cf..90e3eb90671 100644 --- a/report/loglive/index.php +++ b/report/loglive/index.php @@ -48,8 +48,6 @@ $strlivelogs = get_string('livelogs', 'report_loglive'); if ($inpopup) { session_get_instance()->write_close(); - add_to_log($course->id, 'course', 'report live', "report/loglive/index.php?id=$course->id", $course->id); - $date = time() - 3600; $url = new moodle_url('/report/loglive/index.php', array('id'=>$course->id, 'user'=>0, 'date'=>$date, 'inpopup'=>1)); @@ -65,6 +63,13 @@ if ($inpopup) { $PAGE->set_heading($strlivelogs); echo $OUTPUT->header(); + // Trigger a content view event. + $event = \report_loglive\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'loglive'))); + $event->set_page_detail(); + $event->set_legacy_logdata(array($course->id, 'course', 'report live', "report/loglive/index.php?id=$course->id", $course->id)); + $event->trigger(); + print_log($course, 0, $date, "l.time DESC", $page, 500, $url); echo $OUTPUT->footer(); diff --git a/report/outline/classes/event/content_viewed.php b/report/outline/classes/event/content_viewed.php new file mode 100644 index 00000000000..f59ed1e3114 --- /dev/null +++ b/report/outline/classes/event/content_viewed.php @@ -0,0 +1,35 @@ +. + +/** + * Event for when some content in outline report is viewed. + * + * @package report_outline + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace report_outline\event; + +/** + * Event for when some content in outline report is viewed. + * + * @package report_outline + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class content_viewed extends \core\event\content_viewed { +} + diff --git a/report/outline/index.php b/report/outline/index.php index 592c60b0dd9..c2054f16ee8 100644 --- a/report/outline/index.php +++ b/report/outline/index.php @@ -37,7 +37,12 @@ require_login($course); $context = context_course::instance($course->id); require_capability('report/outline:view', $context); -add_to_log($course->id, 'course', 'report outline', "report/outline/index.php?id=$course->id", $course->id); +// Trigger a content view event. +$event = \report_outline\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'outline'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, 'course', 'report outline', "report/outline/index.php?id=$course->id", $course->id)); +$event->trigger(); $showlastaccess = true; $hiddenfields = explode(',', $CFG->hiddenuserfields); diff --git a/report/outline/user.php b/report/outline/user.php index d1918614266..e0d7406445d 100644 --- a/report/outline/user.php +++ b/report/outline/user.php @@ -53,7 +53,12 @@ if (!report_outline_can_access_user_report($user, $course, true)) { require_capability('report/outline:view', $coursecontext); } -add_to_log($course->id, 'course', 'report outline', "report/outline/user.php?id=$user->id&course=$course->id&mode=$mode", $course->id); +// Trigger a content view event. +$event = \report_outline\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'user outline'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, 'course', 'report outline', "report/outline/user.php?id=$user->id&course=$course->id&mode=$mode", $course->id)); +$event->trigger(); $stractivityreport = get_string('activityreport'); diff --git a/report/participation/classes/event/content_viewed.php b/report/participation/classes/event/content_viewed.php new file mode 100644 index 00000000000..495b1ff2161 --- /dev/null +++ b/report/participation/classes/event/content_viewed.php @@ -0,0 +1,35 @@ +. + +/** + * Event for when some content in participation report is viewed. + * + * @package report_participation + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace report_participation\event; + +/** + * Event triggered, when some content in participation report is viewed. + * + * @package report_participation + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class content_viewed extends \core\event\content_viewed { +} + diff --git a/report/participation/index.php b/report/participation/index.php index 7b0efd31fd4..029fb6fff38 100644 --- a/report/participation/index.php +++ b/report/participation/index.php @@ -63,8 +63,6 @@ require_login($course); $context = context_course::instance($course->id); require_capability('report/participation:view', $context); -add_to_log($course->id, "course", "report participation", "report/participation/index.php?id=$course->id", $course->id); - $strparticipation = get_string('participationreport'); $strviews = get_string('views'); $strposts = get_string('posts'); @@ -84,6 +82,13 @@ $PAGE->set_title($course->shortname .': '. $strparticipation); $PAGE->set_heading($course->fullname); echo $OUTPUT->header(); +// Trigger a content view event. +$event = \report_participation\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'participants'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, "course", "report participation", "report/participation/index.php?id=$course->id", $course->id)); +$event->trigger(); + $modinfo = get_fast_modinfo($course); $modules = $DB->get_records_select('modules', "visible = 1", null, 'name ASC'); diff --git a/report/stats/classes/event/content_viewed.php b/report/stats/classes/event/content_viewed.php new file mode 100644 index 00000000000..374e284534d --- /dev/null +++ b/report/stats/classes/event/content_viewed.php @@ -0,0 +1,35 @@ +. + +/** + * Event for when some content in stats report is viewed. + * + * @package report_stats + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +namespace report_stats\event; + +/** + * Event triggered, when some content in stats report is viewed. + * + * @package report_stats + * @copyright 2013 Ankit Agarwal + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class content_viewed extends \core\event\content_viewed { +} + diff --git a/report/stats/graph.php b/report/stats/graph.php index f45a58799e9..e6e4a720b41 100644 --- a/report/stats/graph.php +++ b/report/stats/graph.php @@ -62,7 +62,12 @@ if (!empty($userid)) { require_capability('report/stats:view', $coursecontext); } -add_to_log($course->id, 'course', 'report stats', "report/stats/graph.php?userid=$userid&id=$course->id&mode=$mode&roleid=$roleid", $course->id); +// Trigger a content view event. +$event = \report_stats\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'stats graph'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, 'course', 'report stats', "report/stats/graph.php?userid=$userid&id=$course->id&mode=$mode&roleid=$roleid", $course->id)); +$event->trigger(); stats_check_uptodate($course->id); diff --git a/report/stats/index.php b/report/stats/index.php index 997d24194cf..0ab4c041389 100644 --- a/report/stats/index.php +++ b/report/stats/index.php @@ -67,7 +67,12 @@ $PAGE->set_url(new moodle_url('/report/stats/index.php', array('course' => $cour 'mode' => $mode, 'userid' => $userid))); -add_to_log($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id); +// Trigger a content view event. +$event = \report_stats\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'stats'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id)); +$event->trigger(); stats_check_uptodate($course->id); if ($course->id == SITEID) { diff --git a/report/stats/user.php b/report/stats/user.php index fce42e72fe6..ea5e8f30ce8 100644 --- a/report/stats/user.php +++ b/report/stats/user.php @@ -49,8 +49,6 @@ if (!report_stats_can_access_user_report($user, $course, true)) { error('Can not access user statistics report'); } -add_to_log($course->id, 'course', 'report stats', "report/stats/user.php?id=$user->id&course=$course->id", $course->id); - $stractivityreport = get_string('activityreport'); $PAGE->set_pagelayout('admin'); @@ -61,6 +59,12 @@ $PAGE->set_title("$course->shortname: $stractivityreport"); $PAGE->set_heading($course->fullname); echo $OUTPUT->header(); +// Trigger a content view event. +$event = \report_stats\event\content_viewed::create(array('courseid' => $course->id, + 'other' => array('content' => 'user stats'))); +$event->set_page_detail(); +$event->set_legacy_logdata(array($course->id, 'course', 'report stats', "report/stats/user.php?id=$user->id&course=$course->id", $course->id)); +$event->trigger(); if (empty($CFG->enablestats)) { print_error('statsdisable', 'error');