From fce2e176332f5a58ef93fe1ef8345b85b74fc571 Mon Sep 17 00:00:00 2001 From: Mathew May Date: Mon, 24 Aug 2020 17:42:19 +0800 Subject: [PATCH 1/5] MDL-52805 core: Add debugging for old event functions --- lib/classes/event/base.php | 9 +++++++++ lib/upgrade.txt | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/lib/classes/event/base.php b/lib/classes/event/base.php index bf38916972a..b0872145605 100644 --- a/lib/classes/event/base.php +++ b/lib/classes/event/base.php @@ -266,6 +266,15 @@ abstract class base implements \IteratorAggregate { if ($expectedcourseid != $event->data['courseid']) { debugging("Inconsistent courseid - context combination detected.", DEBUG_DEVELOPER); } + + if (method_exists($event, 'get_legacy_logdata') || + method_exists($event, 'set_legacy_logdata') || + method_exists($event, 'get_legacy_eventname') || + method_exists($event, 'get_legacy_eventdata') + ) { + debugging("Invalid event functions defined in " . $event->data['eventname'], DEBUG_DEVELOPER); + } + } // Let developers validate their custom data (such as $this->data['other'], contextlevel, etc.). diff --git a/lib/upgrade.txt b/lib/upgrade.txt index 98cea6f9b14..f7895d85923 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -578,6 +578,10 @@ defined or can't be applied. - message_unblock_contact - message_block_contact - message_get_contact + - get_legacy_logdata + - set_legacy_logdata + - get_legacy_eventname + - get_legacy_eventdata * The following renamed classes have been completely removed: - course_in_list (now: core_course_list_element) - coursecat (now: core_course_category) From e5ca7766e740429353f2f03e6186608468f3b0e1 Mon Sep 17 00:00:00 2001 From: Mathew May Date: Wed, 11 Jan 2023 17:11:57 +0800 Subject: [PATCH 2/5] MDL-52805 core: Remove legacy log calls --- .../classes/event/preset_deleted.php | 4 - .../classes/event/preset_exported.php | 4 - .../classes/event/preset_imported.php | 4 - .../classes/event/preset_loaded.php | 4 - .../classes/event/preset_reverted.php | 4 - .../classes/event/presets_listed.php | 4 - .../tests/event/preset_deleted_test.php | 2 - .../tests/event/preset_exported_test.php | 2 - .../tests/event/preset_imported_test.php | 2 - .../tests/event/preset_loaded_test.php | 2 - .../tests/event/preset_reverted_test.php | 2 - .../tests/event/presets_listed_test.php | 2 - .../classes/event/report_viewed.php | 9 - .../capability/tests/event/events_test.php | 2 - .../log/store/legacy/tests/fixtures/event.php | 17 -- auth/ldap/tests/plugin_test.php | 6 - blog/tests/event/events_test.php | 22 -- calendar/tests/event/events_test.php | 6 - cohort/tests/lib_test.php | 5 - course/classes/category.php | 7 - course/lib.php | 2 - course/resources.php | 1 - course/tests/courselib_test.php | 117 -------- enrol/meta/tests/plugin_test.php | 13 - enrol/tests/enrollib_test.php | 15 -- group/tests/lib_test.php | 38 --- h5p/classes/event/h5p_deleted.php | 11 +- h5p/classes/event/h5p_viewed.php | 11 +- lib/classes/event/base.php | 49 ---- .../event/blog_association_created.php | 15 -- lib/classes/event/blog_entries_viewed.php | 16 -- lib/classes/event/blog_entry_created.php | 28 -- lib/classes/event/blog_entry_deleted.php | 28 -- lib/classes/event/blog_entry_updated.php | 28 -- lib/classes/event/calendar_event_created.php | 9 - lib/classes/event/calendar_event_updated.php | 9 - lib/classes/event/cohort_created.php | 18 -- lib/classes/event/cohort_deleted.php | 18 -- lib/classes/event/cohort_member_added.php | 21 -- lib/classes/event/cohort_member_removed.php | 21 -- lib/classes/event/cohort_updated.php | 18 -- lib/classes/event/content_viewed.php | 18 -- lib/classes/event/course_category_created.php | 9 - lib/classes/event/course_category_deleted.php | 27 -- lib/classes/event/course_category_updated.php | 22 -- lib/classes/event/course_completed.php | 18 -- .../event/course_completion_updated.php | 9 - lib/classes/event/course_content_deleted.php | 22 -- lib/classes/event/course_created.php | 27 -- lib/classes/event/course_deleted.php | 30 --- .../course_module_completion_updated.php | 18 -- lib/classes/event/course_module_created.php | 38 --- lib/classes/event/course_module_deleted.php | 33 --- .../course_module_instance_list_viewed.php | 10 - lib/classes/event/course_module_updated.php | 38 --- lib/classes/event/course_module_viewed.php | 10 - .../event/course_resources_list_viewed.php | 29 -- lib/classes/event/course_restored.php | 26 -- lib/classes/event/course_section_deleted.php | 9 - lib/classes/event/course_section_updated.php | 10 - lib/classes/event/course_updated.php | 36 --- .../event/course_user_report_viewed.php | 10 - lib/classes/event/course_viewed.php | 24 -- lib/classes/event/email_failed.php | 9 - lib/classes/event/group_created.php | 18 -- lib/classes/event/group_deleted.php | 18 -- lib/classes/event/group_member_added.php | 23 -- lib/classes/event/group_member_removed.php | 21 -- lib/classes/event/group_updated.php | 18 -- lib/classes/event/grouping_created.php | 18 -- lib/classes/event/grouping_deleted.php | 18 -- lib/classes/event/grouping_updated.php | 18 -- lib/classes/event/message_contact_added.php | 10 - lib/classes/event/message_contact_removed.php | 10 - lib/classes/event/message_sent.php | 17 -- .../event/mnet_access_control_created.php | 10 - .../event/mnet_access_control_updated.php | 10 - lib/classes/event/note_created.php | 11 - lib/classes/event/note_deleted.php | 11 - lib/classes/event/note_updated.php | 11 - lib/classes/event/notes_viewed.php | 10 - .../event/question_category_created.php | 15 -- lib/classes/event/recent_activity_viewed.php | 9 - .../event/role_allow_assign_updated.php | 9 - .../event/role_allow_override_updated.php | 9 - .../event/role_allow_switch_updated.php | 9 - lib/classes/event/role_allow_view_updated.php | 9 - lib/classes/event/role_assigned.php | 31 --- .../event/role_capabilities_updated.php | 19 -- lib/classes/event/role_deleted.php | 10 - lib/classes/event/role_unassigned.php | 30 --- lib/classes/event/role_updated.php | 10 - lib/classes/event/tag_added.php | 14 - lib/classes/event/tag_flagged.php | 9 - lib/classes/event/tag_updated.php | 22 -- lib/classes/event/user_created.php | 27 -- lib/classes/event/user_deleted.php | 35 --- lib/classes/event/user_enrolment_created.php | 30 --- lib/classes/event/user_enrolment_deleted.php | 27 -- lib/classes/event/user_enrolment_updated.php | 21 -- lib/classes/event/user_graded.php | 14 - lib/classes/event/user_list_viewed.php | 9 - lib/classes/event/user_loggedin.php | 10 - lib/classes/event/user_loggedinas.php | 10 - lib/classes/event/user_loggedout.php | 28 -- lib/classes/event/user_login_failed.php | 9 - lib/classes/event/user_password_updated.php | 13 - lib/classes/event/user_profile_viewed.php | 13 - lib/classes/event/user_updated.php | 27 -- .../event/webservice_function_called.php | 18 -- lib/classes/event/webservice_login_failed.php | 19 -- .../event/webservice_service_created.php | 12 - .../event/webservice_service_deleted.php | 12 - .../event/webservice_service_updated.php | 12 - .../event/webservice_service_user_added.php | 11 - .../event/webservice_service_user_removed.php | 11 - .../event/webservice_token_created.php | 12 - lib/classes/event/webservice_token_sent.php | 9 - lib/phpunit/classes/advanced_testcase.php | 3 - lib/phpunit/classes/event_mock.php | 20 -- lib/tests/accesslib_test.php | 31 --- lib/tests/authlib_test.php | 10 - lib/tests/completionlib_test.php | 5 - lib/tests/event/events_test.php | 30 --- lib/tests/event/user_graded_test.php | 4 - .../event/user_password_updated_test.php | 3 - ...ent_course_module_instance_list_viewed.php | 2 - lib/tests/event_course_module_viewed.php | 3 - lib/tests/fixtures/event_fixtures.php | 20 -- lib/tests/moodlelib_test.php | 9 - lib/tests/session_manager_test.php | 2 - message/tests/event/events_test.php | 10 - mnet/tests/event/events_test.php | 6 - .../event/all_submissions_downloaded.php | 10 - .../classes/event/assessable_submitted.php | 36 --- mod/assign/classes/event/base.php | 29 -- .../batch_set_marker_allocation_viewed.php | 11 - .../event/batch_set_workflow_state_viewed.php | 11 - .../classes/event/extension_granted.php | 10 - mod/assign/classes/event/feedback_viewed.php | 11 - .../classes/event/grading_form_viewed.php | 13 - .../classes/event/grading_table_viewed.php | 11 - .../classes/event/identities_revealed.php | 10 - mod/assign/classes/event/marker_updated.php | 14 - .../event/remove_submission_form_viewed.php | 16 -- ...al_identities_confirmation_page_viewed.php | 11 - .../classes/event/statement_accepted.php | 12 - .../submission_confirmation_form_viewed.php | 11 - .../classes/event/submission_duplicated.php | 11 - .../classes/event/submission_form_viewed.php | 16 -- .../classes/event/submission_graded.php | 11 - .../classes/event/submission_locked.php | 12 - .../event/submission_status_updated.php | 17 -- .../event/submission_status_viewed.php | 10 - .../classes/event/submission_unlocked.php | 12 - .../classes/event/submission_viewed.php | 11 - .../classes/event/workflow_state_updated.php | 13 - .../classes/event/assessable_uploaded.php | 29 -- .../file/tests/event/events_test.php | 1 - .../classes/event/assessable_uploaded.php | 28 -- .../onlinetext/tests/event/events_test.php | 1 - mod/assign/tests/event/events_test.php | 251 ------------------ mod/book/classes/event/chapter_created.php | 10 - mod/book/classes/event/chapter_deleted.php | 10 - mod/book/classes/event/chapter_updated.php | 10 - mod/book/classes/event/chapter_viewed.php | 10 - mod/book/tests/event/events_test.php | 20 -- .../classes/event/book_exported.php | 10 - .../exportimscp/tests/event/events_test.php | 4 - .../tool/print/classes/event/book_printed.php | 10 - .../print/classes/event/chapter_printed.php | 10 - .../tool/print/tests/event/events_test.php | 7 - mod/chat/classes/event/message_sent.php | 11 - mod/chat/classes/event/sessions_viewed.php | 10 - mod/chat/tests/event/events_test.php | 14 - mod/choice/classes/event/answer_submitted.php | 16 -- mod/choice/classes/event/answer_updated.php | 16 -- mod/choice/classes/event/report_viewed.php | 10 - mod/choice/tests/event/events_test.php | 11 - mod/data/classes/event/field_created.php | 10 - mod/data/classes/event/field_deleted.php | 10 - mod/data/classes/event/field_updated.php | 10 - mod/data/classes/event/record_created.php | 10 - mod/data/classes/event/record_deleted.php | 10 - mod/data/classes/event/record_updated.php | 10 - mod/data/classes/event/template_updated.php | 10 - mod/data/classes/event/template_viewed.php | 10 - mod/data/tests/event/events_test.php | 29 -- .../classes/event/course_module_viewed.php | 14 - .../classes/event/response_deleted.php | 10 - .../classes/event/response_submitted.php | 15 -- mod/feedback/tests/event/events_test.php | 14 - mod/folder/classes/event/folder_updated.php | 10 - mod/folder/tests/event/events_test.php | 3 - .../classes/event/assessable_uploaded.php | 29 -- .../classes/event/course_module_viewed.php | 10 - mod/forum/classes/event/course_searched.php | 12 - .../classes/event/discussion_created.php | 13 - .../classes/event/discussion_deleted.php | 10 - mod/forum/classes/event/discussion_moved.php | 10 - mod/forum/classes/event/discussion_pinned.php | 11 - .../classes/event/discussion_unpinned.php | 11 - mod/forum/classes/event/discussion_viewed.php | 10 - mod/forum/classes/event/post_created.php | 12 - mod/forum/classes/event/post_deleted.php | 12 - mod/forum/classes/event/post_updated.php | 12 - .../classes/event/readtracking_disabled.php | 10 - .../classes/event/readtracking_enabled.php | 10 - .../classes/event/subscribers_viewed.php | 10 - .../classes/event/subscription_created.php | 10 - .../classes/event/subscription_deleted.php | 10 - .../classes/event/user_report_viewed.php | 12 - mod/forum/tests/event/events_test.php | 48 ---- mod/forum/tests/lib_test.php | 4 - .../classes/event/category_created.php | 11 - .../classes/event/category_deleted.php | 11 - .../classes/event/category_updated.php | 11 - .../classes/event/course_module_viewed.php | 12 - mod/glossary/classes/event/entry_approved.php | 11 - mod/glossary/classes/event/entry_created.php | 11 - mod/glossary/classes/event/entry_deleted.php | 18 -- .../classes/event/entry_disapproved.php | 11 - mod/glossary/classes/event/entry_updated.php | 11 - mod/glossary/classes/event/entry_viewed.php | 11 - mod/glossary/tests/event/events_test.php | 35 --- ...ourse_module_instance_list_viewed_test.php | 2 - .../tests/event/course_module_viewed_test.php | 2 - mod/lesson/classes/event/essay_assessed.php | 11 - .../classes/event/essay_attempt_viewed.php | 10 - mod/lesson/classes/event/highscore_added.php | 10 - .../classes/event/highscores_viewed.php | 12 - mod/lesson/classes/event/lesson_ended.php | 10 - mod/lesson/classes/event/lesson_started.php | 10 - mod/lesson/tests/event/events_test.php | 12 - .../event/unknown_service_api_called.php | 19 -- mod/quiz/classes/event/attempt_abandoned.php | 31 --- .../classes/event/attempt_becameoverdue.php | 30 --- mod/quiz/classes/event/attempt_deleted.php | 10 - .../classes/event/attempt_preview_started.php | 10 - mod/quiz/classes/event/attempt_reviewed.php | 10 - mod/quiz/classes/event/attempt_started.php | 42 --- mod/quiz/classes/event/attempt_submitted.php | 31 --- .../classes/event/attempt_summary_viewed.php | 10 - mod/quiz/classes/event/attempt_viewed.php | 10 - mod/quiz/classes/event/edit_page_viewed.php | 10 - .../classes/event/group_override_deleted.php | 10 - .../classes/event/group_override_updated.php | 10 - .../event/question_manually_graded.php | 10 - mod/quiz/classes/event/report_viewed.php | 10 - .../classes/event/user_override_deleted.php | 10 - .../classes/event/user_override_updated.php | 10 - mod/quiz/tests/event/events_test.php | 80 ------ mod/resource/tests/event/events_test.php | 4 - .../classes/event/course_module_viewed.php | 10 - .../classes/event/report_downloaded.php | 9 - mod/survey/classes/event/report_viewed.php | 10 - .../classes/event/response_submitted.php | 10 - mod/survey/tests/event/events_test.php | 8 - mod/wiki/classes/event/comments_viewed.php | 10 - mod/wiki/classes/event/page_created.php | 10 - mod/wiki/classes/event/page_deleted.php | 10 - mod/wiki/classes/event/page_diff_viewed.php | 11 - .../classes/event/page_history_viewed.php | 10 - mod/wiki/classes/event/page_locks_deleted.php | 10 - mod/wiki/classes/event/page_map_viewed.php | 10 - mod/wiki/classes/event/page_updated.php | 10 - .../classes/event/page_version_deleted.php | 10 - .../classes/event/page_version_restored.php | 10 - .../classes/event/page_version_viewed.php | 11 - mod/wiki/classes/event/page_viewed.php | 19 -- mod/wiki/tests/event/events_test.php | 50 ---- notes/tests/event/events_test.php | 19 -- .../tests/question_category_object_test.php | 2 - .../classes/event/user_report_viewed.php | 10 - report/completion/tests/event/events_test.php | 3 - report/eventlist/classes/list_generator.php | 1 - report/eventlist/eventdetail.php | 1 - report/log/classes/event/report_viewed.php | 9 - .../log/classes/event/user_report_viewed.php | 10 - report/log/tests/event/events_test.php | 5 - .../loglive/classes/event/report_viewed.php | 9 - report/loglive/tests/event/events_test.php | 2 - .../classes/event/activity_report_viewed.php | 9 - .../outline/classes/event/report_viewed.php | 10 - .../classes/event/report_viewed.php | 10 - .../classes/event/report_viewed.php | 10 - .../tests/event/events_test.php | 2 - report/stats/classes/event/report_viewed.php | 9 - .../classes/event/user_report_viewed.php | 10 - report/stats/tests/event/events_test.php | 5 - tag/classes/tag.php | 4 - tag/tests/event/events_test.php | 16 -- user/tests/userlib_test.php | 8 - webservice/lib.php | 25 -- webservice/soap/locallib.php | 2 - webservice/tests/event/events_test.php | 25 -- 296 files changed, 2 insertions(+), 4382 deletions(-) diff --git a/admin/tool/admin_presets/classes/event/preset_deleted.php b/admin/tool/admin_presets/classes/event/preset_deleted.php index a7027059da7..544cbdf04d2 100644 --- a/admin/tool/admin_presets/classes/event/preset_deleted.php +++ b/admin/tool/admin_presets/classes/event/preset_deleted.php @@ -36,10 +36,6 @@ class preset_deleted extends base { return "User {$this->userid} has deleted the preset with id {$this->objectid}."; } - public function get_legacy_logdata(): array { - return [$this->courseid, 'tool_admin_presets', 'delete', '', $this->objectid, $this->contextinstanceid]; - } - protected function init(): void { $this->data['crud'] = 'd'; $this->data['edulevel'] = self::LEVEL_OTHER; diff --git a/admin/tool/admin_presets/classes/event/preset_exported.php b/admin/tool/admin_presets/classes/event/preset_exported.php index 810b58c6c1e..af3a2aa0dfd 100644 --- a/admin/tool/admin_presets/classes/event/preset_exported.php +++ b/admin/tool/admin_presets/classes/event/preset_exported.php @@ -41,10 +41,6 @@ class preset_exported extends base { ['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]); } - public function get_legacy_logdata(): array { - return [$this->courseid, 'tool_admin_presets', 'export', '', $this->objectid, $this->contextinstanceid]; - } - protected function init(): void { $this->data['crud'] = 'c'; $this->data['edulevel'] = self::LEVEL_OTHER; diff --git a/admin/tool/admin_presets/classes/event/preset_imported.php b/admin/tool/admin_presets/classes/event/preset_imported.php index 81835117890..75050646212 100644 --- a/admin/tool/admin_presets/classes/event/preset_imported.php +++ b/admin/tool/admin_presets/classes/event/preset_imported.php @@ -41,10 +41,6 @@ class preset_imported extends base { ['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]); } - public function get_legacy_logdata(): array { - return [$this->courseid, 'tool_admin_presets', 'import', '', $this->objectid, $this->contextinstanceid]; - } - protected function init(): void { $this->data['crud'] = 'c'; $this->data['edulevel'] = self::LEVEL_OTHER; diff --git a/admin/tool/admin_presets/classes/event/preset_loaded.php b/admin/tool/admin_presets/classes/event/preset_loaded.php index 86c87dc0c50..d2e274e11e4 100644 --- a/admin/tool/admin_presets/classes/event/preset_loaded.php +++ b/admin/tool/admin_presets/classes/event/preset_loaded.php @@ -41,10 +41,6 @@ class preset_loaded extends base { ['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]); } - public function get_legacy_logdata(): array { - return [$this->courseid, 'tool_admin_presets', 'load', '', $this->objectid, $this->contextinstanceid]; - } - protected function init(): void { $this->data['crud'] = 'u'; $this->data['edulevel'] = self::LEVEL_OTHER; diff --git a/admin/tool/admin_presets/classes/event/preset_reverted.php b/admin/tool/admin_presets/classes/event/preset_reverted.php index f7503cf47d4..97602b89413 100644 --- a/admin/tool/admin_presets/classes/event/preset_reverted.php +++ b/admin/tool/admin_presets/classes/event/preset_reverted.php @@ -36,10 +36,6 @@ class preset_reverted extends base { return "User {$this->userid} has reverted the preset with id {$this->objectid}."; } - public function get_legacy_logdata(): array { - return [$this->courseid, 'tool_admin_presets', 'rollback', '', $this->objectid, $this->contextinstanceid]; - } - protected function init(): void { $this->data['crud'] = 'u'; $this->data['edulevel'] = self::LEVEL_OTHER; diff --git a/admin/tool/admin_presets/classes/event/presets_listed.php b/admin/tool/admin_presets/classes/event/presets_listed.php index 650b6eee53e..89298c8fd37 100644 --- a/admin/tool/admin_presets/classes/event/presets_listed.php +++ b/admin/tool/admin_presets/classes/event/presets_listed.php @@ -40,10 +40,6 @@ class presets_listed extends base { return new \moodle_url('/admin/tool/admin_presets/index.php'); } - public function get_legacy_logdata(): array { - return [$this->courseid, 'tool_admin_presets', 'base', '', $this->objectid, $this->contextinstanceid]; - } - protected function init(): void { $this->data['crud'] = 'r'; $this->data['edulevel'] = self::LEVEL_OTHER; diff --git a/admin/tool/admin_presets/tests/event/preset_deleted_test.php b/admin/tool/admin_presets/tests/event/preset_deleted_test.php index 1c98d22d0df..0f4a4928a98 100644 --- a/admin/tool/admin_presets/tests/event/preset_deleted_test.php +++ b/admin/tool/admin_presets/tests/event/preset_deleted_test.php @@ -55,7 +55,5 @@ class preset_deleted_test extends \advanced_testcase { $this->assertInstanceOf('\tool_admin_presets\event\preset_deleted', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($presetid, $event->objectid); - $expected = [0, 'tool_admin_presets', 'delete', '', $presetid, 0]; - $this->assertEventLegacyLogData($expected, $event); } } diff --git a/admin/tool/admin_presets/tests/event/preset_exported_test.php b/admin/tool/admin_presets/tests/event/preset_exported_test.php index 6e0314f32cf..2f3d8e9d6db 100644 --- a/admin/tool/admin_presets/tests/event/preset_exported_test.php +++ b/admin/tool/admin_presets/tests/event/preset_exported_test.php @@ -55,7 +55,5 @@ class preset_exported_test extends \advanced_testcase { $this->assertInstanceOf('\tool_admin_presets\event\preset_exported', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($presetid, $event->objectid); - $expected = [0, 'tool_admin_presets', 'export', '', $presetid, 0]; - $this->assertEventLegacyLogData($expected, $event); } } diff --git a/admin/tool/admin_presets/tests/event/preset_imported_test.php b/admin/tool/admin_presets/tests/event/preset_imported_test.php index 0298d209e41..6d290895e57 100644 --- a/admin/tool/admin_presets/tests/event/preset_imported_test.php +++ b/admin/tool/admin_presets/tests/event/preset_imported_test.php @@ -55,7 +55,5 @@ class preset_imported_test extends \advanced_testcase { $this->assertInstanceOf('\tool_admin_presets\event\preset_imported', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($presetid, $event->objectid); - $expected = [0, 'tool_admin_presets', 'import', '', $presetid, 0]; - $this->assertEventLegacyLogData($expected, $event); } } diff --git a/admin/tool/admin_presets/tests/event/preset_loaded_test.php b/admin/tool/admin_presets/tests/event/preset_loaded_test.php index 32405f4eff3..455e3beb790 100644 --- a/admin/tool/admin_presets/tests/event/preset_loaded_test.php +++ b/admin/tool/admin_presets/tests/event/preset_loaded_test.php @@ -55,7 +55,5 @@ class preset_loaded_test extends \advanced_testcase { $this->assertInstanceOf('\tool_admin_presets\event\preset_loaded', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($presetid, $event->objectid); - $expected = [0, 'tool_admin_presets', 'load', '', $presetid, 0]; - $this->assertEventLegacyLogData($expected, $event); } } diff --git a/admin/tool/admin_presets/tests/event/preset_reverted_test.php b/admin/tool/admin_presets/tests/event/preset_reverted_test.php index 61210220e03..9dfe8d9f377 100644 --- a/admin/tool/admin_presets/tests/event/preset_reverted_test.php +++ b/admin/tool/admin_presets/tests/event/preset_reverted_test.php @@ -55,7 +55,5 @@ class preset_reverted_test extends \advanced_testcase { $this->assertInstanceOf('\tool_admin_presets\event\preset_reverted', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($presetid, $event->objectid); - $expected = [0, 'tool_admin_presets', 'rollback', '', $presetid, 0]; - $this->assertEventLegacyLogData($expected, $event); } } diff --git a/admin/tool/admin_presets/tests/event/presets_listed_test.php b/admin/tool/admin_presets/tests/event/presets_listed_test.php index 84765486f7e..5fe3c8429fa 100644 --- a/admin/tool/admin_presets/tests/event/presets_listed_test.php +++ b/admin/tool/admin_presets/tests/event/presets_listed_test.php @@ -55,7 +55,5 @@ class presets_listed_test extends \advanced_testcase { $this->assertInstanceOf('\tool_admin_presets\event\presets_listed', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($presetid, $event->objectid); - $expected = [0, 'tool_admin_presets', 'base', '', $presetid, 0]; - $this->assertEventLegacyLogData($expected, $event); } } diff --git a/admin/tool/capability/classes/event/report_viewed.php b/admin/tool/capability/classes/event/report_viewed.php index 84d72543691..d4b770c6c94 100644 --- a/admin/tool/capability/classes/event/report_viewed.php +++ b/admin/tool/capability/classes/event/report_viewed.php @@ -62,15 +62,6 @@ class report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the capability overview report."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'admin', 'tool capability', 'tool/capability/index.php'); - } - /** * Returns relevant URL. * diff --git a/admin/tool/capability/tests/event/events_test.php b/admin/tool/capability/tests/event/events_test.php index 8fd03ae7b3a..9b0947147d2 100644 --- a/admin/tool/capability/tests/event/events_test.php +++ b/admin/tool/capability/tests/event/events_test.php @@ -55,8 +55,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\tool_capability\event\report_viewed', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, "admin", "tool capability", "tool/capability/index.php"); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/admin/tool/capability/index.php'); $this->assertEquals($url, $event->get_url()); diff --git a/admin/tool/log/store/legacy/tests/fixtures/event.php b/admin/tool/log/store/legacy/tests/fixtures/event.php index 093afa6ecde..4afb22bd77d 100644 --- a/admin/tool/log/store/legacy/tests/fixtures/event.php +++ b/admin/tool/log/store/legacy/tests/fixtures/event.php @@ -44,21 +44,4 @@ class unittest_executed extends \core\event\base { public function get_url() { return new \moodle_url('/somepath/somefile.php', array('id' => $this->data['other']['sample'])); } - - public static function get_legacy_eventname() { - return 'test_legacy'; - } - - protected function get_legacy_eventdata() { - return array($this->data['courseid'], $this->data['other']['sample']); - } - - protected function get_legacy_logdata() { - $cmid = 0; - if ($this->contextlevel == CONTEXT_MODULE) { - $cmid = $this->contextinstanceid; - } - return array($this->data['courseid'], 'core_unittest', 'view', - 'unittest.php?id=' . $this->data['other']['sample'], 'bbb', $cmid); - } } diff --git a/auth/ldap/tests/plugin_test.php b/auth/ldap/tests/plugin_test.php index fc7ca70fcb3..d94722c76bb 100644 --- a/auth/ldap/tests/plugin_test.php +++ b/auth/ldap/tests/plugin_test.php @@ -379,9 +379,6 @@ class plugin_test extends \advanced_testcase { $this->assertEquals('user', $event->objecttable); $this->assertEquals('2', $event->objectid); $this->assertEquals(\context_system::instance()->id, $event->contextid); - $expectedlog = array(SITEID, 'user', 'login', 'view.php?id=' . $USER->id . '&course=' . SITEID, $user->id, - 0, $user->id); - $this->assertEventLegacyLogData($expectedlog, $event); } /** @@ -508,10 +505,7 @@ class plugin_test extends \advanced_testcase { $event = array_pop($events); $this->assertInstanceOf('\core\event\user_created', $event); $this->assertEquals($user['id'], $event->objectid); - $this->assertEquals('user_created', $event->get_legacy_eventname()); $this->assertEquals(\context_user::instance($user['id']), $event->get_context()); - $expectedlogdata = array(SITEID, 'user', 'add', '/view.php?id='.$event->objectid, fullname($dbuser)); - $this->assertEventLegacyLogData($expectedlogdata, $event); // First event is user_password_updated. $event = array_pop($events); diff --git a/blog/tests/event/events_test.php b/blog/tests/event/events_test.php index a53e99197d9..23c5a5223d9 100644 --- a/blog/tests/event/events_test.php +++ b/blog/tests/event/events_test.php @@ -137,10 +137,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($USER->id, $event->userid); $this->assertEquals($this->userid, $event->relateduserid); $this->assertEquals("post", $event->objecttable); - $arr = array(SITEID, 'blog', 'add', 'index.php?userid=' . $this->userid . '&entryid=' . $blog->id, $blog->subject); - $this->assertEventLegacyLogData($arr, $event); - $this->assertEquals("blog_entry_added", $event->get_legacy_eventname()); - $this->assertEventLegacyData($blog, $event); $this->assertEventContextNotUsed($event); } @@ -172,10 +168,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($USER->id, $event->userid); $this->assertEquals($this->userid, $event->relateduserid); $this->assertEquals("post", $event->objecttable); - $this->assertEquals("blog_entry_edited", $event->get_legacy_eventname()); - $this->assertEventLegacyData($blog, $event); - $arr = array (SITEID, 'blog', 'update', 'index.php?userid=' . $this->userid . '&entryid=' . $blog->id, $blog->subject); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } @@ -207,11 +199,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($this->userid, $event->relateduserid); $this->assertEquals("post", $event->objecttable); $this->assertEquals($record, $event->get_record_snapshot("post", $blog->id)); - $this->assertSame('blog_entry_deleted', $event->get_legacy_eventname()); - $arr = array(SITEID, 'blog', 'delete', 'index.php?userid=' . $blog->userid, 'deleted blog entry with entry id# ' . - $blog->id); - $this->assertEventLegacyLogData($arr, $event); - $this->assertEventLegacyData($blog, $event); $this->assertEventContextNotUsed($event); } @@ -292,9 +279,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($USER->id, $event->userid); $this->assertEquals($this->userid, $event->relateduserid); $this->assertEquals('blog_association', $event->objecttable); - $arr = array(SITEID, 'blog', 'add association', 'index.php?userid=' . $this->userid . '&entryid=' . $blog->id, - $blog->subject, 0, $this->userid); - $this->assertEventLegacyLogData($arr, $event); // Add blog associations with a module. $blog = new \blog_entry($this->postid); @@ -308,9 +292,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($blog->id, $event->other['blogid']); $this->assertEquals($this->cmid, $event->other['associateid']); $this->assertEquals('coursemodule', $event->other['associatetype']); - $arr = array(SITEID, 'blog', 'add association', 'index.php?userid=' . $this->userid . '&entryid=' . $blog->id, - $blog->subject, $this->cmid, $this->userid); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } @@ -393,10 +374,7 @@ class events_test extends \advanced_testcase { // Validate event data. $url = new \moodle_url('/blog/index.php', $other); - $url2 = new \moodle_url('index.php', $other); $this->assertEquals($url, $event->get_url()); - $arr = array(SITEID, 'blog', 'view', $url2->out(), 'view blog entry'); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } diff --git a/calendar/tests/event/events_test.php b/calendar/tests/event/events_test.php index edb609a9c15..b7019305f25 100644 --- a/calendar/tests/event/events_test.php +++ b/calendar/tests/event/events_test.php @@ -87,10 +87,8 @@ class events_test extends \advanced_testcase { $this->assertEquals('event', $event->objecttable); $this->assertEquals(0, $event->courseid); $this->assertEquals($calevent->context, $event->get_context()); - $expectedlog = array(0, 'calendar', 'add', 'event.php?action=edit&id=' . $calevent->id , $calevent->name); $other = array('repeatid' => 0, 'timestart' => $time, 'name' => 'event'); $this->assertEquals($other, $event->other); - $this->assertEventLegacyLogData($expectedlog, $event); $this->assertEventContextNotUsed($event); // Now we create a repeated course event. @@ -194,8 +192,6 @@ class events_test extends \advanced_testcase { $this->assertEquals('event', $event->objecttable); $this->assertEquals(0, $event->courseid); $this->assertEquals($calevent->context, $event->get_context()); - $expectedlog = array(0, 'calendar', 'edit', 'event.php?action=edit&id=' . $calevent->id , $calevent->name); - $this->assertEventLegacyLogData($expectedlog, $event); $other = array('repeatid' => 0, 'timestart' => $time, 'name' => 'new event'); $this->assertEquals($other, $event->other); $this->assertEventContextNotUsed($event); @@ -249,8 +245,6 @@ class events_test extends \advanced_testcase { $this->assertEquals('event', $event->objecttable); $this->assertEquals($siteid, $event->courseid); $this->assertEquals($calevent->context, $event->get_context()); - $expectedlog = [$siteid, 'calendar', 'edit', 'event.php?action=edit&id=' . $calevent->id , $calevent->name]; - $this->assertEventLegacyLogData($expectedlog, $event); $other = array('repeatid' => 0, 'timestart' => $time, 'name' => 'Some wickedly awesome event yo!'); $this->assertEquals($other, $event->other); $this->assertEventContextNotUsed($event); diff --git a/cohort/tests/lib_test.php b/cohort/tests/lib_test.php index ccadc66a0c7..e5dc044e32f 100644 --- a/cohort/tests/lib_test.php +++ b/cohort/tests/lib_test.php @@ -102,7 +102,6 @@ class lib_test extends \advanced_testcase { $url = new \moodle_url('/cohort/index.php', array('contextid' => $event->contextid)); $this->assertEquals($url, $event->get_url()); $this->assertEquals($cohort, $event->get_record_snapshot('cohort', $id)); - $this->assertEventLegacyData($cohort, $event); $this->assertEventContextNotUsed($event); } @@ -179,7 +178,6 @@ class lib_test extends \advanced_testcase { $url = new \moodle_url('/cohort/edit.php', array('id' => $event->objectid)); $this->assertEquals($url, $event->get_url()); $this->assertEquals($cohort, $event->get_record_snapshot('cohort', $id)); - $this->assertEventLegacyData($cohort, $event); $this->assertEventContextNotUsed($event); } @@ -219,7 +217,6 @@ class lib_test extends \advanced_testcase { $url = new \moodle_url('/cohort/index.php', array('contextid' => $event->contextid)); $this->assertEquals($url, $event->get_url()); $this->assertEquals($cohort, $event->get_record_snapshot('cohort', $cohort->id)); - $this->assertEventLegacyData($cohort, $event); $this->assertEventContextNotUsed($event); } @@ -279,7 +276,6 @@ class lib_test extends \advanced_testcase { $this->assertEquals($USER->id, $event->userid); $url = new \moodle_url('/cohort/assign.php', array('id' => $event->objectid)); $this->assertEquals($url, $event->get_url()); - $this->assertEventLegacyData((object) array('cohortid' => $cohort->id, 'userid' => $user->id), $event); $this->assertEventContextNotUsed($event); } @@ -325,7 +321,6 @@ class lib_test extends \advanced_testcase { $this->assertEquals($USER->id, $event->userid); $url = new \moodle_url('/cohort/assign.php', array('id' => $event->objectid)); $this->assertEquals($url, $event->get_url()); - $this->assertEventLegacyData((object) array('cohortid' => $cohort->id, 'userid' => $user->id), $event); $this->assertEventContextNotUsed($event); } diff --git a/course/classes/category.php b/course/classes/category.php index 30fd13d0277..cb482053ca3 100644 --- a/course/classes/category.php +++ b/course/classes/category.php @@ -2179,8 +2179,6 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr 'objectid' => $childcat->id, 'context' => $childcat->get_context() )); - $event->set_legacy_logdata(array(SITEID, 'category', 'move', 'editcategory.php?id=' . $childcat->id, - $childcat->id)); $event->trigger(); } fix_course_sortorder(); @@ -2371,7 +2369,6 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr 'objectid' => $this->id, 'context' => $this->get_context() )); - $event->set_legacy_logdata(array(SITEID, 'category', 'move', 'editcategory.php?id=' . $this->id, $this->id)); $event->trigger(); } } @@ -2443,7 +2440,6 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr 'objectid' => $this->id, 'context' => $this->get_context() )); - $event->set_legacy_logdata(array(SITEID, 'category', 'hide', 'editcategory.php?id=' . $this->id, $this->id)); $event->trigger(); } } @@ -2502,7 +2498,6 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr 'objectid' => $this->id, 'context' => $this->get_context() )); - $event->set_legacy_logdata(array(SITEID, 'category', 'show', 'editcategory.php?id=' . $this->id, $this->id)); $event->trigger(); } } @@ -3066,8 +3061,6 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr 'objectid' => $this->id, 'context' => $this->get_context() )); - $event->set_legacy_logdata(array(SITEID, 'category', 'move', 'management.php?categoryid=' . $this->id, - $this->id)); $event->trigger(); // Finally reorder courses. diff --git a/course/lib.php b/course/lib.php index e42511cc58f..7bdd844f8d4 100644 --- a/course/lib.php +++ b/course/lib.php @@ -2024,7 +2024,6 @@ function move_courses($courseids, $categoryid) { 'fullname' => $dbcourse->fullname, 'updatedfields' => array('category' => $category->id)) )); - $event->set_legacy_logdata(array($course->id, 'course', 'move', 'edit.php?id=' . $course->id, $course->id)); $event->trigger(); } fix_course_sortorder(); @@ -2490,7 +2489,6 @@ function update_course($data, $editoroptions = NULL) { 'updatedfields' => $updatedfields) )); - $event->set_legacy_logdata(array($course->id, 'course', 'update', 'edit.php?id=' . $course->id, $course->id)); $event->trigger(); if ($oldcourse->format !== $course->format) { diff --git a/course/resources.php b/course/resources.php index 96325e686b8..350c9bd65d7 100644 --- a/course/resources.php +++ b/course/resources.php @@ -51,7 +51,6 @@ foreach ($allmodules as $key=>$module) { // Triger view event. $event = \core\event\course_resources_list_viewed::create(array('context' => context_course::instance($course->id))); -$event->set_legacy_logdata($availableresources); $event->add_record_snapshot('course', $course); $event->trigger(); diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php index 0c17b7a9250..f972ed5c346 100644 --- a/course/tests/courselib_test.php +++ b/course/tests/courselib_test.php @@ -1867,10 +1867,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($course->id, $event->objectid); $this->assertEquals(context_course::instance($course->id), $event->get_context()); $this->assertEquals($course, $event->get_record_snapshot('course', $course->id)); - $this->assertEquals('course_created', $event->get_legacy_eventname()); - $this->assertEventLegacyData($course, $event); - $expectedlog = array(SITEID, 'course', 'new', 'view.php?id=' . $course->id, $course->fullname . ' (ID ' . $course->id . ')'); - $this->assertEventLegacyLogData($expectedlog, $event); // Now we want to trigger creating a course via the imsenterprise. // Delete the course we created earlier, as we want the imsenterprise plugin to create this. @@ -1941,10 +1937,6 @@ class courselib_test extends advanced_testcase { $url = new moodle_url('/course/edit.php', array('id' => $event->objectid)); $this->assertEquals($url, $event->get_url()); $this->assertEquals($updatedcourse, $event->get_record_snapshot('course', $event->objectid)); - $this->assertEquals('course_updated', $event->get_legacy_eventname()); - $this->assertEventLegacyData($updatedcourse, $event); - $expectedlog = array($updatedcourse->id, 'course', 'update', 'edit.php?id=' . $course->id, $course->id); - $this->assertEventLegacyLogData($expectedlog, $event); // Move course and catch course_updated event. $sink = $this->redirectEvents(); @@ -1961,10 +1953,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($movedcourse->id, $event->objectid); $this->assertEquals(context_course::instance($course->id), $event->get_context()); $this->assertEquals($movedcourse, $event->get_record_snapshot('course', $movedcourse->id)); - $this->assertEquals('course_updated', $event->get_legacy_eventname()); - $this->assertEventLegacyData($movedcourse, $event); - $expectedlog = array($movedcourse->id, 'course', 'move', 'edit.php?id=' . $movedcourse->id, $movedcourse->id); - $this->assertEventLegacyLogData($expectedlog, $event); // Move course to hidden category and catch course_updated event. $sink = $this->redirectEvents(); @@ -1981,10 +1969,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($movedcoursehidden->id, $event->objectid); $this->assertEquals(context_course::instance($course->id), $event->get_context()); $this->assertEquals($movedcoursehidden, $event->get_record_snapshot('course', $movedcoursehidden->id)); - $this->assertEquals('course_updated', $event->get_legacy_eventname()); - $this->assertEventLegacyData($movedcoursehidden, $event); - $expectedlog = array($movedcoursehidden->id, 'course', 'move', 'edit.php?id=' . $movedcoursehidden->id, $movedcoursehidden->id); - $this->assertEventLegacyLogData($expectedlog, $event); $this->assertEventContextNotUsed($event); } @@ -2054,21 +2038,11 @@ class courselib_test extends advanced_testcase { $this->assertEquals($course->id, $event->objectid); $this->assertEquals($coursecontext->id, $event->contextid); $this->assertEquals($course, $event->get_record_snapshot('course', $course->id)); - $this->assertEquals('course_deleted', $event->get_legacy_eventname()); $eventdata = $event->get_data(); $this->assertSame($course->idnumber, $eventdata['other']['idnumber']); $this->assertSame($course->fullname, $eventdata['other']['fullname']); $this->assertSame($course->shortname, $eventdata['other']['shortname']); - // The legacy data also passed the context in the course object and substitutes timemodified with the current date. - $expectedlegacy = clone($course); - $expectedlegacy->context = $coursecontext; - $expectedlegacy->timemodified = $event->timecreated; - $this->assertEventLegacyData($expectedlegacy, $event); - - // Validate legacy log data. - $expectedlog = array(SITEID, 'course', 'delete', 'view.php?id=' . $course->id, $course->fullname . '(ID ' . $course->id . ')'); - $this->assertEventLegacyLogData($expectedlog, $event); $this->assertEventContextNotUsed($event); } @@ -2106,11 +2080,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($course->id, $event->objectid); $this->assertEquals($coursecontext->id, $event->contextid); $this->assertEquals($course, $event->get_record_snapshot('course', $course->id)); - $this->assertEquals('course_content_removed', $event->get_legacy_eventname()); - // The legacy data also passed the context and options in the course object. - $course->context = $coursecontext; - $course->options = array(); - $this->assertEventLegacyData($course, $event); $this->assertEventContextNotUsed($event); } @@ -2147,11 +2116,7 @@ class courselib_test extends advanced_testcase { 'name' => $category->name, ], $event->other); $this->assertEquals($categoryrecord, $event->get_record_snapshot($event->objecttable, $event->objectid)); - $this->assertEquals('course_category_deleted', $event->get_legacy_eventname()); $this->assertEquals(null, $event->get_url()); - $this->assertEventLegacyData($category, $event); - $expectedlog = array(SITEID, 'category', 'delete', 'index.php', $category->name . '(ID ' . $category->id . ')'); - $this->assertEventLegacyLogData($expectedlog, $event); // Create two categories. $category = $this->getDataGenerator()->create_category(); @@ -2182,10 +2147,6 @@ class courselib_test extends advanced_testcase { 'contentmovedcategoryid' => $category->id, ], $event->other); $this->assertEquals($category2record, $event->get_record_snapshot($event->objecttable, $event->objectid)); - $this->assertEquals('course_category_deleted', $event->get_legacy_eventname()); - $this->assertEventLegacyData($category2, $event); - $expectedlog = array(SITEID, 'category', 'delete', 'index.php', $category2->name . '(ID ' . $category2->id . ')'); - $this->assertEventLegacyLogData($expectedlog, $event); $this->assertEventContextNotUsed($event); } @@ -2286,19 +2247,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals('course', $event->objecttable); $this->assertEquals($rc->get_courseid(), $event->objectid); $this->assertEquals(context_course::instance($rc->get_courseid())->id, $event->contextid); - $this->assertEquals('course_restored', $event->get_legacy_eventname()); - $legacydata = (object) array( - 'courseid' => $rc->get_courseid(), - 'userid' => $rc->get_userid(), - 'type' => $rc->get_type(), - 'target' => $rc->get_target(), - 'mode' => $rc->get_mode(), - 'operation' => $rc->get_operation(), - 'samesite' => $rc->is_samesite() - ); - $url = new moodle_url('/course/view.php', array('id' => $event->objectid)); - $this->assertEquals($url, $event->get_url()); - $this->assertEventLegacyData($legacydata, $event); $this->assertEventContextNotUsed($event); // Destroy the resource controller since we are done using it. @@ -2357,8 +2305,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($section, $event->get_record_snapshot('course_sections', $event->objectid)); $id = $section->id; $sectionnum = $section->section; - $expectedlegacydata = array($course->id, "course", "editsection", 'editsection.php?id=' . $id, $sectionnum); - $this->assertEventLegacyLogData($expectedlegacydata, $event); $this->assertEventContextNotUsed($event); } @@ -2392,11 +2338,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($expecteddesc, $event->get_description()); $this->assertEquals($section, $event->get_record_snapshot('course_sections', $event->objectid)); $this->assertNull($event->get_url()); - - // Test legacy data. - $sectionnum = $section->section; - $expectedlegacydata = array($course->id, "course", "delete section", 'view.php?id=' . $course->id, $sectionnum); - $this->assertEventLegacyLogData($expectedlegacydata, $event); $this->assertEventContextNotUsed($event); } @@ -2546,22 +2487,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals('course_modules', $event->objecttable); $url = new moodle_url('/mod/assign/view.php', array('id' => $module->cmid)); $this->assertEquals($url, $event->get_url()); - - // Test legacy data. - $this->assertSame('mod_created', $event->get_legacy_eventname()); - $eventdata = new stdClass(); - $eventdata->modulename = 'assign'; - $eventdata->name = $module->name; - $eventdata->cmid = $module->cmid; - $eventdata->courseid = $module->course; - $eventdata->userid = $USER->id; - $this->assertEventLegacyData($eventdata, $event); - - $arr = array( - array($module->course, "course", "add mod", "../mod/assign/view.php?id=$module->cmid", "assign $module->id"), - array($module->course, "assign", "add", "view.php?id=$module->cmid", $module->id, $module->cmid) - ); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } } @@ -2686,22 +2611,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals('course_modules', $event->objecttable); $url = new moodle_url('/mod/forum/view.php', array('id' => $cm->id)); $this->assertEquals($url, $event->get_url()); - - // Test legacy data. - $this->assertSame('mod_updated', $event->get_legacy_eventname()); - $eventdata = new stdClass(); - $eventdata->modulename = 'forum'; - $eventdata->name = $mod->name; - $eventdata->cmid = $cm->id; - $eventdata->courseid = $cm->course; - $eventdata->userid = $USER->id; - $this->assertEventLegacyData($eventdata, $event); - - $arr = array( - array($cm->course, "course", "update mod", "../mod/forum/view.php?id=$cm->id", "forum $cm->instance"), - array($cm->course, "forum", "update", "view.php?id=$cm->id", $cm->instance, $cm->id) - ); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } } @@ -2746,12 +2655,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals($cm->instance, $event2->other['instanceid']); $this->assertEquals($cm->name, $event2->other['name']); $this->assertEventContextNotUsed($event2); - $this->assertSame('mod_updated', $event2->get_legacy_eventname()); - $arr = array( - array($cm->course, "course", "update mod", "../mod/assign/view.php?id=$cm->id", "assign $cm->instance"), - array($cm->course, "assign", "update", "view.php?id=$cm->id", $cm->instance, $cm->id) - ); - $this->assertEventLegacyLogData($arr, $event); } /** @@ -2842,19 +2745,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals('course_modules', $event->objecttable); $this->assertEquals(null, $event->get_url()); $this->assertEquals($cm, $event->get_record_snapshot('course_modules', $cm->id)); - - // Test legacy data. - $this->assertSame('mod_deleted', $event->get_legacy_eventname()); - $eventdata = new stdClass(); - $eventdata->modulename = 'forum'; - $eventdata->cmid = $cm->id; - $eventdata->courseid = $cm->course; - $eventdata->userid = $USER->id; - $this->assertEventLegacyData($eventdata, $event); - - $arr = array($cm->course, 'course', "delete mod", "view.php?id=$cm->course", "forum $cm->instance", $cm->id); - $this->assertEventLegacyLogData($arr, $event); - } /** @@ -3068,7 +2958,6 @@ class courselib_test extends advanced_testcase { $coursecontext = context_course::instance($course->id); $event = \core\event\course_resources_list_viewed::create(array('context' => context_course::instance($course->id))); - $event->set_legacy_logdata(array('book', 'page', 'resource')); $sink = $this->redirectEvents(); $event->trigger(); $events = $sink->get_events(); @@ -3081,12 +2970,6 @@ class courselib_test extends advanced_testcase { $this->assertEquals(null, $event->objectid); $this->assertEquals($course->id, $event->courseid); $this->assertEquals($coursecontext->id, $event->contextid); - $expectedlegacydata = array( - array($course->id, "book", "view all", 'index.php?id=' . $course->id, ''), - array($course->id, "page", "view all", 'index.php?id=' . $course->id, ''), - array($course->id, "resource", "view all", 'index.php?id=' . $course->id, ''), - ); - $this->assertEventLegacyLogData($expectedlegacydata, $event); $this->assertEventContextNotUsed($event); } diff --git a/enrol/meta/tests/plugin_test.php b/enrol/meta/tests/plugin_test.php index 163cb791a3f..b293b1c63de 100644 --- a/enrol/meta/tests/plugin_test.php +++ b/enrol/meta/tests/plugin_test.php @@ -623,11 +623,6 @@ class plugin_test extends \advanced_testcase { $dbuserenrolled = $DB->get_record('user_enrolments', array('userid' => $user1->id)); $this->assertInstanceOf('\core\event\user_enrolment_created', $event); $this->assertEquals($dbuserenrolled->id, $event->objectid); - $this->assertEquals('user_enrolled', $event->get_legacy_eventname()); - $expectedlegacyeventdata = $dbuserenrolled; - $expectedlegacyeventdata->enrol = 'meta'; - $expectedlegacyeventdata->courseid = $course2->id; - $this->assertEventLegacyData($expectedlegacyeventdata, $event); $this->assertEventContextNotUsed($event); } @@ -661,7 +656,6 @@ class plugin_test extends \advanced_testcase { $this->assertEquals(0, $DB->count_records('user_enrolments')); $this->assertInstanceOf('\core\event\user_enrolment_deleted', $event); - $this->assertEquals('user_unenrolled', $event->get_legacy_eventname()); $this->assertEventContextNotUsed($event); } @@ -697,13 +691,6 @@ class plugin_test extends \advanced_testcase { $dbuserenrolled = $DB->get_record('user_enrolments', array('userid' => $user1->id)); $this->assertInstanceOf('\core\event\user_enrolment_updated', $event); $this->assertEquals($dbuserenrolled->id, $event->objectid); - $this->assertEquals('user_enrol_modified', $event->get_legacy_eventname()); - $expectedlegacyeventdata = $dbuserenrolled; - $expectedlegacyeventdata->enrol = 'meta'; - $expectedlegacyeventdata->courseid = $course2->id; - $url = new \moodle_url('/enrol/editenrolment.php', array('ue' => $event->objectid)); - $this->assertEquals($url, $event->get_url()); - $this->assertEventLegacyData($expectedlegacyeventdata, $event); $this->assertEventContextNotUsed($event); } diff --git a/enrol/tests/enrollib_test.php b/enrol/tests/enrollib_test.php index f033f57e208..21ed45aeada 100644 --- a/enrol/tests/enrollib_test.php +++ b/enrol/tests/enrollib_test.php @@ -656,13 +656,6 @@ class enrollib_test extends advanced_testcase { $this->assertInstanceOf('\core\event\user_enrolment_created', $event); $this->assertEquals($dbuserenrolled->id, $event->objectid); $this->assertEquals(context_course::instance($course1->id), $event->get_context()); - $this->assertEquals('user_enrolled', $event->get_legacy_eventname()); - $expectedlegacyeventdata = $dbuserenrolled; - $expectedlegacyeventdata->enrol = $manual->get_name(); - $expectedlegacyeventdata->courseid = $course1->id; - $this->assertEventLegacyData($expectedlegacyeventdata, $event); - $expected = array($course1->id, 'course', 'enrol', '../enrol/users.php?id=' . $course1->id, $course1->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -697,14 +690,6 @@ class enrollib_test extends advanced_testcase { // Validate the event. $this->assertInstanceOf('\core\event\user_enrolment_deleted', $event); $this->assertEquals(context_course::instance($course->id), $event->get_context()); - $this->assertEquals('user_unenrolled', $event->get_legacy_eventname()); - $expectedlegacyeventdata = $dbuserenrolled; - $expectedlegacyeventdata->enrol = $manualplugin->get_name(); - $expectedlegacyeventdata->courseid = $course->id; - $expectedlegacyeventdata->lastenrol = true; - $this->assertEventLegacyData($expectedlegacyeventdata, $event); - $expected = array($course->id, 'course', 'unenrol', '../enrol/users.php?id=' . $course->id, $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/group/tests/lib_test.php b/group/tests/lib_test.php index baaa2944c39..7763f1627c9 100644 --- a/group/tests/lib_test.php +++ b/group/tests/lib_test.php @@ -52,13 +52,6 @@ class lib_test extends \advanced_testcase { $this->assertCount(1, $events); $event = reset($events); - $expected = new \stdClass(); - $expected->groupid = $group->id; - $expected->userid = $user->id; - $expected->component = 'mod_workshop'; - $expected->itemid = '123'; - $this->assertEventLegacyData($expected, $event); - $this->assertSame('groups_member_added', $event->get_legacy_eventname()); $this->assertInstanceOf('\core\event\group_member_added', $event); $this->assertEquals($user->id, $event->relateduserid); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); @@ -83,11 +76,6 @@ class lib_test extends \advanced_testcase { $this->assertCount(1, $events); $event = reset($events); - $expected = new \stdClass(); - $expected->groupid = $group->id; - $expected->userid = $user->id; - $this->assertEventLegacyData($expected, $event); - $this->assertSame('groups_member_removed', $event->get_legacy_eventname()); $this->assertInstanceOf('\core\event\group_member_removed', $event); $this->assertEquals($user->id, $event->relateduserid); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); @@ -109,8 +97,6 @@ class lib_test extends \advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\group_created', $event); - $this->assertEventLegacyData($group, $event); - $this->assertSame('groups_group_created', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($group->id, $event->objectid); $url = new \moodle_url('/group/index.php', array('id' => $event->courseid)); @@ -131,9 +117,6 @@ class lib_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\grouping_created', $event); - $this->assertEventLegacyData($group, $event); - $this->assertSame('groups_grouping_created', $event->get_legacy_eventname()); - $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($group->id, $event->objectid); $url = new \moodle_url('/group/groupings.php', array('id' => $event->courseid)); @@ -163,8 +146,6 @@ class lib_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\group_updated', $event); $group->name = $data->name; - $this->assertEventLegacyData($group, $event); - $this->assertSame('groups_group_updated', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($group->id, $event->objectid); $url = new \moodle_url('/group/group.php', array('id' => $event->objectid)); @@ -192,8 +173,6 @@ class lib_test extends \advanced_testcase { $this->assertTimeCurrent($group->timemodified); $this->assertInstanceOf('\core\event\group_updated', $event); - $this->assertEventLegacyData($group, $event); - $this->assertSame('groups_group_updated', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($group->id, $event->objectid); $url = new \moodle_url('/group/group.php', array('id' => $event->objectid)); @@ -224,15 +203,6 @@ class lib_test extends \advanced_testcase { // Get the timemodified from DB for comparison with snapshot. $data->timemodified = $DB->get_field('groupings', 'timemodified', array('id'=>$grouping->id)); $this->assertTimeCurrent($data->timemodified); - // Following fields were not updated so the snapshot should have them the same as in original group. - $data->description = $grouping->description; - $data->descriptionformat = $grouping->descriptionformat; - $data->configdata = $grouping->configdata; - $data->idnumber = $grouping->idnumber; - $data->timecreated = $grouping->timecreated; - // Assert legacy event data. - $this->assertEventLegacyData($data, $event); - $this->assertSame('groups_grouping_updated', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($grouping->id, $event->objectid); @@ -270,9 +240,6 @@ class lib_test extends \advanced_testcase { $data->idnumber = $grouping->idnumber; $data->name = $grouping->name; $data->timecreated = $grouping->timecreated; - // Assert legacy event data. - $this->assertEventLegacyData($data, $event); - $this->assertSame('groups_grouping_updated', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($grouping->id, $event->objectid); @@ -292,9 +259,6 @@ class lib_test extends \advanced_testcase { $this->assertCount(1, $events); $event = reset($events); - $this->assertInstanceOf('\core\event\group_deleted', $event); - $this->assertEventLegacyData($group, $event); - $this->assertSame('groups_group_deleted', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($group->id, $event->objectid); $url = new \moodle_url('/group/index.php', array('id' => $event->courseid)); @@ -314,8 +278,6 @@ class lib_test extends \advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\grouping_deleted', $event); - $this->assertEventLegacyData($group, $event); - $this->assertSame('groups_grouping_deleted', $event->get_legacy_eventname()); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertEquals($group->id, $event->objectid); $url = new \moodle_url('/group/groupings.php', array('id' => $event->courseid)); diff --git a/h5p/classes/event/h5p_deleted.php b/h5p/classes/event/h5p_deleted.php index a3fe4fad18d..d8fcaa84eb8 100644 --- a/h5p/classes/event/h5p_deleted.php +++ b/h5p/classes/event/h5p_deleted.php @@ -85,13 +85,4 @@ class h5p_deleted extends \core\event\base { // There is no url since the previous event already has the url where the h5p content has been displayed. return null; } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'core_h5p_deleted'; - } -} \ No newline at end of file +} diff --git a/h5p/classes/event/h5p_viewed.php b/h5p/classes/event/h5p_viewed.php index ef7015cc3dc..babf0edaf65 100644 --- a/h5p/classes/event/h5p_viewed.php +++ b/h5p/classes/event/h5p_viewed.php @@ -85,13 +85,4 @@ class h5p_viewed extends \core\event\base { // There is no url since the previous event already has the url where the h5p content has been displayed. return null; } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'core_h5p_viewed'; - } -} \ No newline at end of file +} diff --git a/lib/classes/event/base.php b/lib/classes/event/base.php index b0872145605..48af850098e 100644 --- a/lib/classes/event/base.php +++ b/lib/classes/event/base.php @@ -705,39 +705,6 @@ abstract class base implements \IteratorAggregate { return $this->logextra; } - /** - * Does this event replace legacy event? - * - * Note: do not use directly! - * - * @return null|string legacy event name - */ - public static function get_legacy_eventname() { - return null; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * Note: do not use directly! - * - * @return mixed - */ - protected function get_legacy_eventdata() { - return null; - } - - /** - * Doest this event replace add_to_log() statement? - * - * Note: do not use directly! - * - * @return null|array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return null; - } - /** * Validate all properties right before triggering the event. * @@ -818,22 +785,6 @@ abstract class base implements \IteratorAggregate { $this->triggered = true; - if (isset($CFG->loglifetime) and $CFG->loglifetime != -1) { - if ($data = $this->get_legacy_logdata()) { - $manager = get_log_manager(); - if (method_exists($manager, 'legacy_add_to_log')) { - if (is_array($data[0])) { - // Some events require several entries in 'log' table. - foreach ($data as $d) { - call_user_func_array(array($manager, 'legacy_add_to_log'), $d); - } - } else { - call_user_func_array(array($manager, 'legacy_add_to_log'), $data); - } - } - } - } - if (PHPUNIT_TEST and \phpunit_util::is_redirecting_events()) { $this->dispatched = true; \phpunit_util::event_triggered($this); diff --git a/lib/classes/event/blog_association_created.php b/lib/classes/event/blog_association_created.php index 3c30861aa03..b071a15e940 100644 --- a/lib/classes/event/blog_association_created.php +++ b/lib/classes/event/blog_association_created.php @@ -80,21 +80,6 @@ class blog_association_created extends base { return new \moodle_url('/blog/index.php', array('entryid' => $this->other['blogid'])); } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - if ($this->other['associatetype'] === 'course') { - return array (SITEID, 'blog', 'add association', 'index.php?userid=' . $this->relateduserid. '&entryid=' . - $this->other['blogid'], $this->other['subject'], 0, $this->relateduserid); - } - - return array (SITEID, 'blog', 'add association', 'index.php?userid=' . $this->relateduserid. '&entryid=' . - $this->other['blogid'], $this->other['subject'], $this->other['associateid'], $this->relateduserid); - } - /** * Custom validations. * diff --git a/lib/classes/event/blog_entries_viewed.php b/lib/classes/event/blog_entries_viewed.php index e240ffbe1c1..456687d0445 100644 --- a/lib/classes/event/blog_entries_viewed.php +++ b/lib/classes/event/blog_entries_viewed.php @@ -91,22 +91,6 @@ class blog_entries_viewed extends base { return new \moodle_url('/blog/index.php', $params); } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $params = array(); - foreach ($this->validparams as $param) { - if (!empty($this->other[$param])) { - $params[$param] = $this->other[$param]; - } - } - $url = new \moodle_url('index.php', $params); - return array (SITEID, 'blog', 'view', $url->out(), 'view blog entry'); - } - public static function get_other_mapping() { $othermapped = array(); $othermapped['entryid'] = array('db' => 'post', 'restore' => base::NOT_MAPPED); diff --git a/lib/classes/event/blog_entry_created.php b/lib/classes/event/blog_entry_created.php index ff697ea9c6b..121aac05165 100644 --- a/lib/classes/event/blog_entry_created.php +++ b/lib/classes/event/blog_entry_created.php @@ -99,34 +99,6 @@ class blog_entry_created extends base { return new \moodle_url('/blog/index.php', array('entryid' => $this->objectid)); } - /** - * Does this event replace legacy event? - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'blog_entry_added'; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \blog_entry - */ - protected function get_legacy_eventdata() { - return $this->blogentry; - } - - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array (SITEID, 'blog', 'add', 'index.php?userid=' . $this->relateduserid . '&entryid=' . $this->objectid, - $this->blogentry->subject); - } - /** * Custom validations. * diff --git a/lib/classes/event/blog_entry_deleted.php b/lib/classes/event/blog_entry_deleted.php index 74a067e947a..aba7161e340 100644 --- a/lib/classes/event/blog_entry_deleted.php +++ b/lib/classes/event/blog_entry_deleted.php @@ -90,34 +90,6 @@ class blog_entry_deleted extends base { return "The user with id '$this->userid' deleted the blog entry with id '$this->objectid'."; } - /** - * Does this event replace legacy event? - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'blog_entry_deleted'; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \blog_entry - */ - protected function get_legacy_eventdata() { - return $this->blogentry; - } - - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array (SITEID, 'blog', 'delete', 'index.php?userid=' . $this->relateduserid, 'deleted blog entry with entry id# '. - $this->objectid); - } - /** * Custom validations. * diff --git a/lib/classes/event/blog_entry_updated.php b/lib/classes/event/blog_entry_updated.php index 73959b6d8c0..78347668c8c 100644 --- a/lib/classes/event/blog_entry_updated.php +++ b/lib/classes/event/blog_entry_updated.php @@ -97,34 +97,6 @@ class blog_entry_updated extends base { return new \moodle_url('/blog/index.php', array('entryid' => $this->objectid)); } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \blog_entry - */ - protected function get_legacy_eventdata() { - return $this->blogentry; - } - - /** - * Legacy event name. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'blog_entry_edited'; - } - - /** - * Replace legacy add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array(SITEID, 'blog', 'update', 'index.php?userid=' . $this->relateduserid . '&entryid=' . $this->objectid, - $this->blogentry->subject); - } - /** * Custom validations. * diff --git a/lib/classes/event/calendar_event_created.php b/lib/classes/event/calendar_event_created.php index a98c238b922..8a163c77cee 100644 --- a/lib/classes/event/calendar_event_created.php +++ b/lib/classes/event/calendar_event_created.php @@ -84,15 +84,6 @@ class calendar_event_created extends base { 'event_' . $this->objectid); } - /** - * Replace legacy add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'calendar', 'add', 'event.php?action=edit&id=' . $this->objectid , $this->other['name']); - } - /** * Custom validation. * diff --git a/lib/classes/event/calendar_event_updated.php b/lib/classes/event/calendar_event_updated.php index 1826f3d0a9f..9aa4da9b0bd 100644 --- a/lib/classes/event/calendar_event_updated.php +++ b/lib/classes/event/calendar_event_updated.php @@ -83,15 +83,6 @@ class calendar_event_updated extends base { return new \moodle_url('/calendar/event.php', array('action' => 'edit', 'id' => $this->objectid)); } - /** - * Replace legacy add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'calendar', 'edit', 'event.php?action=edit&id=' . $this->objectid, $this->other['name']); - } - /** * Custom validation. * diff --git a/lib/classes/event/cohort_created.php b/lib/classes/event/cohort_created.php index 764245416ac..57f40321fcf 100644 --- a/lib/classes/event/cohort_created.php +++ b/lib/classes/event/cohort_created.php @@ -73,24 +73,6 @@ class cohort_created extends base { return new \moodle_url('/cohort/index.php', array('contextid' => $this->contextid)); } - /** - * Return legacy event name. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'cohort_added'; - } - - /** - * Return legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('cohort', $this->objectid); - } - public static function get_objectid_mapping() { // Cohorts are not included in backups, so no mapping is needed for restore. return array('db' => 'cohort', 'restore' => base::NOT_MAPPED); diff --git a/lib/classes/event/cohort_deleted.php b/lib/classes/event/cohort_deleted.php index 37406cc752b..c8b2ab0f730 100644 --- a/lib/classes/event/cohort_deleted.php +++ b/lib/classes/event/cohort_deleted.php @@ -73,24 +73,6 @@ class cohort_deleted extends base { return new \moodle_url('/cohort/index.php', array('contextid' => $this->contextid)); } - /** - * Return legacy event name. - * - * @return null|string legacy event name - */ - public static function get_legacy_eventname() { - return 'cohort_deleted'; - } - - /** - * Return legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('cohort', $this->objectid); - } - public static function get_objectid_mapping() { // Cohorts are not included in backups, so no mapping is needed for restore. return array('db' => 'cohort', 'restore' => base::NOT_MAPPED); diff --git a/lib/classes/event/cohort_member_added.php b/lib/classes/event/cohort_member_added.php index 0390569ea14..b9c9a397a06 100644 --- a/lib/classes/event/cohort_member_added.php +++ b/lib/classes/event/cohort_member_added.php @@ -74,27 +74,6 @@ class cohort_member_added extends base { return new \moodle_url('/cohort/assign.php', array('id' => $this->objectid)); } - /** - * Return legacy event name. - * - * @return string legacy event name. - */ - public static function get_legacy_eventname() { - return 'cohort_member_added'; - } - - /** - * Return legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $data = new \stdClass(); - $data->cohortid = $this->objectid; - $data->userid = $this->relateduserid; - return $data; - } - /** * Custom validations. * diff --git a/lib/classes/event/cohort_member_removed.php b/lib/classes/event/cohort_member_removed.php index 6152fa6233f..36872b8cce5 100644 --- a/lib/classes/event/cohort_member_removed.php +++ b/lib/classes/event/cohort_member_removed.php @@ -75,27 +75,6 @@ class cohort_member_removed extends base { return new \moodle_url('/cohort/assign.php', array('id' => $this->objectid)); } - /** - * Return legacy event name. - * - * @return string legacy event name. - */ - public static function get_legacy_eventname() { - return 'cohort_member_removed'; - } - - /** - * Return legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $data = new \stdClass(); - $data->cohortid = $this->objectid; - $data->userid = $this->relateduserid; - return $data; - } - /** * Custom validations. * diff --git a/lib/classes/event/cohort_updated.php b/lib/classes/event/cohort_updated.php index 2ee6fe2f7ee..b62cb18a63e 100644 --- a/lib/classes/event/cohort_updated.php +++ b/lib/classes/event/cohort_updated.php @@ -73,24 +73,6 @@ class cohort_updated extends base { return new \moodle_url('/cohort/edit.php', array('id' => $this->objectid)); } - /** - * Return legacy event name. - * - * @return string legacy event name. - */ - public static function get_legacy_eventname() { - return 'cohort_updated'; - } - - /** - * Return legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('cohort', $this->objectid); - } - public static function get_objectid_mapping() { // Cohorts are not included in backups, so no mapping is needed for restore. return array('db' => 'cohort', 'restore' => base::NOT_MAPPED); diff --git a/lib/classes/event/content_viewed.php b/lib/classes/event/content_viewed.php index 517ad118429..99556f2bd96 100644 --- a/lib/classes/event/content_viewed.php +++ b/lib/classes/event/content_viewed.php @@ -95,24 +95,6 @@ abstract class content_viewed extends base { return "The user with id '$this->userid' viewed content."; } - /** - * Set legacy logdata. - * - * @param array $legacydata legacy logdata. - */ - public function set_legacy_logdata(array $legacydata) { - $this->legacylogdata = $legacydata; - } - - /** - * Get legacy logdata. - * - * @return null|array legacy log data. - */ - protected function get_legacy_logdata() { - return $this->legacylogdata; - } - /** * Custom validation. * diff --git a/lib/classes/event/course_category_created.php b/lib/classes/event/course_category_created.php index ceed8dea490..9aae62bedc4 100644 --- a/lib/classes/event/course_category_created.php +++ b/lib/classes/event/course_category_created.php @@ -72,15 +72,6 @@ class course_category_created extends base { return "The user with id '$this->userid' created the course category with id '$this->objectid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'category', 'add', 'editcategory.php?id=' . $this->objectid, $this->objectid); - } - public static function get_objectid_mapping() { // Categories are not backed up, so no need to map them on restore. return array('db' => 'course_categories', 'restore' => base::NOT_MAPPED); diff --git a/lib/classes/event/course_category_deleted.php b/lib/classes/event/course_category_deleted.php index bac3029b1f9..02b89cdf766 100644 --- a/lib/classes/event/course_category_deleted.php +++ b/lib/classes/event/course_category_deleted.php @@ -79,24 +79,6 @@ class course_category_deleted extends base { return $descr; } - /** - * Returns the name of the legacy event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_category_deleted'; - } - - /** - * Returns the legacy event data. - * - * @return \core_course_category the category that was deleted - */ - protected function get_legacy_eventdata() { - return $this->coursecat; - } - /** * Set custom data of the event - deleted coursecat. * @@ -119,15 +101,6 @@ class course_category_deleted extends base { return $this->coursecat; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'category', 'delete', 'index.php', $this->other['name'] . '(ID ' . $this->objectid . ')'); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_category_updated.php b/lib/classes/event/course_category_updated.php index 72a262fc66e..43c88e7e1f9 100644 --- a/lib/classes/event/course_category_updated.php +++ b/lib/classes/event/course_category_updated.php @@ -75,28 +75,6 @@ class course_category_updated extends base { return "The user with id '$this->userid' updated the course category with id '$this->objectid'."; } - /** - * Set the legacy data used for add_to_log(). - * - * @param array $logdata - */ - public function set_legacy_logdata($logdata) { - $this->legacylogdata = $logdata; - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if (!empty($this->legacylogdata)) { - return $this->legacylogdata; - } - - return array(SITEID, 'category', 'update', 'editcategory.php?id=' . $this->objectid, $this->objectid); - } - public static function get_objectid_mapping() { // Categories are not backed up, so no need to map them on restore. return array('db' => 'course_categories', 'restore' => base::NOT_MAPPED); diff --git a/lib/classes/event/course_completed.php b/lib/classes/event/course_completed.php index b01c626cb44..0f3bbc0230c 100644 --- a/lib/classes/event/course_completed.php +++ b/lib/classes/event/course_completed.php @@ -97,24 +97,6 @@ class course_completed extends base { return new \moodle_url('/report/completion/index.php', array('course' => $this->courseid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_completed'; - } - - /** - * Return course_completed legacy event data. - * - * @return \stdClass completion data. - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('course_completions', $this->objectid); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_completion_updated.php b/lib/classes/event/course_completion_updated.php index 2efb21cff79..f8b115af290 100644 --- a/lib/classes/event/course_completion_updated.php +++ b/lib/classes/event/course_completion_updated.php @@ -70,13 +70,4 @@ class course_completion_updated extends base { public function get_url() { return new \moodle_url('/course/completion.php', array('id' => $this->courseid)); } - - /** - * Return legacy add_to_log() data. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'completion updated', 'completion.php?id=' . $this->courseid); - } } diff --git a/lib/classes/event/course_content_deleted.php b/lib/classes/event/course_content_deleted.php index c5207a85335..9164fa37185 100644 --- a/lib/classes/event/course_content_deleted.php +++ b/lib/classes/event/course_content_deleted.php @@ -69,28 +69,6 @@ class course_content_deleted extends base { return "The user with id '$this->userid' deleted content from course with id '$this->courseid'."; } - /** - * Returns the name of the legacy event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_content_removed'; - } - - /** - * Returns the legacy event data. - * - * @return \stdClass the course the content was deleted from - */ - protected function get_legacy_eventdata() { - $course = $this->get_record_snapshot('course', $this->objectid); - $course->context = $this->context; - $course->options = $this->other['options']; - - return $course; - } - /** * Custom validation. * diff --git a/lib/classes/event/course_created.php b/lib/classes/event/course_created.php index 418a2c291c5..83710fa9691 100644 --- a/lib/classes/event/course_created.php +++ b/lib/classes/event/course_created.php @@ -79,33 +79,6 @@ class course_created extends base { return new \moodle_url('/course/view.php', array('id' => $this->objectid)); } - /** - * Returns the name of the legacy event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_created'; - } - - /** - * Returns the legacy event data. - * - * @return \stdClass the course that was created - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('course', $this->objectid); - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'course', 'new', 'view.php?id=' . $this->objectid, $this->other['fullname'] . ' (ID ' . $this->objectid . ')'); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_deleted.php b/lib/classes/event/course_deleted.php index ea2734ae1ba..1d0be19e10d 100644 --- a/lib/classes/event/course_deleted.php +++ b/lib/classes/event/course_deleted.php @@ -71,36 +71,6 @@ class course_deleted extends base { return "The user with id '$this->userid' deleted the course with id '$this->courseid'."; } - /** - * Returns the name of the legacy event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_deleted'; - } - - /** - * Returns the legacy event data. - * - * @return \stdClass the course that was deleted - */ - protected function get_legacy_eventdata() { - $course = $this->get_record_snapshot('course', $this->objectid); - $course->context = $this->context; - $course->timemodified = $this->data['timecreated']; - return $course; - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'course', 'delete', 'view.php?id=' . $this->objectid, $this->other['fullname'] . '(ID ' . $this->objectid . ')'); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_module_completion_updated.php b/lib/classes/event/course_module_completion_updated.php index f3f46976100..a670d702e2a 100644 --- a/lib/classes/event/course_module_completion_updated.php +++ b/lib/classes/event/course_module_completion_updated.php @@ -84,24 +84,6 @@ class course_module_completion_updated extends base { return new \moodle_url('/report/progress/index.php', array('course' => $this->courseid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'activity_completion_changed'; - } - - /** - * Return course module completion legacy event data. - * - * @return \stdClass completion data. - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('course_modules_completion', $this->objectid); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_module_created.php b/lib/classes/event/course_module_created.php index fba54873c78..ed505129bef 100644 --- a/lib/classes/event/course_module_created.php +++ b/lib/classes/event/course_module_created.php @@ -110,44 +110,6 @@ class course_module_created extends base { return new \moodle_url('/mod/' . $this->other['modulename'] . '/view.php', array('id' => $this->objectid)); } - /** - * Legacy event name. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'mod_created'; - } - - /** - * Legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = $this->other['modulename']; - $eventdata->name = $this->other['name']; - $eventdata->cmid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - return $eventdata; - } - - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $log1 = array($this->courseid, "course", "add mod", "../mod/" . $this->other['modulename'] . "/view.php?id=" . - $this->objectid, $this->other['modulename'] . " " . $this->other['instanceid']); - $log2 = array($this->courseid, $this->other['modulename'], "add", - "view.php?id={$this->objectid}", - "{$this->other['instanceid']}", $this->objectid); - return array($log1, $log2); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_module_deleted.php b/lib/classes/event/course_module_deleted.php index f2289ea7a28..834e4675ecb 100644 --- a/lib/classes/event/course_module_deleted.php +++ b/lib/classes/event/course_module_deleted.php @@ -72,39 +72,6 @@ class course_module_deleted extends base { "course module id '$this->contextinstanceid'."; } - /** - * Legacy event name. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'mod_deleted'; - } - - /** - * Legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = $this->other['modulename']; - $eventdata->cmid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - return $eventdata; - } - - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array ($this->courseid, "course", "delete mod", "view.php?id=$this->courseid", - $this->other['modulename'] . " " . $this->other['instanceid'], $this->objectid); - } - /** * custom validations * diff --git a/lib/classes/event/course_module_instance_list_viewed.php b/lib/classes/event/course_module_instance_list_viewed.php index f1437bca6fb..341da811637 100644 --- a/lib/classes/event/course_module_instance_list_viewed.php +++ b/lib/classes/event/course_module_instance_list_viewed.php @@ -90,16 +90,6 @@ abstract class course_module_instance_list_viewed extends base{ return new \moodle_url("/mod/$this->modname/index.php", array('id' => $this->courseid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, $this->modname, 'view all', 'index.php?id=' . $this->courseid, ''); - } - - /** * Custom validation. * diff --git a/lib/classes/event/course_module_updated.php b/lib/classes/event/course_module_updated.php index 70f76e578e1..f76d15e7afe 100644 --- a/lib/classes/event/course_module_updated.php +++ b/lib/classes/event/course_module_updated.php @@ -81,44 +81,6 @@ class course_module_updated extends base { return new \moodle_url('/mod/' . $this->other['modulename'] . '/view.php', array('id' => $this->objectid)); } - /** - * Legacy event name. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'mod_updated'; - } - - /** - * Legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = $this->other['modulename']; - $eventdata->name = $this->other['name']; - $eventdata->cmid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - return $eventdata; - } - - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $log1 = array($this->courseid, "course", "update mod", "../mod/" . $this->other['modulename'] . "/view.php?id=" . - $this->objectid, $this->other['modulename'] . " " . $this->other['instanceid']); - $log2 = array($this->courseid, $this->other['modulename'], "update", - "view.php?id={$this->objectid}", - "{$this->other['instanceid']}", $this->objectid); - return array($log1, $log2); - } - /** * custom validations * diff --git a/lib/classes/event/course_module_viewed.php b/lib/classes/event/course_module_viewed.php index 357e8e33a11..a2a0720a0c1 100644 --- a/lib/classes/event/course_module_viewed.php +++ b/lib/classes/event/course_module_viewed.php @@ -77,16 +77,6 @@ abstract class course_module_viewed extends base { return new \moodle_url("/mod/$this->objecttable/view.php", array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, $this->objecttable, 'view', 'view.php?id=' . $this->contextinstanceid, $this->objectid, - $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_resources_list_viewed.php b/lib/classes/event/course_resources_list_viewed.php index b8318d55079..973f642c78c 100644 --- a/lib/classes/event/course_resources_list_viewed.php +++ b/lib/classes/event/course_resources_list_viewed.php @@ -75,35 +75,6 @@ class course_resources_list_viewed extends base { return new \moodle_url("/course/resources.php", array('id' => $this->courseid)); } - /** - * List of resource types enabled in the system. This is used for legacy logging to log one record for each resource type. - * - * There is no public getter for this data because it does not depend on the - * course. It always includes the list of all resource types in the system - * even when some of them are not present in the course. - * - * @param array $data - */ - public function set_legacy_logdata($data) { - $this->resourceslist = $data; - } - - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - if (empty($this->resourceslist)) { - return null; - } - $logs = array(); - foreach ($this->resourceslist as $resourcename) { - $logs[] = array($this->courseid, $resourcename, 'view all', 'index.php?id=' . $this->courseid, ''); - } - return $logs; - } - /** * Custom validation. * diff --git a/lib/classes/event/course_restored.php b/lib/classes/event/course_restored.php index 7b72e4cadda..fd65c6b2c62 100644 --- a/lib/classes/event/course_restored.php +++ b/lib/classes/event/course_restored.php @@ -91,32 +91,6 @@ class course_restored extends base { return new \moodle_url('/course/view.php', array('id' => $this->objectid)); } - /** - * Returns the name of the legacy event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_restored'; - } - - /** - * Returns the legacy event data. - * - * @return \stdClass the legacy event data - */ - protected function get_legacy_eventdata() { - return (object) array( - 'courseid' => $this->objectid, - 'userid' => $this->userid, - 'type' => $this->other['type'], - 'target' => $this->other['target'], - 'mode' => $this->other['mode'], - 'operation' => $this->other['operation'], - 'samesite' => $this->other['samesite'], - ); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_section_deleted.php b/lib/classes/event/course_section_deleted.php index e73f1449a5c..e6cfd0dfa49 100644 --- a/lib/classes/event/course_section_deleted.php +++ b/lib/classes/event/course_section_deleted.php @@ -73,15 +73,6 @@ class course_section_deleted extends base { "(section name '{$this->other['sectionname']}') for the course with id '$this->courseid'"; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'delete section', 'view.php?id=' . $this->courseid, $this->other['sectionnum']); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_section_updated.php b/lib/classes/event/course_section_updated.php index 7bca3acc272..9fd4858eb9e 100644 --- a/lib/classes/event/course_section_updated.php +++ b/lib/classes/event/course_section_updated.php @@ -81,16 +81,6 @@ class course_section_updated extends base { return new \moodle_url('/course/editsection.php', array('id' => $this->objectid)); } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $sectiondata = $this->get_record_snapshot('course_sections', $this->objectid); - return array($this->courseid, 'course', 'editsection', 'editsection.php?id=' . $this->objectid, $sectiondata->section); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_updated.php b/lib/classes/event/course_updated.php index 2c9e59d42ce..a717f62ecee 100644 --- a/lib/classes/event/course_updated.php +++ b/lib/classes/event/course_updated.php @@ -83,42 +83,6 @@ class course_updated extends base { return new \moodle_url('/course/edit.php', array('id' => $this->objectid)); } - /** - * Returns the name of the legacy event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'course_updated'; - } - - /** - * Returns the legacy event data. - * - * @return \stdClass the course that was updated - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('course', $this->objectid); - } - - /** - * Set the legacy data used for add_to_log(). - * - * @param array $logdata - */ - public function set_legacy_logdata($logdata) { - $this->legacylogdata = $logdata; - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return $this->legacylogdata; - } - public static function get_objectid_mapping() { return array('db' => 'course', 'restore' => 'course'); } diff --git a/lib/classes/event/course_user_report_viewed.php b/lib/classes/event/course_user_report_viewed.php index 45b5f279c8f..e9ff2cd3c53 100644 --- a/lib/classes/event/course_user_report_viewed.php +++ b/lib/classes/event/course_user_report_viewed.php @@ -82,16 +82,6 @@ class course_user_report_viewed extends base { 'mode' => $this->other['mode'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'user report', 'user.php?id=' . $this->courseid . '&user=' - . $this->relateduserid . '&mode=' . $this->other['mode'], $this->relateduserid); - } - /** * Custom validation. * diff --git a/lib/classes/event/course_viewed.php b/lib/classes/event/course_viewed.php index 4f4d9b38f7c..c290647c3aa 100644 --- a/lib/classes/event/course_viewed.php +++ b/lib/classes/event/course_viewed.php @@ -104,30 +104,6 @@ class course_viewed extends base { } } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - if ($this->courseid == SITEID and !isloggedin()) { - // We did not log frontpage access in older Moodle versions. - return null; - } - - // We keep compatibility with 2.7 and 2.8 other['coursesectionid']. - if (isset($this->other['coursesectionnumber']) || isset($this->other['coursesectionid'])) { - if (isset($this->other['coursesectionnumber'])) { - $sectionnumber = $this->other['coursesectionnumber']; - } else { - $sectionnumber = $this->other['coursesectionid']; - } - return array($this->courseid, 'course', 'view section', 'view.php?id=' . $this->courseid . '&section=' - . $sectionnumber, $sectionnumber); - } - return array($this->courseid, 'course', 'view', 'view.php?id=' . $this->courseid, $this->courseid); - } - /** * Custom validation. * diff --git a/lib/classes/event/email_failed.php b/lib/classes/event/email_failed.php index e6fcbc9cfc8..e48c60d8811 100644 --- a/lib/classes/event/email_failed.php +++ b/lib/classes/event/email_failed.php @@ -72,15 +72,6 @@ class email_failed extends base { due to the following error: \"{$this->other['errorinfo']}\"."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'library', 'mailer', qualified_me(), 'ERROR: ' . $this->other['errorinfo']); - } - /** * Custom validation. * diff --git a/lib/classes/event/group_created.php b/lib/classes/event/group_created.php index 71421da72c8..03cc8f94866 100644 --- a/lib/classes/event/group_created.php +++ b/lib/classes/event/group_created.php @@ -44,24 +44,6 @@ class group_created extends base { return "The user with id '$this->userid' created the group with id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('groups', $this->objectid); - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_group_created'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/group_deleted.php b/lib/classes/event/group_deleted.php index b574cb43abf..192313a824a 100644 --- a/lib/classes/event/group_deleted.php +++ b/lib/classes/event/group_deleted.php @@ -44,24 +44,6 @@ class group_deleted extends base { return "The user with id '$this->userid' deleted the group with id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('groups', $this->objectid); - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_group_deleted'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/group_member_added.php b/lib/classes/event/group_member_added.php index 51fdacdc288..9d10843275b 100644 --- a/lib/classes/event/group_member_added.php +++ b/lib/classes/event/group_member_added.php @@ -52,29 +52,6 @@ class group_member_added extends base { "id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->groupid = $this->objectid; - $eventdata->userid = $this->relateduserid; - $eventdata->component = $this->other['component']; - $eventdata->itemid = $this->other['itemid']; - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_member_added'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/group_member_removed.php b/lib/classes/event/group_member_removed.php index 122059b051b..a8f0b138c02 100644 --- a/lib/classes/event/group_member_removed.php +++ b/lib/classes/event/group_member_removed.php @@ -45,27 +45,6 @@ class group_member_removed extends base { "id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->groupid = $this->objectid; - $eventdata->userid = $this->relateduserid; - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_member_removed'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/group_updated.php b/lib/classes/event/group_updated.php index e56a5d99dd9..b4da9aadaed 100644 --- a/lib/classes/event/group_updated.php +++ b/lib/classes/event/group_updated.php @@ -44,24 +44,6 @@ class group_updated extends base { return "The user with id '$this->userid' updated the group with id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('groups', $this->objectid); - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_group_updated'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/grouping_created.php b/lib/classes/event/grouping_created.php index eb58c0d9029..4cca082aa14 100644 --- a/lib/classes/event/grouping_created.php +++ b/lib/classes/event/grouping_created.php @@ -44,24 +44,6 @@ class grouping_created extends base { return "The user with id '$this->userid' created the grouping with id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('groupings', $this->objectid); - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_grouping_created'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/grouping_deleted.php b/lib/classes/event/grouping_deleted.php index ac1188ed60b..3d42984e488 100644 --- a/lib/classes/event/grouping_deleted.php +++ b/lib/classes/event/grouping_deleted.php @@ -51,24 +51,6 @@ class grouping_deleted extends base { return "The user with id '$this->userid' deleted the grouping with id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('groupings', $this->objectid); - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_grouping_deleted'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/grouping_updated.php b/lib/classes/event/grouping_updated.php index 1892198d7ae..5a8dc43b9cf 100644 --- a/lib/classes/event/grouping_updated.php +++ b/lib/classes/event/grouping_updated.php @@ -44,24 +44,6 @@ class grouping_updated extends base { return "The user with id '$this->userid' updated the grouping with id '$this->objectid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('groupings', $this->objectid); - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'groups_grouping_updated'; - } - /** * Return localised event name. * diff --git a/lib/classes/event/message_contact_added.php b/lib/classes/event/message_contact_added.php index e2b48ea0f6f..b4785691d60 100644 --- a/lib/classes/event/message_contact_added.php +++ b/lib/classes/event/message_contact_added.php @@ -72,16 +72,6 @@ class message_contact_added extends base { return "The user with id '$this->userid' added the user with id '$this->relateduserid' to their contact list."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'message', 'add contact', 'index.php?user1=' . $this->relateduserid . - '&user2=' . $this->userid, $this->relateduserid); - } - /** * Custom validation. * diff --git a/lib/classes/event/message_contact_removed.php b/lib/classes/event/message_contact_removed.php index 60000d1b7d7..872f4858d40 100644 --- a/lib/classes/event/message_contact_removed.php +++ b/lib/classes/event/message_contact_removed.php @@ -72,16 +72,6 @@ class message_contact_removed extends base { return "The user with id '$this->userid' removed the user with id '$this->relateduserid' from their contact list."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'message', 'remove contact', 'index.php?user1=' . $this->relateduserid . '&user2=' . - $this->userid, $this->relateduserid); - } - /** * Custom validation. * diff --git a/lib/classes/event/message_sent.php b/lib/classes/event/message_sent.php index 0bfe22c0dc6..cd712303849 100644 --- a/lib/classes/event/message_sent.php +++ b/lib/classes/event/message_sent.php @@ -111,23 +111,6 @@ class message_sent extends base { return "A message was sent by the system to the user with id '$this->relateduserid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - // The add_to_log function was only ever called when we sent a message from one user to another. We do not want - // to return the legacy log data if we are sending a system message, so check that the userid is valid. - if (\core_user::is_real_user($this->userid)) { - $messageid = $this->other['messageid'] ?? $this->objectid; // For BC we may have 'messageid' in other. - return array(SITEID, 'message', 'write', 'index.php?user=' . $this->userid . '&id=' . $this->relateduserid . - '&history=1#m' . $messageid, $this->userid); - } - - return null; - } - /** * Custom validation. * diff --git a/lib/classes/event/mnet_access_control_created.php b/lib/classes/event/mnet_access_control_created.php index 69e47cc8367..8128b252384 100644 --- a/lib/classes/event/mnet_access_control_created.php +++ b/lib/classes/event/mnet_access_control_created.php @@ -82,16 +82,6 @@ class mnet_access_control_created extends base { "belonging to mnet host '{$this->other['hostname']}'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'admin/mnet', 'add', 'admin/mnet/access_control.php', 'SSO ACL: ' . $this->other['accessctrl'] . - ' user \'' . $this->other['username'] . '\' from ' . $this->other['hostname']); - } - /** * Custom validation. * diff --git a/lib/classes/event/mnet_access_control_updated.php b/lib/classes/event/mnet_access_control_updated.php index 9ac0048bd29..1a63ecfd3d2 100644 --- a/lib/classes/event/mnet_access_control_updated.php +++ b/lib/classes/event/mnet_access_control_updated.php @@ -82,16 +82,6 @@ class mnet_access_control_updated extends base { "belonging to mnet host '{$this->other['hostname']}'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'admin/mnet', 'update', 'admin/mnet/access_control.php', 'SSO ACL: ' . $this->other['accessctrl'] . - ' user \'' . $this->other['username'] . '\' from ' . $this->other['hostname']); - } - /** * Custom validation. * diff --git a/lib/classes/event/note_created.php b/lib/classes/event/note_created.php index dd75b755ee2..6e8d6d094bf 100644 --- a/lib/classes/event/note_created.php +++ b/lib/classes/event/note_created.php @@ -82,17 +82,6 @@ class note_created extends base { return $logurl; } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $logurl = new \moodle_url('index.php', array('course' => $this->courseid, 'user' => $this->relateduserid)); - $logurl->set_anchor('note-' . $this->objectid); - return array($this->courseid, 'notes', 'add', $logurl, 'add note'); - } - /** * Custom validation. * diff --git a/lib/classes/event/note_deleted.php b/lib/classes/event/note_deleted.php index 772414a0635..451268fbcf4 100644 --- a/lib/classes/event/note_deleted.php +++ b/lib/classes/event/note_deleted.php @@ -72,17 +72,6 @@ class note_deleted extends base { "'$this->relateduserid'"; } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $logurl = new \moodle_url('index.php', array('course' => $this->courseid, 'user' => $this->relateduserid)); - $logurl->set_anchor('note-' . $this->objectid); - return array($this->courseid, 'notes', 'delete', $logurl, 'delete note'); - } - /** * Custom validation. * diff --git a/lib/classes/event/note_updated.php b/lib/classes/event/note_updated.php index aa28dea53a7..1e13016e6b9 100644 --- a/lib/classes/event/note_updated.php +++ b/lib/classes/event/note_updated.php @@ -82,17 +82,6 @@ class note_updated extends base { return $logurl; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $logurl = new \moodle_url('index.php', array('course' => $this->courseid, 'user' => $this->relateduserid)); - $logurl->set_anchor('note-' . $this->objectid); - return array($this->courseid, 'notes', 'update', $logurl, 'update note'); - } - /** * Custom validation. * diff --git a/lib/classes/event/notes_viewed.php b/lib/classes/event/notes_viewed.php index ccbbc5d2148..d8e91f3e79c 100644 --- a/lib/classes/event/notes_viewed.php +++ b/lib/classes/event/notes_viewed.php @@ -76,14 +76,4 @@ class notes_viewed extends base { public function get_url() { return new \moodle_url('/notes/index.php', array('course' => $this->courseid, 'user' => $this->relateduserid)); } - - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'notes', 'view', 'index.php?course=' . $this->courseid.'&user=' . $this->relateduserid, - 'view notes'); - } } diff --git a/lib/classes/event/question_category_created.php b/lib/classes/event/question_category_created.php index 2b6baf14e05..31605371a43 100644 --- a/lib/classes/event/question_category_created.php +++ b/lib/classes/event/question_category_created.php @@ -61,19 +61,4 @@ class question_category_created extends question_category_base { public function get_description() { return "The user with id '$this->userid' created the question category with id '$this->objectid'."; } - - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - if ($this->contextlevel == CONTEXT_MODULE) { - return array($this->courseid, 'quiz', 'addcategory', 'view.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid); - } - // This is not related to individual quiz at all. - return null; - } - } diff --git a/lib/classes/event/recent_activity_viewed.php b/lib/classes/event/recent_activity_viewed.php index 2c8568708d8..e2d6ef95780 100644 --- a/lib/classes/event/recent_activity_viewed.php +++ b/lib/classes/event/recent_activity_viewed.php @@ -64,15 +64,6 @@ class recent_activity_viewed extends base { return "The user with id '$this->userid' viewed the recent activity report in the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "course", "recent", "recent.php?id=$this->courseid", $this->courseid); - } - /** * Returns relevant URL. * diff --git a/lib/classes/event/role_allow_assign_updated.php b/lib/classes/event/role_allow_assign_updated.php index 850f89414b0..92b44679b70 100644 --- a/lib/classes/event/role_allow_assign_updated.php +++ b/lib/classes/event/role_allow_assign_updated.php @@ -73,13 +73,4 @@ class role_allow_assign_updated extends base { public function get_url() { return new \moodle_url('/admin/roles/allow.php', array('mode' => 'assign')); } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'role', 'edit allow assign', 'admin/roles/allow.php?mode=assign'); - } } diff --git a/lib/classes/event/role_allow_override_updated.php b/lib/classes/event/role_allow_override_updated.php index a405116fade..b06efa5547e 100644 --- a/lib/classes/event/role_allow_override_updated.php +++ b/lib/classes/event/role_allow_override_updated.php @@ -73,13 +73,4 @@ class role_allow_override_updated extends base { public function get_url() { return new \moodle_url('/admin/roles/allow.php', array('mode' => 'override')); } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'role', 'edit allow override', 'admin/roles/allow.php?mode=override'); - } } diff --git a/lib/classes/event/role_allow_switch_updated.php b/lib/classes/event/role_allow_switch_updated.php index 70b8c36374e..1b75e4c1c80 100644 --- a/lib/classes/event/role_allow_switch_updated.php +++ b/lib/classes/event/role_allow_switch_updated.php @@ -73,13 +73,4 @@ class role_allow_switch_updated extends base { public function get_url() { return new \moodle_url('/admin/roles/allow.php', array('mode' => 'switch')); } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'role', 'edit allow switch', 'admin/roles/allow.php?mode=switch'); - } } diff --git a/lib/classes/event/role_allow_view_updated.php b/lib/classes/event/role_allow_view_updated.php index 7603988570e..27586d41b17 100644 --- a/lib/classes/event/role_allow_view_updated.php +++ b/lib/classes/event/role_allow_view_updated.php @@ -73,13 +73,4 @@ class role_allow_view_updated extends base { public function get_url() { return new \moodle_url('/admin/roles/allow.php', array('mode' => 'view')); } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'role', 'edit allow view', 'admin/roles/allow.php?mode=view'); - } } diff --git a/lib/classes/event/role_assigned.php b/lib/classes/event/role_assigned.php index 3eb3cf6b7bf..80c5fe7b607 100644 --- a/lib/classes/event/role_assigned.php +++ b/lib/classes/event/role_assigned.php @@ -80,37 +80,6 @@ class role_assigned extends base { return new \moodle_url('/admin/roles/assign.php', array('contextid' => $this->contextid, 'roleid' => $this->objectid)); } - /** - * Does this event replace legacy event? - * - * @return null|string legacy event name - */ - public static function get_legacy_eventname() { - return 'role_assigned'; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return mixed - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('role_assignments', $this->other['id']); - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - $roles = get_all_roles(); - $neededrole = array($this->objectid => $roles[$this->objectid]); - $rolenames = role_fix_names($neededrole, $this->get_context(), ROLENAME_ORIGINAL, true); - return array($this->courseid, 'role', 'assign', 'admin/roles/assign.php?contextid='.$this->contextid.'&roleid='.$this->objectid, - $rolenames[$this->objectid], '', $this->userid); - } - /** * Custom validation. * diff --git a/lib/classes/event/role_capabilities_updated.php b/lib/classes/event/role_capabilities_updated.php index 28f14d87d27..b1a1e6dad77 100644 --- a/lib/classes/event/role_capabilities_updated.php +++ b/lib/classes/event/role_capabilities_updated.php @@ -83,25 +83,6 @@ class role_capabilities_updated extends base { } } - /** - * Sets legacy log data. - * - * @param array $legacylogdata - * @return void - */ - public function set_legacy_logdata($legacylogdata) { - $this->legacylogdata = $legacylogdata; - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return null|array - */ - protected function get_legacy_logdata() { - return $this->legacylogdata; - } - public static function get_objectid_mapping() { return array('db' => 'role', 'restore' => 'role'); } diff --git a/lib/classes/event/role_deleted.php b/lib/classes/event/role_deleted.php index b2586fb1fdd..e8e5955bebe 100644 --- a/lib/classes/event/role_deleted.php +++ b/lib/classes/event/role_deleted.php @@ -79,16 +79,6 @@ class role_deleted extends base { return new \moodle_url('/admin/roles/manage.php'); } - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'role', 'delete', 'admin/roles/manage.php?action=delete&roleid=' . $this->objectid, - $this->other['shortname'], ''); - } - /** * Custom validation. * diff --git a/lib/classes/event/role_unassigned.php b/lib/classes/event/role_unassigned.php index 2eb34e2548f..5e65b3dc214 100644 --- a/lib/classes/event/role_unassigned.php +++ b/lib/classes/event/role_unassigned.php @@ -77,36 +77,6 @@ class role_unassigned extends base { return new \moodle_url('/admin/roles/assign.php', array('contextid' => $this->contextid, 'roleid' => $this->objectid)); } - /** - * Does this event replace legacy event? - * - * @return null|string legacy event name - */ - public static function get_legacy_eventname() { - return 'role_unassigned'; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return mixed - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('role_assignments', $this->other['id']); - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - $roles = get_all_roles(); - $rolenames = role_fix_names($roles, $this->get_context(), ROLENAME_ORIGINAL, true); - return array($this->courseid, 'role', 'unassign', 'admin/roles/assign.php?contextid='.$this->contextid.'&roleid='.$this->objectid, - $rolenames[$this->objectid], '', $this->userid); - } - /** * Custom validation. * diff --git a/lib/classes/event/role_updated.php b/lib/classes/event/role_updated.php index dd6e948d51e..f8863fece1b 100644 --- a/lib/classes/event/role_updated.php +++ b/lib/classes/event/role_updated.php @@ -71,16 +71,6 @@ class role_updated extends base { return new \moodle_url('/admin/roles/define.php', ['action' => 'edit', 'roleid' => $this->objectid]); } - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return [SITEID, 'role', 'update', 'admin/roles/manage.php?action=edit&roleid=' . $this->objectid, - $this->other['shortname'], '']; - } - /** * Custom validation. * diff --git a/lib/classes/event/tag_added.php b/lib/classes/event/tag_added.php index fecf439bbd0..6189d43180f 100644 --- a/lib/classes/event/tag_added.php +++ b/lib/classes/event/tag_added.php @@ -102,20 +102,6 @@ class tag_added extends base { return $event; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if ($this->other['itemtype'] === 'course') { - $url = 'tag/search.php?query=' . urlencode($this->other['tagrawname']); - return array($this->courseid, 'coursetags', 'add', $url, 'Course tagged'); - } - - return null; - } - /** * Custom validation. * diff --git a/lib/classes/event/tag_flagged.php b/lib/classes/event/tag_flagged.php index 2f7c26b3bef..cae2cfb6ac1 100644 --- a/lib/classes/event/tag_flagged.php +++ b/lib/classes/event/tag_flagged.php @@ -70,15 +70,6 @@ class tag_flagged extends base { return "The user with id '$this->userid' flagged the tag with id '$this->objectid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'tag', 'flag', 'index.php?id='. $this->objectid, $this->objectid, '', $this->userid); - } - /** * Custom validation. * diff --git a/lib/classes/event/tag_updated.php b/lib/classes/event/tag_updated.php index fe6b4f75399..069218c067a 100644 --- a/lib/classes/event/tag_updated.php +++ b/lib/classes/event/tag_updated.php @@ -73,28 +73,6 @@ class tag_updated extends base { return "The user with id '$this->userid' updated the tag with id '$this->objectid'."; } - /** - * Set the legacy data used for add_to_log(). - * - * @param array $logdata - */ - public function set_legacy_logdata($logdata) { - $this->legacylogdata = $logdata; - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if (isset($this->legacylogdata)) { - return $this->legacylogdata; - } - - return array($this->courseid, 'tag', 'update', 'index.php?id='. $this->objectid, $this->other['name']); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_created.php b/lib/classes/event/user_created.php index 9f93dae7c2e..3dbb1f5bc70 100644 --- a/lib/classes/event/user_created.php +++ b/lib/classes/event/user_created.php @@ -77,33 +77,6 @@ class user_created extends base { return new \moodle_url('/user/view.php', array('id' => $this->objectid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_created'; - } - - /** - * Return user_created legacy event data. - * - * @return \stdClass user data. - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('user', $this->objectid); - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'user', 'add', '/view.php?id='.$this->objectid, fullname($this->get_legacy_eventdata())); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_deleted.php b/lib/classes/event/user_deleted.php index fc3fb85f772..1394bb03d36 100644 --- a/lib/classes/event/user_deleted.php +++ b/lib/classes/event/user_deleted.php @@ -72,41 +72,6 @@ class user_deleted extends base { return "The user with id '$this->userid' deleted the user with id '$this->objectid'."; } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_deleted'; - } - - /** - * Return user_deleted legacy event data. - * - * @return \stdClass user data. - */ - protected function get_legacy_eventdata() { - $user = $this->get_record_snapshot('user', $this->objectid); - $user->deleted = 0; - $user->username = $this->other['username']; - $user->email = $this->other['email']; - $user->idnumber = $this->other['idnumber']; - $user->picture = $this->other['picture']; - - return $user; - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->objectid); - return array(SITEID, 'user', 'delete', 'view.php?id=' . $user->id, $user->firstname . ' ' . $user->lastname); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_enrolment_created.php b/lib/classes/event/user_enrolment_created.php index 2b7670676d4..e686bcfea7a 100644 --- a/lib/classes/event/user_enrolment_created.php +++ b/lib/classes/event/user_enrolment_created.php @@ -78,36 +78,6 @@ class user_enrolment_created extends base { return new \moodle_url('/user/index.php', array('id' => $this->courseid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_enrolled'; - } - - /** - * Return user_enrolled legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $legacyeventdata = $this->get_record_snapshot('user_enrolments', $this->objectid); - $legacyeventdata->enrol = $this->other['enrol']; - $legacyeventdata->courseid = $this->courseid; - return $legacyeventdata; - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'enrol', '../enrol/users.php?id=' . $this->courseid, $this->courseid); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_enrolment_deleted.php b/lib/classes/event/user_enrolment_deleted.php index b343fbce061..a6ce3c9115f 100644 --- a/lib/classes/event/user_enrolment_deleted.php +++ b/lib/classes/event/user_enrolment_deleted.php @@ -79,33 +79,6 @@ class user_enrolment_deleted extends base { return new \moodle_url('/user/index.php', array('id' => $this->courseid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_unenrolled'; - } - - /** - * Return user_unenrolled legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - return (object)$this->other['userenrolment']; - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'unenrol', '../enrol/users.php?id=' . $this->courseid, $this->courseid); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_enrolment_updated.php b/lib/classes/event/user_enrolment_updated.php index d7abe4c31fd..b7945a67a9a 100644 --- a/lib/classes/event/user_enrolment_updated.php +++ b/lib/classes/event/user_enrolment_updated.php @@ -78,27 +78,6 @@ class user_enrolment_updated extends base { return new \moodle_url('/enrol/editenrolment.php', array('ue' => $this->objectid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_enrol_modified'; - } - - /** - * Return user_enrol_modified legacy event data. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $legacyeventdata = $this->get_record_snapshot('user_enrolments', $this->objectid); - $legacyeventdata->enrol = $this->other['enrol']; - $legacyeventdata->courseid = $this->courseid; - return $legacyeventdata; - } - /** * Custom validation. * diff --git a/lib/classes/event/user_graded.php b/lib/classes/event/user_graded.php index a9371ac9664..728e849fde5 100644 --- a/lib/classes/event/user_graded.php +++ b/lib/classes/event/user_graded.php @@ -131,20 +131,6 @@ class user_graded extends base { )); } - /** - * Return legacy log info. - * - * @return null|array of parameters to be passed to legacy add_to_log() function. - */ - public function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $fullname = fullname($user); - $info = $this->grade->grade_item->itemname . ': ' . $fullname; - $url = '/report/grader/index.php?id=' . $this->courseid; - - return array($this->courseid, 'grade', 'update', $url, $info); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_list_viewed.php b/lib/classes/event/user_list_viewed.php index ff1fec00dcb..37033e3684a 100644 --- a/lib/classes/event/user_list_viewed.php +++ b/lib/classes/event/user_list_viewed.php @@ -80,15 +80,6 @@ class user_list_viewed extends base { return new \moodle_url('/user/index.php', array('id' => $this->courseid)); } - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'user', 'view all', 'index.php?id=' . $this->courseid, ''); - } - public static function get_objectid_mapping() { return array('db' => 'course', 'restore' => 'course'); } diff --git a/lib/classes/event/user_loggedin.php b/lib/classes/event/user_loggedin.php index e199d003116..491d597a65f 100644 --- a/lib/classes/event/user_loggedin.php +++ b/lib/classes/event/user_loggedin.php @@ -51,16 +51,6 @@ class user_loggedin extends base { return "The user with id '$this->userid' has logged in."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'user', 'login', 'view.php?id=' . $this->data['objectid'] . '&course=' . SITEID, - $this->data['objectid'], 0, $this->data['objectid']); - } - /** * Return localised event name. * diff --git a/lib/classes/event/user_loggedinas.php b/lib/classes/event/user_loggedinas.php index 64c1f61e50c..6a599386d28 100644 --- a/lib/classes/event/user_loggedinas.php +++ b/lib/classes/event/user_loggedinas.php @@ -72,16 +72,6 @@ class user_loggedinas extends base { return "The user with id '$this->userid' has logged in as the user with id '$this->relateduserid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'loginas', '../user/view.php?id=' . $this->courseid . '&user=' . $this->userid, - $this->other['originalusername'] . ' -> ' . $this->other['loggedinasusername']); - } - /** * Get URL related to the action. * diff --git a/lib/classes/event/user_loggedout.php b/lib/classes/event/user_loggedout.php index e3831a53687..778d9a669f1 100644 --- a/lib/classes/event/user_loggedout.php +++ b/lib/classes/event/user_loggedout.php @@ -78,34 +78,6 @@ class user_loggedout extends base { return new \moodle_url('/user/view.php', array('id' => $this->objectid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_logout'; - } - - /** - * Return user_logout legacy event data. - * - * @return \stdClass user data. - */ - protected function get_legacy_eventdata() { - return $this->get_record_snapshot('user', $this->objectid); - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'user', 'logout', 'view.php?id='.$this->objectid.'&course='.SITEID, $this->objectid, 0, - $this->objectid); - } - public static function get_objectid_mapping() { return array('db' => 'user', 'restore' => 'user'); } diff --git a/lib/classes/event/user_login_failed.php b/lib/classes/event/user_login_failed.php index 98e7aa36064..e0687381caf 100644 --- a/lib/classes/event/user_login_failed.php +++ b/lib/classes/event/user_login_failed.php @@ -102,15 +102,6 @@ class user_login_failed extends base { } } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'login', 'error', 'index.php', $this->other['username']); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_password_updated.php b/lib/classes/event/user_password_updated.php index 72aa3232b21..5aeb380a0c5 100644 --- a/lib/classes/event/user_password_updated.php +++ b/lib/classes/event/user_password_updated.php @@ -101,19 +101,6 @@ class user_password_updated extends base { return new \moodle_url('/user/profile.php', array('id' => $this->relateduserid)); } - /** - * Returns array of parameters to be passed to legacy logging. - * - * @return array|null - */ - protected function get_legacy_logdata() { - if (!$this->other['forgottenreset']) { - // We did not log password changes in earlier versions. - return null; - } - return array(SITEID, 'user', 'set password', 'profile.php?id='.$this->userid, $this->relateduserid); - } - /** * Custom validation. * diff --git a/lib/classes/event/user_profile_viewed.php b/lib/classes/event/user_profile_viewed.php index bd6bb690cea..f8c3b13b2b6 100644 --- a/lib/classes/event/user_profile_viewed.php +++ b/lib/classes/event/user_profile_viewed.php @@ -85,19 +85,6 @@ class user_profile_viewed extends base { return new \moodle_url('/user/profile.php', array('id' => $this->relateduserid)); } - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - if ($this->contextlevel == CONTEXT_COURSE) { - return array($this->courseid, 'user', 'view', 'view.php?id=' . $this->relateduserid . '&course=' . - $this->courseid, $this->relateduserid); - } - return null; - } - /** * Custom validation. * diff --git a/lib/classes/event/user_updated.php b/lib/classes/event/user_updated.php index 52827de4037..024d6870a5f 100644 --- a/lib/classes/event/user_updated.php +++ b/lib/classes/event/user_updated.php @@ -72,33 +72,6 @@ class user_updated extends base { return new \moodle_url('/user/view.php', array('id' => $this->objectid)); } - /** - * Return name of the legacy event, which is replaced by this event. - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'user_updated'; - } - - /** - * Return user_updated legacy event data. - * - * @return \stdClass user data. - */ - protected function get_legacy_eventdata () { - return $this->get_record_snapshot('user', $this->objectid); - } - - /** - * Returns array of parameters to be passed to legacy add_to_log() function. - * - * @return array - */ - protected function get_legacy_logdata() { - return array(SITEID, 'user', 'update', 'view.php?id='.$this->objectid, ''); - } - /** * Custom validation. * diff --git a/lib/classes/event/webservice_function_called.php b/lib/classes/event/webservice_function_called.php index 95618487cfd..040c9019391 100644 --- a/lib/classes/event/webservice_function_called.php +++ b/lib/classes/event/webservice_function_called.php @@ -55,15 +55,6 @@ class webservice_function_called extends base { return "The web service function '{$this->other['function']}' has been called."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return $this->legacylogdata; - } - /** * Return localised event name. * @@ -84,15 +75,6 @@ class webservice_function_called extends base { $this->context = \context_system::instance(); } - /** - * Return the legacy event log data. - * - * @param array $legacydata the legacy data to set - */ - public function set_legacy_logdata($legacydata) { - $this->legacylogdata = $legacydata; - } - /** * Custom validation. * diff --git a/lib/classes/event/webservice_login_failed.php b/lib/classes/event/webservice_login_failed.php index d372de894b5..3489353980b 100644 --- a/lib/classes/event/webservice_login_failed.php +++ b/lib/classes/event/webservice_login_failed.php @@ -59,15 +59,6 @@ class webservice_login_failed extends base { return "Web service authentication failed with code: \"{$this->other['reason']}\"."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return $this->legacylogdata; - } - /** * Return localised event name. * @@ -88,16 +79,6 @@ class webservice_login_failed extends base { $this->context = \context_system::instance(); } - /** - * Set the legacy event log data. - * - * @param array $logdata The log data. - * @return void - */ - public function set_legacy_logdata($logdata) { - $this->legacylogdata = $logdata; - } - /** * Custom validation. * diff --git a/lib/classes/event/webservice_service_created.php b/lib/classes/event/webservice_service_created.php index c8943e262be..c4eee0dea6d 100644 --- a/lib/classes/event/webservice_service_created.php +++ b/lib/classes/event/webservice_service_created.php @@ -50,18 +50,6 @@ class webservice_service_created extends base { return "The user with id '$this->userid' created the web service with id '$this->objectid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - global $CFG; - $service = $this->get_record_snapshot('external_services', $this->objectid); - return array(SITEID, 'webservice', 'add', $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices", - get_string('addservice', 'webservice', $service)); - } - /** * Return localised event name. * diff --git a/lib/classes/event/webservice_service_deleted.php b/lib/classes/event/webservice_service_deleted.php index c61c1be45e0..0d3a5388840 100644 --- a/lib/classes/event/webservice_service_deleted.php +++ b/lib/classes/event/webservice_service_deleted.php @@ -44,18 +44,6 @@ class webservice_service_deleted extends base { return "The user with id '$this->userid' deleted the web service with id '$this->objectid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - global $CFG; - $service = $this->get_record_snapshot('external_services', $this->objectid); - return array(SITEID, 'webservice', 'delete', $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices", - get_string('deleteservice', 'webservice', $service)); - } - /** * Return localised event name. * diff --git a/lib/classes/event/webservice_service_updated.php b/lib/classes/event/webservice_service_updated.php index a0124f57d53..422ab1cde05 100644 --- a/lib/classes/event/webservice_service_updated.php +++ b/lib/classes/event/webservice_service_updated.php @@ -44,18 +44,6 @@ class webservice_service_updated extends base { return "The user with id '$this->userid' updated the web service with id '$this->objectid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - global $CFG; - $service = $this->get_record_snapshot('external_services', $this->objectid); - return array(SITEID, 'webservice', 'edit', $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices", - get_string('editservice', 'webservice', $service)); - } - /** * Return localised event name. * diff --git a/lib/classes/event/webservice_service_user_added.php b/lib/classes/event/webservice_service_user_added.php index ca646446494..01c599b42c4 100644 --- a/lib/classes/event/webservice_service_user_added.php +++ b/lib/classes/event/webservice_service_user_added.php @@ -45,17 +45,6 @@ class webservice_service_user_added extends base { "with id '$this->objectid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - global $CFG; - return array(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id=' . $this->objectid, 'add', '', - $this->relateduserid); - } - /** * Return localised event name. * diff --git a/lib/classes/event/webservice_service_user_removed.php b/lib/classes/event/webservice_service_user_removed.php index a812041aa0d..62e4d716788 100644 --- a/lib/classes/event/webservice_service_user_removed.php +++ b/lib/classes/event/webservice_service_user_removed.php @@ -45,17 +45,6 @@ class webservice_service_user_removed extends base { "with id '$this->objectid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - global $CFG; - return array(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id=' . $this->objectid, 'remove', '', - $this->relateduserid); - } - /** * Return localised event name. * diff --git a/lib/classes/event/webservice_token_created.php b/lib/classes/event/webservice_token_created.php index 8b8a9470b15..b70a483abd6 100644 --- a/lib/classes/event/webservice_token_created.php +++ b/lib/classes/event/webservice_token_created.php @@ -50,18 +50,6 @@ class webservice_token_created extends base { return "The user with id '$this->userid' created a web service token for the user with id '$this->relateduserid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - if (!empty($this->other['auto'])) { - // The token has been automatically created. - return array(SITEID, 'webservice', 'automatically create user token', '' , 'User ID: ' . $this->relateduserid); - } - } - /** * Return localised event name. * diff --git a/lib/classes/event/webservice_token_sent.php b/lib/classes/event/webservice_token_sent.php index 4f89d46d714..e93d1da22a3 100644 --- a/lib/classes/event/webservice_token_sent.php +++ b/lib/classes/event/webservice_token_sent.php @@ -44,15 +44,6 @@ class webservice_token_sent extends base { return "The user with id '$this->userid' has been sent the web service token with id '$this->objectid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array(SITEID, 'webservice', 'sending requested user token', '' , 'User ID: ' . $this->userid); - } - /** * Return localised event name. * diff --git a/lib/phpunit/classes/advanced_testcase.php b/lib/phpunit/classes/advanced_testcase.php index 15de8395ab9..991e63796ac 100644 --- a/lib/phpunit/classes/advanced_testcase.php +++ b/lib/phpunit/classes/advanced_testcase.php @@ -450,9 +450,6 @@ abstract class advanced_testcase extends base_testcase { // Test event methods should not use event->context. $event->get_url(); $event->get_description(); - $event->get_legacy_eventname(); - phpunit_event_mock::testable_get_legacy_eventdata($event); - phpunit_event_mock::testable_get_legacy_logdata($event); // Restore event->context. phpunit_event_mock::testable_set_event_context($event, $eventcontext); diff --git a/lib/phpunit/classes/event_mock.php b/lib/phpunit/classes/event_mock.php index 578f3000096..1d0c94703c1 100644 --- a/lib/phpunit/classes/event_mock.php +++ b/lib/phpunit/classes/event_mock.php @@ -35,26 +35,6 @@ require_once(__DIR__ . '/../../classes/event/base.php'); */ abstract class phpunit_event_mock extends \core\event\base { - /** - * Returns the log data of the event. - * - * @param \core\event\base $event event to get legacy eventdata from. - * @return array - */ - public static function testable_get_legacy_eventdata($event) { - return $event->get_legacy_eventdata(); - } - - /** - * Returns the log data of the event. - * - * @param \core\event\base $event event to get legacy logdata from. - * @return array - */ - public static function testable_get_legacy_logdata($event) { - return $event->get_legacy_logdata(); - } - /** * Returns event context. * diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php index 8e72c3b542d..1b87735661c 100644 --- a/lib/tests/accesslib_test.php +++ b/lib/tests/accesslib_test.php @@ -581,12 +581,6 @@ class accesslib_test extends advanced_testcase { $this->assertSame('', $event->other['component']); $this->assertEquals(0, $event->other['itemid']); $this->assertInstanceOf('moodle_url', $event->get_url()); - $this->assertSame('role_assigned', $event::get_legacy_eventname()); - $roles = get_all_roles(); - $rolenames = role_fix_names($roles, $context, ROLENAME_ORIGINAL, true); - $expectedlegacylog = array($course->id, 'role', 'assign', - 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$role->id, $rolenames[$role->id], '', $USER->id); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** @@ -633,11 +627,6 @@ class accesslib_test extends advanced_testcase { $this->assertSame('', $event->other['component']); $this->assertEquals(0, $event->other['itemid']); $this->assertInstanceOf('moodle_url', $event->get_url()); - $roles = get_all_roles(); - $rolenames = role_fix_names($roles, $context, ROLENAME_ORIGINAL, true); - $expectedlegacylog = array($course->id, 'role', 'unassign', - 'admin/roles/assign.php?contextid='.$context->id.'&roleid='.$role->id, $rolenames[$role->id], '', $USER->id); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** @@ -785,10 +774,6 @@ class accesslib_test extends advanced_testcase { $this->assertSame($role->shortname, $event->other['shortname']); $this->assertSame($role->description, $event->other['description']); $this->assertSame($role->archetype, $event->other['archetype']); - - $expectedlegacylog = array(SITEID, 'role', 'delete', 'admin/roles/manage.php?action=delete&roleid='.$role->id, - $role->shortname, ''); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** @@ -1074,10 +1059,6 @@ class accesslib_test extends advanced_testcase { $sink->close(); $event = array_pop($events); $this->assertInstanceOf('\core\event\role_allow_assign_updated', $event); - $mode = 'assign'; - $baseurl = new moodle_url('/admin/roles/allow.php', array('mode' => $mode)); - $expectedlegacylog = array(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl)); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** @@ -1109,10 +1090,6 @@ class accesslib_test extends advanced_testcase { $sink->close(); $event = array_pop($events); $this->assertInstanceOf('\core\event\role_allow_override_updated', $event); - $mode = 'override'; - $baseurl = new moodle_url('/admin/roles/allow.php', array('mode' => $mode)); - $expectedlegacylog = array(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl)); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** @@ -1144,10 +1121,6 @@ class accesslib_test extends advanced_testcase { $sink->close(); $event = array_pop($events); $this->assertInstanceOf('\core\event\role_allow_switch_updated', $event); - $mode = 'switch'; - $baseurl = new moodle_url('/admin/roles/allow.php', array('mode' => $mode)); - $expectedlegacylog = array(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl)); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** @@ -1179,10 +1152,6 @@ class accesslib_test extends advanced_testcase { $sink->close(); $event = array_pop($events); $this->assertInstanceOf('\core\event\role_allow_view_updated', $event); - $mode = 'view'; - $baseurl = new moodle_url('/admin/roles/allow.php', array('mode' => $mode)); - $expectedlegacylog = array(SITEID, 'role', 'edit allow ' . $mode, str_replace($CFG->wwwroot . '/', '', $baseurl)); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** diff --git a/lib/tests/authlib_test.php b/lib/tests/authlib_test.php index a424243298f..d1eb883c9a7 100644 --- a/lib/tests/authlib_test.php +++ b/lib/tests/authlib_test.php @@ -189,8 +189,6 @@ class authlib_test extends \advanced_testcase { $this->assertEquals(AUTH_LOGIN_FAILED, $reason); // Test Event. $this->assertInstanceOf('\core\event\user_login_failed', $event); - $expectedlogdata = array(SITEID, 'login', 'error', 'index.php', 'username1'); - $this->assertEventLegacyLogData($expectedlogdata, $event); $eventdata = $event->get_data(); $this->assertSame($eventdata['other']['username'], 'username1'); $this->assertSame($eventdata['other']['reason'], AUTH_LOGIN_FAILED); @@ -209,8 +207,6 @@ class authlib_test extends \advanced_testcase { $this->assertEquals(AUTH_LOGIN_FAILED, $reason); // Test Event. $this->assertInstanceOf('\core\event\user_login_failed', $event); - $expectedlogdata = array(SITEID, 'login', 'error', 'index.php', 'username1'); - $this->assertEventLegacyLogData($expectedlogdata, $event); $eventdata = $event->get_data(); $this->assertSame($eventdata['other']['username'], 'username1'); $this->assertSame($eventdata['other']['reason'], AUTH_LOGIN_FAILED); @@ -261,8 +257,6 @@ class authlib_test extends \advanced_testcase { $this->assertEquals(AUTH_LOGIN_SUSPENDED, $reason); // Test Event. $this->assertInstanceOf('\core\event\user_login_failed', $event); - $expectedlogdata = array(SITEID, 'login', 'error', 'index.php', 'username2'); - $this->assertEventLegacyLogData($expectedlogdata, $event); $eventdata = $event->get_data(); $this->assertSame($eventdata['other']['username'], 'username2'); $this->assertSame($eventdata['other']['reason'], AUTH_LOGIN_SUSPENDED); @@ -280,8 +274,6 @@ class authlib_test extends \advanced_testcase { $this->assertEquals(AUTH_LOGIN_SUSPENDED, $reason); // Test Event. $this->assertInstanceOf('\core\event\user_login_failed', $event); - $expectedlogdata = array(SITEID, 'login', 'error', 'index.php', 'username3'); - $this->assertEventLegacyLogData($expectedlogdata, $event); $eventdata = $event->get_data(); $this->assertSame($eventdata['other']['username'], 'username3'); $this->assertSame($eventdata['other']['reason'], AUTH_LOGIN_SUSPENDED); @@ -299,8 +291,6 @@ class authlib_test extends \advanced_testcase { $this->assertEquals(AUTH_LOGIN_NOUSER, $reason); // Test Event. $this->assertInstanceOf('\core\event\user_login_failed', $event); - $expectedlogdata = array(SITEID, 'login', 'error', 'index.php', 'username4'); - $this->assertEventLegacyLogData($expectedlogdata, $event); $eventdata = $event->get_data(); $this->assertSame($eventdata['other']['username'], 'username4'); $this->assertSame($eventdata['other']['reason'], AUTH_LOGIN_NOUSER); diff --git a/lib/tests/completionlib_test.php b/lib/tests/completionlib_test.php index b0d963b6e0a..16db96eabd4 100644 --- a/lib/tests/completionlib_test.php +++ b/lib/tests/completionlib_test.php @@ -1489,7 +1489,6 @@ class completionlib_test extends advanced_testcase { $this->assertEquals($USER->id, $event->userid); $this->assertEquals($this->user->id, $event->relateduserid); $this->assertInstanceOf('moodle_url', $event->get_url()); - $this->assertEventLegacyData($current, $event); } /** @@ -1519,8 +1518,6 @@ class completionlib_test extends advanced_testcase { $this->assertEquals($this->user->id, $event->relateduserid); $this->assertEquals(context_course::instance($this->course->id), $event->get_context()); $this->assertInstanceOf('moodle_url', $event->get_url()); - $data = $ccompletion->get_record_data(); - $this->assertEventLegacyData($data, $event); } /** @@ -1577,8 +1574,6 @@ class completionlib_test extends advanced_testcase { $this->assertEquals($this->course->id, $event->courseid); $this->assertEquals($coursecontext, $event->get_context()); $this->assertInstanceOf('moodle_url', $event->get_url()); - $expectedlegacylog = array($this->course->id, 'course', 'completion updated', 'completion.php?id='.$this->course->id); - $this->assertEventLegacyLogData($expectedlegacylog, $event); } /** diff --git a/lib/tests/event/events_test.php b/lib/tests/event/events_test.php index c3b69c7c6b9..e385981ac07 100644 --- a/lib/tests/event/events_test.php +++ b/lib/tests/event/events_test.php @@ -55,8 +55,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_coursecat::instance($category->id), $event->get_context()); $url = new \moodle_url('/course/management.php', array('categoryid' => $event->objectid)); $this->assertEquals($url, $event->get_url()); - $expected = array(SITEID, 'category', 'add', 'editcategory.php?id=' . $category->id, $category->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -82,8 +80,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_coursecat::instance($category->id), $event->get_context()); $url = new \moodle_url('/course/editcategory.php', array('id' => $event->objectid)); $this->assertEquals($url, $event->get_url()); - $expected = array(SITEID, 'category', 'update', 'editcategory.php?id=' . $category->id, $category->id); - $this->assertEventLegacyLogData($expected, $event); // Create another category and a child category. $category2 = $this->getDataGenerator()->create_category(); @@ -98,8 +94,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\course_category_updated', $event); $this->assertEquals(\context_coursecat::instance($childcat->id), $event->get_context()); - $expected = array(SITEID, 'category', 'move', 'editcategory.php?id=' . $childcat->id, $childcat->id); - $this->assertEventLegacyLogData($expected, $event); // Trigger and capture the event for changing the sortorder of a category. $sink = $this->redirectEvents(); @@ -110,8 +104,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\course_category_updated', $event); $this->assertEquals(\context_coursecat::instance($category2->id), $event->get_context()); - $expected = array(SITEID, 'category', 'move', 'management.php?categoryid=' . $category2->id, $category2->id); - $this->assertEventLegacyLogData($expected, $event); // Trigger and capture the event for deleting a category and moving it's children to another. $sink = $this->redirectEvents(); @@ -122,8 +114,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\course_category_updated', $event); $this->assertEquals(\context_coursecat::instance($childcat->id), $event->get_context()); - $expected = array(SITEID, 'category', 'move', 'editcategory.php?id=' . $childcat->id, $childcat->id); - $this->assertEventLegacyLogData($expected, $event); // Trigger and capture the event for hiding a category. $sink = $this->redirectEvents(); @@ -134,8 +124,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\course_category_updated', $event); $this->assertEquals(\context_coursecat::instance($category2->id), $event->get_context()); - $expected = array(SITEID, 'category', 'hide', 'editcategory.php?id=' . $category2->id, $category2->id); - $this->assertEventLegacyLogData($expected, $event); // Trigger and capture the event for unhiding a category. $sink = $this->redirectEvents(); @@ -146,8 +134,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\course_category_updated', $event); $this->assertEquals(\context_coursecat::instance($category2->id), $event->get_context()); - $expected = array(SITEID, 'category', 'show', 'editcategory.php?id=' . $category2->id, $category2->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -178,8 +164,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\email_failed', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'library', 'mailer', qualified_me(), 'ERROR: The email failed to send!'); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -207,9 +191,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\course_user_report_viewed', $event); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'course', 'user report', 'user.php?id=' . $course->id . '&user=' - . $user->id . '&mode=grade', $user->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -235,8 +216,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\course_viewed', $event); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'course', 'view', 'view.php?id=' . $course->id, $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); // Now try with optional parameters. @@ -256,9 +235,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\course_viewed', $event); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'course', 'view section', 'view.php?id=' . $course->id . '&section=' - . $sectionnumber, $sectionnumber); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); delete_course($course->id, false); @@ -284,8 +260,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\recent_activity_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, "course", "recent", "recent.php?id=$course->id", $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/course/recent.php', array('id' => $course->id)); $this->assertEquals($url, $event->get_url()); @@ -321,8 +295,6 @@ class events_test extends \advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\user_profile_viewed', $event); - $log = array($course->id, 'user', 'view', 'view.php?id=' . $user->id . '&course=' . $course->id, $user->id); - $this->assertEventLegacyLogData($log, $event); $this->assertEventContextNotUsed($event); // User profile viewed in user context. @@ -338,8 +310,6 @@ class events_test extends \advanced_testcase { $event = reset($events); $this->assertInstanceOf('\core\event\user_profile_viewed', $event); - $expected = null; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/lib/tests/event/user_graded_test.php b/lib/tests/event/user_graded_test.php index 283f086c70e..6c36d7bbcde 100644 --- a/lib/tests/event/user_graded_test.php +++ b/lib/tests/event/user_graded_test.php @@ -61,10 +61,6 @@ class user_graded_test extends \advanced_testcase { $event = \core\event\user_graded::create_from_grade($grade_grade); - $this->assertEventLegacyLogData( - array($course->id, 'grade', 'update', '/report/grader/index.php?id=' . $course->id, $grade_item->itemname . ': ' . fullname($user)), - $event - ); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); $this->assertSame($event->objecttable, 'grade_grades'); $this->assertEquals($event->objectid, $grade_grade->id); diff --git a/lib/tests/event/user_password_updated_test.php b/lib/tests/event/user_password_updated_test.php index 73af86c35f6..f9069a9e6bb 100644 --- a/lib/tests/event/user_password_updated_test.php +++ b/lib/tests/event/user_password_updated_test.php @@ -43,7 +43,6 @@ class user_password_updated_test extends \advanced_testcase { $this->assertEventContextNotUsed($event); $this->assertEquals($user1->id, $event->relateduserid); $this->assertSame($context1, $event->get_context()); - $this->assertEventLegacyLogData(null, $event); $this->assertFalse($event->other['forgottenreset']); $event->trigger(); @@ -52,7 +51,6 @@ class user_password_updated_test extends \advanced_testcase { $this->assertEventContextNotUsed($event); $this->assertEquals($user2->id, $event->relateduserid); $this->assertSame($context2, $event->get_context()); - $this->assertEventLegacyLogData(null, $event); $this->assertFalse($event->other['forgottenreset']); $event->trigger(); @@ -61,7 +59,6 @@ class user_password_updated_test extends \advanced_testcase { $this->assertEventContextNotUsed($event); $this->assertEquals($user1->id, $event->relateduserid); $this->assertSame($context1, $event->get_context()); - $this->assertEventLegacyLogData(array(SITEID, 'user', 'set password', 'profile.php?id='.$user1->id, $user1->id), $event); $this->assertTrue($event->other['forgottenreset']); $event->trigger(); } diff --git a/lib/tests/event_course_module_instance_list_viewed.php b/lib/tests/event_course_module_instance_list_viewed.php index 3789ab7625c..fd3bb9aba00 100644 --- a/lib/tests/event_course_module_instance_list_viewed.php +++ b/lib/tests/event_course_module_instance_list_viewed.php @@ -53,8 +53,6 @@ class core_event_course_module_instance_list_viewed_testcase extends advanced_te $sink->close(); // Test event data. - $legacydata = array($course->id, 'unittests', 'view all', 'index.php?id=' . $course->id, ''); - $this->assertEventLegacyLogData($legacydata, $event); $url = new moodle_url('/mod/unittests/index.php', array('id' => $course->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); diff --git a/lib/tests/event_course_module_viewed.php b/lib/tests/event_course_module_viewed.php index 67cb6fac508..7f77eaa7590 100644 --- a/lib/tests/event_course_module_viewed.php +++ b/lib/tests/event_course_module_viewed.php @@ -58,9 +58,6 @@ class core_event_course_module_viewed_testcase extends advanced_testcase { $event = reset($result); $sink->close(); - // Test event data. - $legacydata = array($course->id, 'feedback', 'view', 'view.php?id=' . $cm->id, $feed->id, $cm->id); - $this->assertEventLegacyLogData($legacydata, $event); $this->assertSame('feedback', $event->objecttable); $url = new moodle_url('/mod/feedback/view.php', array('id' => $cm->id)); $this->assertEquals($url, $event->get_url()); diff --git a/lib/tests/fixtures/event_fixtures.php b/lib/tests/fixtures/event_fixtures.php index e13c2d84cde..33d02ceb2ff 100644 --- a/lib/tests/fixtures/event_fixtures.php +++ b/lib/tests/fixtures/event_fixtures.php @@ -47,18 +47,6 @@ class unittest_executed extends \core\event\base { public function get_url() { return new \moodle_url('/somepath/somefile.php', array('id'=>$this->data['other']['sample'])); } - - public static function get_legacy_eventname() { - return 'test_legacy'; - } - - protected function get_legacy_eventdata() { - return array($this->data['courseid'], $this->data['other']['sample']); - } - - protected function get_legacy_logdata() { - return array($this->data['courseid'], 'core_unittest', 'view', 'unittest.php?id='.$this->data['other']['sample']); - } } @@ -273,14 +261,6 @@ class context_used_in_event extends \core\event\base { public function get_url() { return new \moodle_url('/somepath/somefile.php', array('id' => $this->context->instanceid)); } - - protected function get_legacy_eventdata() { - return array($this->data['courseid'], $this->context->instanceid); - } - - protected function get_legacy_logdata() { - return array($this->data['courseid'], 'core_unittest', 'view', 'unittest.php?id=' . $this->context->instanceid); - } } /** diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php index 991c4ceef8d..70b8ec26d20 100644 --- a/lib/tests/moodlelib_test.php +++ b/lib/tests/moodlelib_test.php @@ -2532,10 +2532,6 @@ EOF; // Test Event. $this->assertInstanceOf('\core\event\user_deleted', $event); $this->assertSame($user->id, $event->objectid); - $this->assertSame('user_deleted', $event->get_legacy_eventname()); - $this->assertEventLegacyData($user, $event); - $expectedlogdata = array(SITEID, 'user', 'delete', "view.php?id=$user->id", $user->firstname.' '.$user->lastname); - $this->assertEventLegacyLogData($expectedlogdata, $event); $eventdata = $event->get_data(); $this->assertSame($eventdata['other']['username'], $user->username); $this->assertSame($eventdata['other']['email'], $user->email); @@ -3317,11 +3313,6 @@ EOF; // Test Event. $this->assertInstanceOf('\core\event\user_loggedout', $event); $this->assertSame($user->id, $event->objectid); - $this->assertSame('user_logout', $event->get_legacy_eventname()); - $this->assertEventLegacyData($user, $event); - $expectedlogdata = array(SITEID, 'user', 'logout', 'view.php?id='.$event->objectid.'&course='.SITEID, $event->objectid, 0, - $event->objectid); - $this->assertEventLegacyLogData($expectedlogdata, $event); $this->assertEventContextNotUsed($event); } diff --git a/lib/tests/session_manager_test.php b/lib/tests/session_manager_test.php index 6f9e223e794..9cd4df4173c 100644 --- a/lib/tests/session_manager_test.php +++ b/lib/tests/session_manager_test.php @@ -602,8 +602,6 @@ class session_manager_test extends \advanced_testcase { $this->assertEquals($coursecontext, $event->get_context()); $oldfullname = fullname($user, true); $newfullname = fullname($adminuser, true); - $expectedlogdata = array($course->id, "course", "loginas", "../user/view.php?id=$course->id&user=$user->id", "$oldfullname -> $newfullname"); - $this->assertEventLegacyLogData($expectedlogdata, $event); } public function test_is_loggedinas() { diff --git a/message/tests/event/events_test.php b/message/tests/event/events_test.php index bbf1852bdf4..b5c4b9e0ab0 100644 --- a/message/tests/event/events_test.php +++ b/message/tests/event/events_test.php @@ -71,9 +71,6 @@ class events_test extends \core_message\messagelib_test { // Check that the event data is valid. $this->assertInstanceOf('\core\event\message_contact_added', $event); $this->assertEquals(\context_user::instance(2), $event->get_context()); - $expected = array(SITEID, 'message', 'add contact', 'index.php?user1=' . $user->id . - '&user2=2', $user->id); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid)); $this->assertEquals($url, $event->get_url()); } @@ -102,9 +99,6 @@ class events_test extends \core_message\messagelib_test { // Check that the event data is valid. $this->assertInstanceOf('\core\event\message_contact_removed', $event); $this->assertEquals(\context_user::instance(2), $event->get_context()); - $expected = array(SITEID, 'message', 'remove contact', 'index.php?user1=' . $user->id . - '&user2=2', $user->id); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid)); $this->assertEquals($url, $event->get_url()); } @@ -195,8 +189,6 @@ class events_test extends \core_message\messagelib_test { // Check that the event data is valid. $this->assertInstanceOf('\core\event\message_sent', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'message', 'write', 'index.php?user=1&id=2&history=1#m3', 1); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid)); $this->assertEquals($url, $event->get_url()); $this->assertEquals(3, $event->objectid); @@ -232,8 +224,6 @@ class events_test extends \core_message\messagelib_test { // Check that the event data is valid. $this->assertInstanceOf('\core\event\message_sent', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'message', 'write', 'index.php?user=1&id=2&history=1#m3', 1); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid)); $this->assertEquals($url, $event->get_url()); $this->assertEquals(3, $event->objectid); diff --git a/mnet/tests/event/events_test.php b/mnet/tests/event/events_test.php index d662d51e995..3347df22a4b 100644 --- a/mnet/tests/event/events_test.php +++ b/mnet/tests/event/events_test.php @@ -66,9 +66,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\mnet_access_control_created', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'admin/mnet', 'add', 'admin/mnet/access_control.php', - 'SSO ACL: enabled user \'username\' from ' . $this->mnethost->name); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/admin/mnet/access_control.php'); $this->assertEquals($url, $event->get_url()); @@ -96,9 +93,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\mnet_access_control_updated', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'admin/mnet', 'update', 'admin/mnet/access_control.php', - 'SSO ACL: enabled user \'username\' from ' . $this->mnethost->name); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/admin/mnet/access_control.php'); $this->assertEquals($url, $event->get_url()); diff --git a/mod/assign/classes/event/all_submissions_downloaded.php b/mod/assign/classes/event/all_submissions_downloaded.php index 09b6c824112..6f532ab868c 100644 --- a/mod/assign/classes/event/all_submissions_downloaded.php +++ b/mod/assign/classes/event/all_submissions_downloaded.php @@ -92,16 +92,6 @@ class all_submissions_downloaded extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $this->set_legacy_logdata('download all submissions', get_string('downloadall', 'assign')); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/assessable_submitted.php b/mod/assign/classes/event/assessable_submitted.php index c26375cd0f1..262670d0cdf 100644 --- a/mod/assign/classes/event/assessable_submitted.php +++ b/mod/assign/classes/event/assessable_submitted.php @@ -81,31 +81,6 @@ class assessable_submitted extends base { "for the assignment with course module id '$this->contextinstanceid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = 'assign'; - $eventdata->cmid = $this->contextinstanceid; - $eventdata->itemid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - $eventdata->params = array('submission_editable' => $this->other['submission_editable']); - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'assessable_submitted'; - } - /** * Return localised event name. * @@ -126,17 +101,6 @@ class assessable_submitted extends base { $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $submission = $this->get_record_snapshot('assign_submission', $this->objectid); - $this->set_legacy_logdata('submit for grading', $this->assign->format_submission_for_log($submission)); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/base.php b/mod/assign/classes/event/base.php index c0b5e2dd5c6..db9662beab9 100644 --- a/mod/assign/classes/event/base.php +++ b/mod/assign/classes/event/base.php @@ -99,35 +99,6 @@ abstract class base extends \core\event\base { return new \moodle_url('/mod/assign/view.php', array('id' => $this->contextinstanceid)); } - /** - * Sets the legacy event log data. - * - * @param string $action The current action - * @param string $info A detailed description of the change. But no more than 255 characters. - * @param string $url The url to the assign module instance. - */ - public function set_legacy_logdata($action = '', $info = '', $url = '') { - $fullurl = 'view.php?id=' . $this->contextinstanceid; - if ($url != '') { - $fullurl .= '&' . $url; - } - - $this->legacylogdata = array($this->courseid, 'assign', $action, $fullurl, $info, $this->contextinstanceid); - } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if (isset($this->legacylogdata)) { - return $this->legacylogdata; - } - - return null; - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/batch_set_marker_allocation_viewed.php b/mod/assign/classes/event/batch_set_marker_allocation_viewed.php index 9481b0cb950..6d28137d192 100644 --- a/mod/assign/classes/event/batch_set_marker_allocation_viewed.php +++ b/mod/assign/classes/event/batch_set_marker_allocation_viewed.php @@ -95,17 +95,6 @@ class batch_set_marker_allocation_viewed extends base { "module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $logmessage = get_string('viewbatchmarkingallocation', 'assign'); - $this->set_legacy_logdata('view batch set marker allocation', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/batch_set_workflow_state_viewed.php b/mod/assign/classes/event/batch_set_workflow_state_viewed.php index b91c04537ea..6523d854999 100644 --- a/mod/assign/classes/event/batch_set_workflow_state_viewed.php +++ b/mod/assign/classes/event/batch_set_workflow_state_viewed.php @@ -95,17 +95,6 @@ class batch_set_workflow_state_viewed extends base { "module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $logmessage = get_string('viewbatchsetmarkingworkflowstate', 'assign'); - $this->set_legacy_logdata('view batch set marking workflow state', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/extension_granted.php b/mod/assign/classes/event/extension_granted.php index 51c4a9f7a5b..510a77583cc 100644 --- a/mod/assign/classes/event/extension_granted.php +++ b/mod/assign/classes/event/extension_granted.php @@ -94,16 +94,6 @@ class extension_granted extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $this->set_legacy_logdata('grant extension', $this->relateduserid); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/feedback_viewed.php b/mod/assign/classes/event/feedback_viewed.php index 93d6aea615a..43254022f05 100644 --- a/mod/assign/classes/event/feedback_viewed.php +++ b/mod/assign/classes/event/feedback_viewed.php @@ -92,17 +92,6 @@ class feedback_viewed extends base { "for the assignment with course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $logmessage = get_string('viewfeedbackforuser', 'assign', $this->relateduserid); - $this->set_legacy_logdata('view feedback', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/grading_form_viewed.php b/mod/assign/classes/event/grading_form_viewed.php index dfa6b94bcc0..632c0cb08bd 100644 --- a/mod/assign/classes/event/grading_form_viewed.php +++ b/mod/assign/classes/event/grading_form_viewed.php @@ -98,19 +98,6 @@ class grading_form_viewed extends base { "for the assignment with course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $msg = get_string('viewgradingformforstudent', 'assign', - array('id' => $user->id, 'fullname' => fullname($user))); - $this->set_legacy_logdata('view grading form', $msg); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/grading_table_viewed.php b/mod/assign/classes/event/grading_table_viewed.php index 464e8b02c56..a35b82876a9 100644 --- a/mod/assign/classes/event/grading_table_viewed.php +++ b/mod/assign/classes/event/grading_table_viewed.php @@ -95,17 +95,6 @@ class grading_table_viewed extends base { "id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $logmessage = get_string('viewsubmissiongradingtable', 'assign'); - $this->set_legacy_logdata('view submission grading table', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/identities_revealed.php b/mod/assign/classes/event/identities_revealed.php index 983ce4f0b69..921301ea92c 100644 --- a/mod/assign/classes/event/identities_revealed.php +++ b/mod/assign/classes/event/identities_revealed.php @@ -92,16 +92,6 @@ class identities_revealed extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $this->set_legacy_logdata('reveal identities', get_string('revealidentities', 'assign')); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/marker_updated.php b/mod/assign/classes/event/marker_updated.php index 761afc29cb0..a5d88b6092b 100644 --- a/mod/assign/classes/event/marker_updated.php +++ b/mod/assign/classes/event/marker_updated.php @@ -106,20 +106,6 @@ class marker_updated extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $marker = $this->get_record_snapshot('user', $this->other['markerid']); - $a = array('id' => $user->id, 'fullname' => fullname($user), 'marker' => fullname($marker)); - $logmessage = get_string('setmarkerallocationforlog', 'assign', $a); - $this->set_legacy_logdata('set marking allocation', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/remove_submission_form_viewed.php b/mod/assign/classes/event/remove_submission_form_viewed.php index 6c27ab704c0..a06dbda4b39 100644 --- a/mod/assign/classes/event/remove_submission_form_viewed.php +++ b/mod/assign/classes/event/remove_submission_form_viewed.php @@ -98,22 +98,6 @@ class remove_submission_form_viewed extends base { "'$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if ($this->relateduserid == $this->userid) { - $title = get_string('removesubmission', 'assign'); - } else { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $title = get_string('removesubmissionforstudent', 'assign', array('id' => $user->id, 'fullname' => fullname($user))); - } - $this->set_legacy_logdata('view remove submission assignment form', $title); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/reveal_identities_confirmation_page_viewed.php b/mod/assign/classes/event/reveal_identities_confirmation_page_viewed.php index 922ec3b65c5..034ec281431 100644 --- a/mod/assign/classes/event/reveal_identities_confirmation_page_viewed.php +++ b/mod/assign/classes/event/reveal_identities_confirmation_page_viewed.php @@ -95,17 +95,6 @@ class reveal_identities_confirmation_page_viewed extends base { "assignment with course module id '$this->contextinstanceid'."; } - - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $this->set_legacy_logdata('view', get_string('viewrevealidentitiesconfirm', 'assign')); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/statement_accepted.php b/mod/assign/classes/event/statement_accepted.php index 9212c9b3fa0..f5fa31fbd86 100644 --- a/mod/assign/classes/event/statement_accepted.php +++ b/mod/assign/classes/event/statement_accepted.php @@ -94,18 +94,6 @@ class statement_accepted extends base { $this->data['objecttable'] = 'assign_submission'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - global $USER; - $logmessage = get_string('submissionstatementacceptedlog', 'mod_assign', fullname($USER)); // Nasty hack. - $this->set_legacy_logdata('submission statement accepted', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_confirmation_form_viewed.php b/mod/assign/classes/event/submission_confirmation_form_viewed.php index 727b811d3c5..ccf5dc14058 100644 --- a/mod/assign/classes/event/submission_confirmation_form_viewed.php +++ b/mod/assign/classes/event/submission_confirmation_form_viewed.php @@ -95,17 +95,6 @@ class submission_confirmation_form_viewed extends base { "course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $logmessage = get_string('viewownsubmissionform', 'assign'); - $this->set_legacy_logdata('view confirm submit assignment form', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_duplicated.php b/mod/assign/classes/event/submission_duplicated.php index e2020b4fc6e..8a63fb14ff9 100644 --- a/mod/assign/classes/event/submission_duplicated.php +++ b/mod/assign/classes/event/submission_duplicated.php @@ -94,17 +94,6 @@ class submission_duplicated extends base { $this->data['objecttable'] = 'assign_submission'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $submission = $this->get_record_snapshot('assign_submission', $this->objectid); - $this->set_legacy_logdata('submissioncopied', $this->assign->format_submission_for_log($submission)); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_form_viewed.php b/mod/assign/classes/event/submission_form_viewed.php index fc2de8880e1..a7a2e618c45 100644 --- a/mod/assign/classes/event/submission_form_viewed.php +++ b/mod/assign/classes/event/submission_form_viewed.php @@ -103,22 +103,6 @@ class submission_form_viewed extends base { "'$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if ($this->relateduserid == $this->userid) { - $title = get_string('editsubmission', 'assign'); - } else { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $title = get_string('editsubmissionother', 'assign', fullname($user)); - } - $this->set_legacy_logdata('view submit assignment form', $title); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_graded.php b/mod/assign/classes/event/submission_graded.php index a6b0853cf0a..939bb4a2d97 100644 --- a/mod/assign/classes/event/submission_graded.php +++ b/mod/assign/classes/event/submission_graded.php @@ -95,17 +95,6 @@ class submission_graded extends base { $this->data['objecttable'] = 'assign_grades'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $grade = $this->get_record_snapshot('assign_grades', $this->objectid); - $this->set_legacy_logdata('grade submission', $this->assign->format_grade_for_log($grade)); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_locked.php b/mod/assign/classes/event/submission_locked.php index 32d99a0cc67..c967fa76a03 100644 --- a/mod/assign/classes/event/submission_locked.php +++ b/mod/assign/classes/event/submission_locked.php @@ -95,18 +95,6 @@ class submission_locked extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $logmessage = get_string('locksubmissionforstudent', 'assign', array('id' => $user->id, 'fullname' => fullname($user))); - $this->set_legacy_logdata('lock submission', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_status_updated.php b/mod/assign/classes/event/submission_status_updated.php index 4d7608ea5d0..a1aaab3df64 100644 --- a/mod/assign/classes/event/submission_status_updated.php +++ b/mod/assign/classes/event/submission_status_updated.php @@ -96,23 +96,6 @@ class submission_status_updated extends base { $this->data['objecttable'] = 'assign_submission'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $submission = $this->get_record_snapshot('assign_submission', $this->objectid); - if ($this->assign->get_instance()->teamsubmission) { - $logmessage = get_string('reverttodraftforgroup', 'assign', $submission->groupid); - } else { - $user = $this->get_record_snapshot('user', $submission->userid); - $logmessage = get_string('reverttodraftforstudent', 'assign', ['id' => $user->id, 'fullname' => fullname($user)]); - } - $this->set_legacy_logdata('revert submission to draft', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_status_viewed.php b/mod/assign/classes/event/submission_status_viewed.php index 532cd150898..1fbdb38b463 100644 --- a/mod/assign/classes/event/submission_status_viewed.php +++ b/mod/assign/classes/event/submission_status_viewed.php @@ -97,16 +97,6 @@ class submission_status_viewed extends base { "course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $this->set_legacy_logdata('view', get_string('viewownsubmissionstatus', 'assign')); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_unlocked.php b/mod/assign/classes/event/submission_unlocked.php index 3cdfa6366a1..4f9efea4b6f 100644 --- a/mod/assign/classes/event/submission_unlocked.php +++ b/mod/assign/classes/event/submission_unlocked.php @@ -95,18 +95,6 @@ class submission_unlocked extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $logmessage = get_string('unlocksubmissionforstudent', 'assign', array('id' => $user->id, 'fullname' => fullname($user))); - $this->set_legacy_logdata('unlock submission', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/submission_viewed.php b/mod/assign/classes/event/submission_viewed.php index 4793786c23f..8852c432b19 100644 --- a/mod/assign/classes/event/submission_viewed.php +++ b/mod/assign/classes/event/submission_viewed.php @@ -92,17 +92,6 @@ class submission_viewed extends base { "assignment with course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $logmessage = get_string('viewsubmissionforuser', 'assign', $this->relateduserid); - $this->set_legacy_logdata('view submission', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/classes/event/workflow_state_updated.php b/mod/assign/classes/event/workflow_state_updated.php index 5928f537159..36eaeafbb6e 100644 --- a/mod/assign/classes/event/workflow_state_updated.php +++ b/mod/assign/classes/event/workflow_state_updated.php @@ -105,19 +105,6 @@ class workflow_state_updated extends base { $this->data['objecttable'] = 'assign'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $user = $this->get_record_snapshot('user', $this->relateduserid); - $a = array('id' => $user->id, 'fullname' => fullname($user), 'state' => $this->other['newstate']); - $logmessage = get_string('setmarkingworkflowstateforlog', 'assign', $a); - $this->set_legacy_logdata('set marking workflow state', $logmessage); - return parent::get_legacy_logdata(); - } - /** * Custom validation. * diff --git a/mod/assign/submission/file/classes/event/assessable_uploaded.php b/mod/assign/submission/file/classes/event/assessable_uploaded.php index 06f7fdbc539..d270822f3ff 100644 --- a/mod/assign/submission/file/classes/event/assessable_uploaded.php +++ b/mod/assign/submission/file/classes/event/assessable_uploaded.php @@ -53,35 +53,6 @@ class assessable_uploaded extends \core\event\assessable_uploaded { "in the assignment activity with course module id '$this->contextinstanceid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = 'assign'; - $eventdata->cmid = $this->contextinstanceid; - $eventdata->itemid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - if (count($this->legacyfiles) > 1) { - $eventdata->files = $this->legacyfiles; - } - $eventdata->file = $this->legacyfiles; - $eventdata->pathnamehashes = array_keys($this->legacyfiles); - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'assessable_file_uploaded'; - } - /** * Return localised event name. * diff --git a/mod/assign/submission/file/tests/event/events_test.php b/mod/assign/submission/file/tests/event/events_test.php index bb5739663da..68deb4a36e4 100644 --- a/mod/assign/submission/file/tests/event/events_test.php +++ b/mod/assign/submission/file/tests/event/events_test.php @@ -96,7 +96,6 @@ class events_test extends \advanced_testcase { $expected->file = $files; $expected->files = $files; $expected->pathnamehashes = array($fi->get_pathnamehash(), $fi2->get_pathnamehash()); - $this->assertEventLegacyData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php b/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php index d1ef0766f2c..27172914585 100644 --- a/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php +++ b/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php @@ -52,34 +52,6 @@ class assessable_uploaded extends \core\event\assessable_uploaded { "in the assignment activity with course module id '$this->contextinstanceid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = 'assign'; - $eventdata->cmid = $this->contextinstanceid; - $eventdata->itemid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - $eventdata->content = $this->other['content']; - if ($this->other['pathnamehashes']) { - $eventdata->pathnamehashes = $this->other['pathnamehashes']; - } - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'assessable_content_uploaded'; - } - /** * Return localised event name. * diff --git a/mod/assign/submission/onlinetext/tests/event/events_test.php b/mod/assign/submission/onlinetext/tests/event/events_test.php index 15f6cc8106f..7f9be48e58a 100644 --- a/mod/assign/submission/onlinetext/tests/event/events_test.php +++ b/mod/assign/submission/onlinetext/tests/event/events_test.php @@ -79,7 +79,6 @@ class events_test extends \advanced_testcase { $expected->courseid = $course->id; $expected->userid = $student->id; $expected->content = 'Submission text'; - $this->assertEventLegacyData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/mod/assign/tests/event/events_test.php b/mod/assign/tests/event/events_test.php index c499948a296..58b7b2268cb 100644 --- a/mod/assign/tests/event/events_test.php +++ b/mod/assign/tests/event/events_test.php @@ -293,16 +293,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($assign->get_instance()->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); - - $expected = array( - $assign->get_course()->id, - 'assign', - 'grant extension', - 'view.php?id=' . $assign->get_course_module()->id, - $student->id, - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -328,16 +318,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($assign->get_instance()->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'lock submission', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('locksubmissionforstudent', 'assign', array('id' => $student->id, - 'fullname' => fullname($student))), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -364,15 +344,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_assign\event\identities_revealed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($assign->get_instance()->id, $event->objectid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'reveal identities', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('revealidentities', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); } } @@ -407,16 +378,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\submission_status_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewownsubmissionstatus', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -449,16 +410,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($submission->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); $this->assertEquals(ASSIGN_SUBMISSION_STATUS_DRAFT, $event->other['newstatus']); - $expected = array( - $assign->get_course()->id, - 'assign', - 'revert submission to draft', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('reverttodraftforstudent', 'assign', array('id' => $student->id, - 'fullname' => fullname($student))), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -490,16 +441,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($submission->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); $this->assertEquals(ASSIGN_SUBMISSION_STATUS_NEW, $event->other['newstatus']); - $expected = [ - $assign->get_course()->id, - 'assign', - 'revert submission to draft', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('reverttodraftforstudent', 'assign', ['id' => $student->id, - 'fullname' => fullname($student)]), - $assign->get_course_module()->id - ]; - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -539,15 +480,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($submission->id, $event->objectid); $this->assertEquals(null, $event->relateduserid); $this->assertEquals(ASSIGN_SUBMISSION_STATUS_NEW, $event->other['newstatus']); - $expected = [ - $course->id, - 'assign', - 'revert submission to draft', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('reverttodraftforgroup', 'assign', $group->id), - $assign->get_course_module()->id - ]; - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -575,16 +507,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($student->id, $event->relateduserid); $this->assertEquals($teacher->id, $event->userid); $this->assertEquals($teacher->id, $event->other['markerid']); - $expected = array( - $assign->get_course()->id, - 'assign', - 'set marking allocation', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('setmarkerallocationforlog', 'assign', array('id' => $student->id, - 'fullname' => fullname($student), 'marker' => fullname($teacher))), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -620,16 +542,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($student->id, $event->relateduserid); $this->assertEquals($teacher->id, $event->userid); $this->assertEquals(ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW, $event->other['newstate']); - $expected = array( - $assign->get_course()->id, - 'assign', - 'set marking workflow state', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('setmarkingworkflowstateforlog', 'assign', array('id' => $student->id, - 'fullname' => fullname($student), 'state' => ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW)), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); } } $this->assertEquals(2, $eventcount); @@ -651,16 +563,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($student->id, $event->relateduserid); $this->assertEquals($teacher->id, $event->userid); $this->assertEquals(ASSIGN_MARKING_WORKFLOW_STATE_READYFORRELEASE, $event->other['newstate']); - $expected = array( - $assign->get_course()->id, - 'assign', - 'set marking workflow state', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('setmarkingworkflowstateforlog', 'assign', array('id' => $student->id, - 'fullname' => fullname($student), 'state' => ASSIGN_MARKING_WORKFLOW_STATE_READYFORRELEASE)), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); // Test setting workflow state in process_save_quick_grades. @@ -683,16 +585,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($student->id, $event->relateduserid); $this->assertEquals($teacher->id, $event->userid); $this->assertEquals(ASSIGN_MARKING_WORKFLOW_STATE_INMARKING, $event->other['newstate']); - $expected = array( - $assign->get_course()->id, - 'assign', - 'set marking workflow state', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('setmarkingworkflowstateforlog', 'assign', array('id' => $student->id, - 'fullname' => fullname($student), 'state' => ASSIGN_MARKING_WORKFLOW_STATE_INMARKING)), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -722,15 +614,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($submission2->id, $event->objectid); $this->assertEquals($student->id, $event->userid); $submission2->status = ASSIGN_SUBMISSION_STATUS_DRAFT; - $expected = array( - $assign->get_course()->id, - 'assign', - 'submissioncopied', - 'view.php?id=' . $assign->get_course_module()->id, - $assign->testable_format_submission_for_log($submission2), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -756,16 +639,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($assign->get_instance()->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'unlock submission', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('unlocksubmissionforstudent', 'assign', array('id' => $student->id, - 'fullname' => fullname($student))), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -796,15 +669,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($grade->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'grade submission', - 'view.php?id=' . $assign->get_course_module()->id, - $assign->format_grade_for_log($grade), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); // Test process_save_quick_grades. @@ -827,15 +691,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($grade->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'grade submission', - 'view.php?id=' . $assign->get_course_module()->id, - $assign->format_grade_for_log($grade), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); // Test update_grade. @@ -853,15 +708,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($grade->id, $event->objectid); $this->assertEquals($student->id, $event->relateduserid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'grade submission', - 'view.php?id=' . $assign->get_course_module()->id, - $assign->format_grade_for_log($grade), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $sink->close(); } @@ -901,16 +747,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_assign\event\submission_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($submission->id, $event->objectid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view submission', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewsubmissionforuser', 'assign', $student->id), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -956,16 +792,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_assign\event\feedback_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); $this->assertEquals($gradeid, $event->objectid); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view feedback', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewfeedbackforuser', 'assign', $student->id), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -1001,17 +827,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\grading_form_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view grading form', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewgradingformforstudent', 'assign', array('id' => $student->id, - 'fullname' => fullname($student))), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -1047,15 +862,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\grading_table_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view submission grading table', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewsubmissiongradingtable', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -1087,15 +893,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\submission_form_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view submit assignment form', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('editsubmission', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -1127,15 +924,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\submission_confirmation_form_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view confirm submit assignment form', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewownsubmissionform', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -1165,15 +953,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\reveal_identities_confirmation_page_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewrevealidentitiesconfirm', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -1208,17 +987,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\statement_accepted', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'submission statement accepted', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('submissionstatementacceptedlog', - 'mod_assign', - fullname($student)), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); // Enable the online text submission plugin. @@ -1249,7 +1017,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\statement_accepted', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -1272,15 +1039,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\batch_set_workflow_state_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view batch set marking workflow state', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewbatchsetmarkingworkflowstate', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -1303,15 +1061,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_assign\event\batch_set_marker_allocation_viewed', $event); $this->assertEquals($assign->get_context(), $event->get_context()); - $expected = array( - $assign->get_course()->id, - 'assign', - 'view batch set marker allocation', - 'view.php?id=' . $assign->get_course_module()->id, - get_string('viewbatchmarkingallocation', 'assign'), - $assign->get_course_module()->id - ); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/mod/book/classes/event/chapter_created.php b/mod/book/classes/event/chapter_created.php index 0adef111a40..96f8a0db28f 100644 --- a/mod/book/classes/event/chapter_created.php +++ b/mod/book/classes/event/chapter_created.php @@ -66,16 +66,6 @@ class chapter_created extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'book', 'add chapter', 'view.php?id=' . $this->contextinstanceid . '&chapterid=' . - $this->objectid, $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/classes/event/chapter_deleted.php b/mod/book/classes/event/chapter_deleted.php index c58c04ae96c..6d5c375fe60 100644 --- a/mod/book/classes/event/chapter_deleted.php +++ b/mod/book/classes/event/chapter_deleted.php @@ -66,16 +66,6 @@ class chapter_deleted extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - $chapter = $this->get_record_snapshot('book_chapters', $this->objectid); - return array($this->courseid, 'book', 'update', 'view.php?id='.$this->contextinstanceid, $chapter->bookid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/classes/event/chapter_updated.php b/mod/book/classes/event/chapter_updated.php index 7f8580c82a0..125c9899749 100644 --- a/mod/book/classes/event/chapter_updated.php +++ b/mod/book/classes/event/chapter_updated.php @@ -66,16 +66,6 @@ class chapter_updated extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'book', 'update chapter', 'view.php?id=' . $this->contextinstanceid . '&chapterid=' . - $this->objectid, $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/classes/event/chapter_viewed.php b/mod/book/classes/event/chapter_viewed.php index 7a0fc782418..ebcb376f9dc 100644 --- a/mod/book/classes/event/chapter_viewed.php +++ b/mod/book/classes/event/chapter_viewed.php @@ -66,16 +66,6 @@ class chapter_viewed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'book', 'view chapter', 'view.php?id=' . $this->contextinstanceid . - '&chapterid=' . $this->objectid, $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/tests/event/events_test.php b/mod/book/tests/event/events_test.php index 0e7258856b8..b51861b9373 100644 --- a/mod/book/tests/event/events_test.php +++ b/mod/book/tests/event/events_test.php @@ -63,10 +63,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_book\event\chapter_created', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($chapter->id, $event->objectid); - $expected = array($course->id, 'book', 'add chapter', 'view.php?id='.$book->cmid.'&chapterid='.$chapter->id, - $chapter->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } public function test_chapter_updated() { @@ -93,10 +89,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_book\event\chapter_updated', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($chapter->id, $event->objectid); - $expected = array($course->id, 'book', 'update chapter', 'view.php?id='.$book->cmid.'&chapterid='.$chapter->id, - $chapter->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } public function test_chapter_deleted() { @@ -125,8 +117,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($chapter->id, $event->objectid); $this->assertEquals($chapter, $event->get_record_snapshot('book_chapters', $chapter->id)); - $this->assertEventLegacyLogData($legacy, $event); - $this->assertEventContextNotUsed($event); } public function test_course_module_instance_list_viewed() { @@ -149,9 +139,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_book\event\course_module_instance_list_viewed', $event); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'book', 'view all', 'index.php?id='.$course->id, ''); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } public function test_course_module_viewed() { @@ -178,9 +165,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_book\event\course_module_viewed', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($book->id, $event->objectid); - $expected = array($course->id, 'book', 'view', 'view.php?id=' . $book->cmid, $book->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } public function test_chapter_viewed() { @@ -207,10 +191,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_book\event\chapter_viewed', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($chapter->id, $event->objectid); - $expected = array($course->id, 'book', 'view chapter', 'view.php?id=' . $book->cmid . '&chapterid=' . - $chapter->id, $chapter->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } } diff --git a/mod/book/tool/exportimscp/classes/event/book_exported.php b/mod/book/tool/exportimscp/classes/event/book_exported.php index 08b63fdac50..121fd9d88ab 100644 --- a/mod/book/tool/exportimscp/classes/event/book_exported.php +++ b/mod/book/tool/exportimscp/classes/event/book_exported.php @@ -63,16 +63,6 @@ class book_exported extends \core\event\base { return "The user with id '$this->userid' has exported the book with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'book', 'exportimscp', 'tool/exportimscp/index.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/tool/exportimscp/tests/event/events_test.php b/mod/book/tool/exportimscp/tests/event/events_test.php index b1c2f51bcb9..6aabcb433ff 100644 --- a/mod/book/tool/exportimscp/tests/event/events_test.php +++ b/mod/book/tool/exportimscp/tests/event/events_test.php @@ -60,10 +60,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\booktool_exportimscp\event\book_exported', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($book->id, $event->objectid); - $expected = array($course->id, 'book', 'exportimscp', 'tool/exportimscp/index.php?id=' . $book->cmid, - $book->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } } diff --git a/mod/book/tool/print/classes/event/book_printed.php b/mod/book/tool/print/classes/event/book_printed.php index 62d91b184df..a7a57e8ee3b 100644 --- a/mod/book/tool/print/classes/event/book_printed.php +++ b/mod/book/tool/print/classes/event/book_printed.php @@ -63,16 +63,6 @@ class book_printed extends \core\event\base { return "The user with id '$this->userid' has printed the book with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'book', 'print', 'tool/print/index.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/tool/print/classes/event/chapter_printed.php b/mod/book/tool/print/classes/event/chapter_printed.php index c0c3b7ade77..f2b31769986 100644 --- a/mod/book/tool/print/classes/event/chapter_printed.php +++ b/mod/book/tool/print/classes/event/chapter_printed.php @@ -66,16 +66,6 @@ class chapter_printed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'book', 'print chapter', 'tool/print/index.php?id=' . $this->contextinstanceid . - '&chapterid=' . $this->objectid, $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/book/tool/print/tests/event/events_test.php b/mod/book/tool/print/tests/event/events_test.php index 23929f8c66a..254073c5276 100644 --- a/mod/book/tool/print/tests/event/events_test.php +++ b/mod/book/tool/print/tests/event/events_test.php @@ -60,9 +60,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\booktool_print\event\book_printed', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($book->id, $event->objectid); - $expected = array($course->id, 'book', 'print', 'tool/print/index.php?id=' . $book->cmid, $book->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } @@ -89,10 +86,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\booktool_print\event\chapter_printed', $event); $this->assertEquals(\context_module::instance($book->cmid), $event->get_context()); $this->assertEquals($chapter->id, $event->objectid); - $expected = array($course->id, 'book', 'print chapter', 'tool/print/index.php?id=' . $book->cmid . - '&chapterid=' . $chapter->id, $chapter->id, $book->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } } diff --git a/mod/chat/classes/event/message_sent.php b/mod/chat/classes/event/message_sent.php index 8397bb50905..ab491a3bdd4 100644 --- a/mod/chat/classes/event/message_sent.php +++ b/mod/chat/classes/event/message_sent.php @@ -45,17 +45,6 @@ class message_sent extends \core\event\base { '$this->contextinstanceid'."; } - /** - * Return legacy log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $message = $this->get_record_snapshot('chat_messages', $this->objectid); - return array($this->courseid, 'chat', 'talk', 'view.php?id=' . $this->contextinstanceid, - $message->chatid, $this->contextinstanceid, $this->relateduserid); - } - /** * Return localised event name. * diff --git a/mod/chat/classes/event/sessions_viewed.php b/mod/chat/classes/event/sessions_viewed.php index b2ec0c4431b..77d2caafb47 100644 --- a/mod/chat/classes/event/sessions_viewed.php +++ b/mod/chat/classes/event/sessions_viewed.php @@ -52,16 +52,6 @@ class sessions_viewed extends \core\event\base { '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'chat', 'report', 'report.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/chat/tests/event/events_test.php b/mod/chat/tests/event/events_test.php index 00aa1ec501b..a577d8e2d8b 100644 --- a/mod/chat/tests/event/events_test.php +++ b/mod/chat/tests/event/events_test.php @@ -74,8 +74,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($messageid, $event->objectid); $this->assertEquals($user1->id, $event->relateduserid); $this->assertEquals($user1->id, $event->userid); - $expected = array($course->id, 'chat', 'talk', "view.php?id=$cm->id", $chat->id, $cm->id, $user1->id); - $this->assertEventLegacyLogData($expected, $event); // Send a messaging from the first user. We DO NOT pass the CM to chat_send_chatmessage() this time. // This ensures that the event triggered when sending a message is filled with the correct information. @@ -89,9 +87,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($messageid, $event->objectid); $this->assertEquals($user2->id, $event->relateduserid); $this->assertEquals($user2->id, $event->userid); - $expected = array($course->id, 'chat', 'talk', "view.php?id=$cm->id", $chat->id, $cm->id, $user2->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); // Sending a message from the system should not trigger any event. $sink->clear(); @@ -133,9 +128,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(5678, $event->other['end']); $this->assertEquals($chat->id, $event->objectid); $this->assertEquals($chat, $event->get_record_snapshot('chat', $chat->id)); - $expected = array($course->id, 'chat', 'report', "report.php?id=$chat->cmid", $chat->id, $chat->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } public function test_course_module_instance_list_viewed() { @@ -158,9 +150,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_chat\event\course_module_instance_list_viewed', $event); $this->assertEquals($USER->id, $event->userid); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'chat', 'view all', "index.php?id=$course->id", ''); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } public function test_course_module_viewed() { @@ -179,9 +168,6 @@ class events_test extends \advanced_testcase { $event->add_record_snapshot('chat', $chat); $event->trigger(); - $expected = array($course->id, 'chat', 'view', "view.php?id=$cm->id", $chat->id, $cm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/chat/view.php', array('id' => $cm->id)); $this->assertEquals($url, $event->get_url()); $event->get_name(); diff --git a/mod/choice/classes/event/answer_submitted.php b/mod/choice/classes/event/answer_submitted.php index e4c051d9580..8ac9fa20b69 100644 --- a/mod/choice/classes/event/answer_submitted.php +++ b/mod/choice/classes/event/answer_submitted.php @@ -61,22 +61,6 @@ class answer_submitted extends \core\event\base { with course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $legacylogdata = array($this->courseid, - 'choice', - 'choose', - 'view.php?id=' . $this->contextinstanceid, - $this->other['choiceid'], - $this->contextinstanceid); - - return $legacylogdata; - } - /** * Return localised event name. * diff --git a/mod/choice/classes/event/answer_updated.php b/mod/choice/classes/event/answer_updated.php index f33296242cf..c728a8c30f3 100644 --- a/mod/choice/classes/event/answer_updated.php +++ b/mod/choice/classes/event/answer_updated.php @@ -62,22 +62,6 @@ class answer_updated extends \core\event\base { with course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $legacylogdata = array($this->courseid, - 'choice', - 'choose again', - 'view.php?id=' . $this->contextinstanceid, - $this->other['choiceid'], - $this->contextinstanceid); - - return $legacylogdata; - } - /** * Return localised event name. * diff --git a/mod/choice/classes/event/report_viewed.php b/mod/choice/classes/event/report_viewed.php index 3e3f97d9194..ede748fda65 100644 --- a/mod/choice/classes/event/report_viewed.php +++ b/mod/choice/classes/event/report_viewed.php @@ -77,16 +77,6 @@ class report_viewed extends \core\event\base { return new \moodle_url('/mod/choice/report.php', array('id' => $this->contextinstanceid)); } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $url = new \moodle_url('report.php', array('id' => $this->contextinstanceid)); - return array($this->courseid, 'choice', 'report', $url->out(), $this->objectid, $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'choice', 'restore' => 'choice'); } diff --git a/mod/choice/tests/event/events_test.php b/mod/choice/tests/event/events_test.php index 8d21ffe1db5..60807ede129 100644 --- a/mod/choice/tests/event/events_test.php +++ b/mod/choice/tests/event/events_test.php @@ -299,10 +299,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_choice\event\report_viewed', $event[0]); $this->assertEquals($USER->id, $event[0]->userid); $this->assertEquals(\context_module::instance($this->choice->cmid), $event[0]->get_context()); - $expected = array($this->course->id, "choice", "report", 'report.php?id=' . $this->context->instanceid, - $this->choice->id, $this->context->instanceid); - $this->assertEventLegacyLogData($expected, $event[0]); - $this->assertEventContextNotUsed($event[0]); $sink->close(); } @@ -371,10 +367,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_choice\event\course_module_viewed', $event[0]); $this->assertEquals($USER->id, $event[0]->userid); $this->assertEquals(\context_module::instance($this->choice->cmid), $event[0]->get_context()); - $expected = array($this->course->id, "choice", "view", 'view.php?id=' . $this->context->instanceid, - $this->choice->id, $this->context->instanceid); - $this->assertEventLegacyLogData($expected, $event[0]); - $this->assertEventContextNotUsed($event[0]); $sink->close(); } @@ -397,8 +389,5 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_choice\event\course_module_instance_list_viewed', $event); $this->assertEquals($USER->id, $event->userid); $this->assertEquals(\context_course::instance($this->course->id), $event->get_context()); - $expected = array($this->course->id, 'choice', 'view all', 'index.php?id=' . $this->course->id, ''); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } } diff --git a/mod/data/classes/event/field_created.php b/mod/data/classes/event/field_created.php index dc1bb0e0ec6..6a37ce1dba0 100644 --- a/mod/data/classes/event/field_created.php +++ b/mod/data/classes/event/field_created.php @@ -83,16 +83,6 @@ class field_created extends \core\event\base { return new \moodle_url('/mod/data/field.php', array('d' => $this->other['dataid'])); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'fields add', 'field.php?d=' . $this->other['dataid'] . '&mode=display&fid=' . - $this->objectid, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/classes/event/field_deleted.php b/mod/data/classes/event/field_deleted.php index 4a6b4af135f..338455c1149 100644 --- a/mod/data/classes/event/field_deleted.php +++ b/mod/data/classes/event/field_deleted.php @@ -82,16 +82,6 @@ class field_deleted extends \core\event\base { return new \moodle_url('/mod/data/field.php', array('d' => $this->other['dataid'])); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'fields delete', 'field.php?d=' . $this->other['dataid'], - $this->other['fieldname'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/classes/event/field_updated.php b/mod/data/classes/event/field_updated.php index 0f35080a514..7432da6167d 100644 --- a/mod/data/classes/event/field_updated.php +++ b/mod/data/classes/event/field_updated.php @@ -82,16 +82,6 @@ class field_updated extends \core\event\base { return new \moodle_url('/mod/data/field.php', array('d' => $this->other['dataid'])); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'fields update', 'field.php?d=' . $this->other['dataid'] . - '&mode=display&fid=' . $this->objectid, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/classes/event/record_created.php b/mod/data/classes/event/record_created.php index d0c15af0cbf..351d168e0e4 100644 --- a/mod/data/classes/event/record_created.php +++ b/mod/data/classes/event/record_created.php @@ -81,16 +81,6 @@ class record_created extends \core\event\base { return new \moodle_url('/mod/data/view.php', array('d' => $this->other['dataid'], 'rid' => $this->objectid)); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'add', 'view.php?d=' . $this->other['dataid'] . '&rid=' . $this->objectid, - $this->other['dataid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/classes/event/record_deleted.php b/mod/data/classes/event/record_deleted.php index 58356ad926f..8994f6326d9 100644 --- a/mod/data/classes/event/record_deleted.php +++ b/mod/data/classes/event/record_deleted.php @@ -81,16 +81,6 @@ class record_deleted extends \core\event\base { return new \moodle_url('/mod/data/view.php', array('d' => $this->other['dataid'])); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'record delete', 'view.php?id=' . $this->contextinstanceid, - $this->other['dataid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/classes/event/record_updated.php b/mod/data/classes/event/record_updated.php index b053d12df3d..faf8dfb6b6e 100644 --- a/mod/data/classes/event/record_updated.php +++ b/mod/data/classes/event/record_updated.php @@ -81,16 +81,6 @@ class record_updated extends \core\event\base { return new \moodle_url('/mod/data/view.php', array('d' => $this->other['dataid'], 'rid' => $this->objectid)); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'update', 'view.php?d=' . $this->other['dataid'] . '&rid=' . $this->objectid, - $this->other['dataid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/classes/event/template_updated.php b/mod/data/classes/event/template_updated.php index e484e51da11..8b22771902c 100644 --- a/mod/data/classes/event/template_updated.php +++ b/mod/data/classes/event/template_updated.php @@ -72,16 +72,6 @@ class template_updated extends \core\event\base { "id '$this->contextinstanceid'."; } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'templates saved', 'templates.php?id=' . $this->contextinstanceid . - '&d=' . $this->other['dataid'], $this->other['dataid'], $this->contextinstanceid); - } - /** * Get URL related to the action. * diff --git a/mod/data/classes/event/template_viewed.php b/mod/data/classes/event/template_viewed.php index 00f921749ee..28e58f8fbfa 100644 --- a/mod/data/classes/event/template_viewed.php +++ b/mod/data/classes/event/template_viewed.php @@ -80,16 +80,6 @@ class template_viewed extends \core\event\base { return new \moodle_url('/mod/data/templates.php', array('d' => $this->other['dataid'])); } - /** - * Get the legacy event log data. - * - * @return array - */ - public function get_legacy_logdata() { - return array($this->courseid, 'data', 'templates view', 'templates.php?id=' . $this->contextinstanceid . - '&d=' . $this->other['dataid'], $this->other['dataid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/data/tests/event/events_test.php b/mod/data/tests/event/events_test.php index 6df9fb43650..aa7b8207da5 100644 --- a/mod/data/tests/event/events_test.php +++ b/mod/data/tests/event/events_test.php @@ -71,10 +71,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\field_created', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'fields add', 'field.php?d=' . $data->id . '&mode=display&fid=' . - $field->field->id, $field->field->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/field.php', array('d' => $data->id)); $this->assertEquals($url, $event->get_url()); } @@ -111,10 +107,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\field_updated', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'fields update', 'field.php?d=' . $data->id . '&mode=display&fid=' . - $field->field->id, $field->field->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/field.php', array('d' => $data->id)); $this->assertEquals($url, $event->get_url()); } @@ -151,9 +143,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\field_deleted', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'fields delete', 'field.php?d=' . $data->id, $field->field->name, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/field.php', array('d' => $data->id)); $this->assertEquals($url, $event->get_url()); } @@ -180,10 +169,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\record_created', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'add', 'view.php?d=' . $data->id . '&rid=' . $recordid, - $data->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/view.php', array('d' => $data->id, 'rid' => $recordid)); $this->assertEquals($url, $event->get_url()); } @@ -223,9 +208,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\record_updated', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'update', 'view.php?d=' . $data->id . '&rid=1', $data->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/view.php', array('d' => $data->id, 'rid' => $event->objectid)); $this->assertEquals($url, $event->get_url()); } @@ -274,9 +256,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\record_deleted', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'record delete', 'view.php?id=' . $data->cmid, $data->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/view.php', array('d' => $data->id)); $this->assertEquals($url, $event->get_url()); } @@ -315,10 +294,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\template_viewed', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'templates view', 'templates.php?id=' . $data->cmid . '&d=' . - $data->id, $data->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/templates.php', array('d' => $data->id)); $this->assertEquals($url, $event->get_url()); } @@ -357,10 +332,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_data\event\template_updated', $event); $this->assertEquals(\context_module::instance($data->cmid), $event->get_context()); - $expected = array($course->id, 'data', 'templates saved', 'templates.php?id=' . $data->cmid . '&d=' . - $data->id, $data->id, $data->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); $url = new \moodle_url('/mod/data/templates.php', array('d' => $data->id)); $this->assertEquals($url, $event->get_url()); } diff --git a/mod/feedback/classes/event/course_module_viewed.php b/mod/feedback/classes/event/course_module_viewed.php index 39e45e55612..fc0a39387de 100644 --- a/mod/feedback/classes/event/course_module_viewed.php +++ b/mod/feedback/classes/event/course_module_viewed.php @@ -95,20 +95,6 @@ class course_module_viewed extends \core\event\course_module_viewed { } } - /** - * Replace add_to_log() statement.Do this only for the case when anonymous mode is off, - * since this is what was happening before. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - if ($this->anonymous) { - return null; - } else { - return parent::get_legacy_logdata(); - } - } - /** * Custom validations. * diff --git a/mod/feedback/classes/event/response_deleted.php b/mod/feedback/classes/event/response_deleted.php index d0820a10eb3..3ee9b604557 100644 --- a/mod/feedback/classes/event/response_deleted.php +++ b/mod/feedback/classes/event/response_deleted.php @@ -99,16 +99,6 @@ class response_deleted extends \core\event\base { "for the feedback activity with course module id '$this->contextinstanceid'."; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'feedback', 'delete', 'view.php?id=' . $this->other['cmid'], $this->other['instanceid'], - $this->other['instanceid']); - } - /** * Define whether a user can view the event or not. Make sure no one except admin can see details of an anonymous response. * diff --git a/mod/feedback/classes/event/response_submitted.php b/mod/feedback/classes/event/response_submitted.php index f012f6920be..42f32eaa20c 100644 --- a/mod/feedback/classes/event/response_submitted.php +++ b/mod/feedback/classes/event/response_submitted.php @@ -113,21 +113,6 @@ class response_submitted extends \core\event\base { } } - /** - * Replace add_to_log() statement. Do this only for the case when anonymous mode is off, - * since this is what was happening before. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - if ($this->anonymous) { - return null; - } else { - return array($this->courseid, 'feedback', 'submit', 'view.php?id=' . $this->other['cmid'], - $this->other['instanceid'], $this->other['cmid'], $this->relateduserid); - } - } - /** * Define whether a user can view the event or not. Make sure no one except admin can see details of an anonymous response. * diff --git a/mod/feedback/tests/event/events_test.php b/mod/feedback/tests/event/events_test.php index 79d91162021..afcc627d410 100644 --- a/mod/feedback/tests/event/events_test.php +++ b/mod/feedback/tests/event/events_test.php @@ -126,12 +126,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($this->eventcourse, $event->get_record_snapshot('course', $event->courseid)); $this->assertEquals($this->eventfeedback, $event->get_record_snapshot('feedback', $event->other['instanceid'])); - // Test legacy data. - $arr = array($this->eventcourse->id, 'feedback', 'delete', 'view.php?id=' . $this->eventcm->id, $this->eventfeedback->id, - $this->eventfeedback->id); - $this->assertEventLegacyLogData($arr, $event); - $this->assertEventContextNotUsed($event); - // Test can_view() . $this->setUser($this->eventuser); $this->assertFalse($event->can_view()); @@ -238,9 +232,6 @@ class events_test extends \advanced_testcase { $this->assertTrue($event->can_view()); $this->assertDebuggingCalled(); - // Test legacy data. - $this->assertEventLegacyLogData(null, $event); - // Create a temporary response, with anonymous set to no. $response = new \stdClass(); $response->feedback = $this->eventcm->instance; @@ -262,11 +253,6 @@ class events_test extends \advanced_testcase { $event = array_pop($events); // Response submitted feedback event. $sink->close(); - // Test legacy data. - $arr = array($this->eventcourse->id, 'feedback', 'submit', 'view.php?id=' . $this->eventcm->id, $this->eventfeedback->id, - $this->eventcm->id, $this->eventuser->id); - $this->assertEventLegacyLogData($arr, $event); - // Test can_view(). $this->assertTrue($event->can_view()); $this->assertDebuggingCalled(); diff --git a/mod/folder/classes/event/folder_updated.php b/mod/folder/classes/event/folder_updated.php index d3a20e84361..b2189984751 100644 --- a/mod/folder/classes/event/folder_updated.php +++ b/mod/folder/classes/event/folder_updated.php @@ -72,16 +72,6 @@ class folder_updated extends \core\event\base { return new \moodle_url('/mod/folder/edit.php', array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'folder', 'edit', 'edit.php?id=' . $this->contextinstanceid, $this->objectid, - $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'folder', 'restore' => 'folder'); } diff --git a/mod/folder/tests/event/events_test.php b/mod/folder/tests/event/events_test.php index cb6311844eb..35e39a25845 100644 --- a/mod/folder/tests/event/events_test.php +++ b/mod/folder/tests/event/events_test.php @@ -64,9 +64,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_folder\event\folder_updated', $event); $this->assertEquals(\context_module::instance($folder->cmid), $event->get_context()); $this->assertEquals($folder->id, $event->objectid); - $expected = array($course->id, 'folder', 'edit', 'edit.php?id=' . $folder->cmid, $folder->id, $folder->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** diff --git a/mod/forum/classes/event/assessable_uploaded.php b/mod/forum/classes/event/assessable_uploaded.php index 93f37bdbbcd..7b70f7d47f6 100644 --- a/mod/forum/classes/event/assessable_uploaded.php +++ b/mod/forum/classes/event/assessable_uploaded.php @@ -54,35 +54,6 @@ class assessable_uploaded extends \core\event\assessable_uploaded { "'$this->contextinstanceid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = 'forum'; - $eventdata->name = $this->other['triggeredfrom']; - $eventdata->cmid = $this->contextinstanceid; - $eventdata->itemid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - $eventdata->content = $this->other['content']; - if ($this->other['pathnamehashes']) { - $eventdata->pathnamehashes = $this->other['pathnamehashes']; - } - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'assessable_content_uploaded'; - } - /** * Return localised event name. * diff --git a/mod/forum/classes/event/course_module_viewed.php b/mod/forum/classes/event/course_module_viewed.php index a4c2f033dbc..16f2341fd7c 100644 --- a/mod/forum/classes/event/course_module_viewed.php +++ b/mod/forum/classes/event/course_module_viewed.php @@ -56,16 +56,6 @@ class course_module_viewed extends \core\event\course_module_viewed { return new \moodle_url('/mod/forum/view.php', array('f' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'view forum', 'view.php?f=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'forum', 'restore' => 'forum'); } diff --git a/mod/forum/classes/event/course_searched.php b/mod/forum/classes/event/course_searched.php index 40ab3dc88b0..99b31ed456a 100644 --- a/mod/forum/classes/event/course_searched.php +++ b/mod/forum/classes/event/course_searched.php @@ -82,18 +82,6 @@ class course_searched extends \core\event\base { array('id' => $this->courseid, 'search' => $this->other['searchterm'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - - return array($this->courseid, 'forum', 'search', $logurl, $this->other['searchterm']); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/discussion_created.php b/mod/forum/classes/event/discussion_created.php index ad5e372ba03..cfb158ff286 100644 --- a/mod/forum/classes/event/discussion_created.php +++ b/mod/forum/classes/event/discussion_created.php @@ -80,19 +80,6 @@ class discussion_created extends \core\event\base { return new \moodle_url('/mod/forum/discuss.php', array('d' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - - return array($this->courseid, 'forum', 'add discussion', $logurl, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/discussion_deleted.php b/mod/forum/classes/event/discussion_deleted.php index 6bd2d2ffa14..065c690ad00 100644 --- a/mod/forum/classes/event/discussion_deleted.php +++ b/mod/forum/classes/event/discussion_deleted.php @@ -81,16 +81,6 @@ class discussion_deleted extends \core\event\base { return new \moodle_url('/mod/forum/view.php', array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'delete discussion', 'view.php?id=' . $this->contextinstanceid, - $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/discussion_moved.php b/mod/forum/classes/event/discussion_moved.php index c0aaa1b93ca..b81d723ce82 100644 --- a/mod/forum/classes/event/discussion_moved.php +++ b/mod/forum/classes/event/discussion_moved.php @@ -81,16 +81,6 @@ class discussion_moved extends \core\event\base { return new \moodle_url('/mod/forum/discuss.php', array('d' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'move discussion', 'discuss.php?d=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/discussion_pinned.php b/mod/forum/classes/event/discussion_pinned.php index fd74bdd45d0..7e23f7a3468 100644 --- a/mod/forum/classes/event/discussion_pinned.php +++ b/mod/forum/classes/event/discussion_pinned.php @@ -70,17 +70,6 @@ class discussion_pinned extends \core\event\base { return new \moodle_url('/mod/forum/discuss.php', array('d' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - return array($this->courseid, 'forum', 'pin discussion', $logurl, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/discussion_unpinned.php b/mod/forum/classes/event/discussion_unpinned.php index 5c38d42ebdf..e985dd3594a 100644 --- a/mod/forum/classes/event/discussion_unpinned.php +++ b/mod/forum/classes/event/discussion_unpinned.php @@ -70,17 +70,6 @@ class discussion_unpinned extends \core\event\base { return new \moodle_url('/mod/forum/discuss.php', array('d' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - return array($this->courseid, 'forum', 'unpin discussion', $logurl, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/discussion_viewed.php b/mod/forum/classes/event/discussion_viewed.php index e99290e0cb0..450f165a3e5 100644 --- a/mod/forum/classes/event/discussion_viewed.php +++ b/mod/forum/classes/event/discussion_viewed.php @@ -75,16 +75,6 @@ class discussion_viewed extends \core\event\base { return new \moodle_url('/mod/forum/discuss.php', array('d' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'view discussion', 'discuss.php?d=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/post_created.php b/mod/forum/classes/event/post_created.php index ea170e569ae..a495b2a1644 100644 --- a/mod/forum/classes/event/post_created.php +++ b/mod/forum/classes/event/post_created.php @@ -91,18 +91,6 @@ class post_created extends \core\event\base { return $url; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - - return array($this->courseid, 'forum', 'add post', $logurl, $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/post_deleted.php b/mod/forum/classes/event/post_deleted.php index 91d2f4c12db..86ceb5a9d9c 100644 --- a/mod/forum/classes/event/post_deleted.php +++ b/mod/forum/classes/event/post_deleted.php @@ -90,18 +90,6 @@ class post_deleted extends \core\event\base { return $url; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - - return array($this->courseid, 'forum', 'delete post', $logurl, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/post_updated.php b/mod/forum/classes/event/post_updated.php index 2ab41ff3a16..5b2a7ed96d2 100644 --- a/mod/forum/classes/event/post_updated.php +++ b/mod/forum/classes/event/post_updated.php @@ -91,18 +91,6 @@ class post_updated extends \core\event\base { return $url; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - - return array($this->courseid, 'forum', 'update post', $logurl, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/readtracking_disabled.php b/mod/forum/classes/event/readtracking_disabled.php index 3e35ff3cc9b..0f90e947a04 100644 --- a/mod/forum/classes/event/readtracking_disabled.php +++ b/mod/forum/classes/event/readtracking_disabled.php @@ -79,16 +79,6 @@ class readtracking_disabled extends \core\event\base { return new \moodle_url('/mod/forum/view.php', array('f' => $this->other['forumid'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'stop tracking', 'view.php?f=' . $this->other['forumid'], - $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/readtracking_enabled.php b/mod/forum/classes/event/readtracking_enabled.php index c2dcc40c87e..78103c85917 100644 --- a/mod/forum/classes/event/readtracking_enabled.php +++ b/mod/forum/classes/event/readtracking_enabled.php @@ -79,16 +79,6 @@ class readtracking_enabled extends \core\event\base { return new \moodle_url('/mod/forum/view.php', array('f' => $this->other['forumid'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'start tracking', 'view.php?f=' . $this->other['forumid'], - $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/subscribers_viewed.php b/mod/forum/classes/event/subscribers_viewed.php index deec581902c..0aa54776bb1 100644 --- a/mod/forum/classes/event/subscribers_viewed.php +++ b/mod/forum/classes/event/subscribers_viewed.php @@ -80,16 +80,6 @@ class subscribers_viewed extends \core\event\base { return new \moodle_url('/mod/forum/subscribers.php', array('id' => $this->other['forumid'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'view subscribers', 'subscribers.php?id=' . $this->other['forumid'], - $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/subscription_created.php b/mod/forum/classes/event/subscription_created.php index c3531aafd9a..df4fd1f3a28 100644 --- a/mod/forum/classes/event/subscription_created.php +++ b/mod/forum/classes/event/subscription_created.php @@ -80,16 +80,6 @@ class subscription_created extends \core\event\base { return new \moodle_url('/mod/forum/subscribers.php', array('id' => $this->other['forumid'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'subscribe', 'view.php?f=' . $this->other['forumid'], - $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/subscription_deleted.php b/mod/forum/classes/event/subscription_deleted.php index 129e9b2e6c3..a52149a529f 100644 --- a/mod/forum/classes/event/subscription_deleted.php +++ b/mod/forum/classes/event/subscription_deleted.php @@ -80,16 +80,6 @@ class subscription_deleted extends \core\event\base { return new \moodle_url('/mod/forum/subscribers.php', array('id' => $this->other['forumid'])); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'forum', 'unsubscribe', 'view.php?f=' . $this->other['forumid'], - $this->other['forumid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/forum/classes/event/user_report_viewed.php b/mod/forum/classes/event/user_report_viewed.php index 1fdc5c96f0b..7267e7cccbb 100644 --- a/mod/forum/classes/event/user_report_viewed.php +++ b/mod/forum/classes/event/user_report_viewed.php @@ -88,18 +88,6 @@ class user_report_viewed extends \core\event\base { return $url; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - // The legacy log table expects a relative path to /mod/forum/. - $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/forum/')); - - return array($this->courseid, 'forum', 'user report', $logurl, $this->relateduserid); - } - /** * Custom validation. * diff --git a/mod/forum/tests/event/events_test.php b/mod/forum/tests/event/events_test.php index 21208aba859..1d0a9c585e2 100644 --- a/mod/forum/tests/event/events_test.php +++ b/mod/forum/tests/event/events_test.php @@ -112,8 +112,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\course_searched', $event); $this->assertEquals($coursectx, $event->get_context()); - $expected = array($course->id, 'forum', 'search', "search.php?id={$course->id}&search={$searchterm}", $searchterm); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -191,8 +189,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\discussion_created', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'add discussion', "discuss.php?d={$discussion->id}", $discussion->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -346,8 +342,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\discussion_deleted', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'delete discussion', "view.php?id={$forum->cmid}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -455,9 +449,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\discussion_moved', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'move discussion', "discuss.php?d={$discussion->id}", - $discussion->id, $toforum->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -524,9 +515,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\discussion_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'view discussion', "discuss.php?d={$discussion->id}", - $discussion->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -576,8 +564,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\course_module_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'view forum', "view.php?f={$forum->id}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -676,8 +662,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\subscription_created', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'subscribe', "view.php?f={$forum->id}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/subscribers.php', array('id' => $forum->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -776,8 +760,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\subscription_deleted', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'unsubscribe', "view.php?f={$forum->id}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/subscribers.php', array('id' => $forum->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -867,8 +849,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\readtracking_enabled', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'start tracking', "view.php?f={$forum->id}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -958,8 +938,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\readtracking_disabled', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'stop tracking', "view.php?f={$forum->id}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -1030,8 +1008,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\subscribers_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'view subscribers', "subscribers.php?id={$forum->id}", $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -1115,9 +1091,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\user_report_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'user report', - "user.php?id={$user->id}&mode=discussions&course={$course->id}", $user->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); @@ -1316,9 +1289,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\post_created', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'add post', "discuss.php?d={$discussion->id}#p{$post->id}", - $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/discuss.php', array('d' => $discussion->id)); $url->set_anchor('p'.$event->objectid); $this->assertEquals($url, $event->get_url()); @@ -1369,9 +1339,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\post_created', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'add post', "view.php?f={$forum->id}#p{$post->id}", - $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id)); $url->set_anchor('p'.$event->objectid); $this->assertEquals($url, $event->get_url()); @@ -1577,8 +1544,6 @@ class events_test extends \advanced_testcase { // Check that the events contain the expected values. $this->assertInstanceOf('\mod_forum\event\post_deleted', $event); $this->assertEquals(\context_module::instance($forum->cmid), $event->get_context()); - $expected = array($course->id, 'forum', 'delete post', "discuss.php?d={$discussion->id}", $lastpost->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/discuss.php', array('d' => $discussion->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -1597,9 +1562,6 @@ class events_test extends \advanced_testcase { // Check that the event contains the expected values. $this->assertEquals($event->objectid, $discussion->id); $this->assertEquals(\context_module::instance($forum->cmid), $event->get_context()); - $expected = array($course->id, 'forum', 'delete discussion', "view.php?id={$forum->cmid}", - $forum->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('id' => $forum->cmid)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -1610,8 +1572,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_forum\event\post_deleted', $event); $this->assertEquals($event->objectid, $post->id); $this->assertEquals(\context_module::instance($forum->cmid), $event->get_context()); - $expected = array($course->id, 'forum', 'delete post', "discuss.php?d={$discussion->id}", $post->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/discuss.php', array('d' => $discussion->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -1662,8 +1622,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\post_deleted', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'delete post', "view.php?f={$forum->id}", $post->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id)); $this->assertEquals($url, $event->get_url()); $this->assertEventContextNotUsed($event); @@ -1841,9 +1799,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\post_updated', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'update post', "discuss.php?d={$discussion->id}#p{$post->id}", - $post->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/discuss.php', array('d' => $discussion->id)); $url->set_anchor('p'.$event->objectid); $this->assertEquals($url, $event->get_url()); @@ -1894,9 +1849,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\post_updated', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'update post', "view.php?f={$forum->id}#p{$post->id}", - $post->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $url = new \moodle_url('/mod/forum/view.php', array('f' => $forum->id)); $url->set_anchor('p'.$post->id); $this->assertEquals($url, $event->get_url()); diff --git a/mod/forum/tests/lib_test.php b/mod/forum/tests/lib_test.php index 1c13e3711c1..7f0cd63f43f 100644 --- a/mod/forum/tests/lib_test.php +++ b/mod/forum/tests/lib_test.php @@ -92,7 +92,6 @@ class lib_test extends \advanced_testcase { $expected->userid = $user->id; $expected->content = $fakepost->message; $expected->pathnamehashes = array($fi->get_pathnamehash()); - $this->assertEventLegacyData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -2230,9 +2229,6 @@ class lib_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_forum\event\discussion_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'forum', 'view discussion', "discuss.php?d={$discussion->id}", - $discussion->id, $forum->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $this->assertNotEmpty($event->get_name()); diff --git a/mod/glossary/classes/event/category_created.php b/mod/glossary/classes/event/category_created.php index 56a644612c5..34804c6bcb0 100644 --- a/mod/glossary/classes/event/category_created.php +++ b/mod/glossary/classes/event/category_created.php @@ -72,17 +72,6 @@ class category_created extends \core\event\base { array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'add category', - "editcategories.php?id={$this->contextinstanceid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/category_deleted.php b/mod/glossary/classes/event/category_deleted.php index 3b25a4699b9..2151bc06f73 100644 --- a/mod/glossary/classes/event/category_deleted.php +++ b/mod/glossary/classes/event/category_deleted.php @@ -72,17 +72,6 @@ class category_deleted extends \core\event\base { array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'delete category', - "editcategories.php?id={$this->contextinstanceid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/category_updated.php b/mod/glossary/classes/event/category_updated.php index 887123d48ed..4e25b253d40 100644 --- a/mod/glossary/classes/event/category_updated.php +++ b/mod/glossary/classes/event/category_updated.php @@ -72,17 +72,6 @@ class category_updated extends \core\event\base { array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'edit category', - "editcategories.php?id={$this->contextinstanceid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/course_module_viewed.php b/mod/glossary/classes/event/course_module_viewed.php index 33680aa5da6..a3365a2582a 100644 --- a/mod/glossary/classes/event/course_module_viewed.php +++ b/mod/glossary/classes/event/course_module_viewed.php @@ -63,18 +63,6 @@ class course_module_viewed extends \core\event\course_module_viewed { return new \moodle_url("/mod/$this->objecttable/view.php", $params); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - // In moodle 2.6 and below the url was logged incorrectly, always having tab=-1 . - return array($this->courseid, $this->objecttable, 'view', - 'view.php?id=' . $this->contextinstanceid . '&tab=-1', - $this->objectid, $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'glossary', 'restore' => 'glossary'); } diff --git a/mod/glossary/classes/event/entry_approved.php b/mod/glossary/classes/event/entry_approved.php index 38bae26cf49..85567d36606 100644 --- a/mod/glossary/classes/event/entry_approved.php +++ b/mod/glossary/classes/event/entry_approved.php @@ -74,17 +74,6 @@ class entry_approved extends \core\event\base { 'hook' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'approve entry', - "showentry.php?id={$this->contextinstanceid}&eid={$this->objectid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/entry_created.php b/mod/glossary/classes/event/entry_created.php index fba39d75a19..ea098a0f402 100644 --- a/mod/glossary/classes/event/entry_created.php +++ b/mod/glossary/classes/event/entry_created.php @@ -80,17 +80,6 @@ class entry_created extends \core\event\base { 'hook' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'add entry', - "view.php?id={$this->contextinstanceid}&mode=entry&hook={$this->objectid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/entry_deleted.php b/mod/glossary/classes/event/entry_deleted.php index 7721668d17b..c1e0292e658 100644 --- a/mod/glossary/classes/event/entry_deleted.php +++ b/mod/glossary/classes/event/entry_deleted.php @@ -87,24 +87,6 @@ class entry_deleted extends \core\event\base { return new \moodle_url("/mod/glossary/view.php", $params); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - $hook = $mode = ''; - if (isset($this->other['hook'])) { - $hook = $this->other['hook']; - } - if (isset($this->other['mode'])) { - $mode = $this->other['mode']; - } - return array($this->courseid, 'glossary', 'delete entry', - "view.php?id={$this->contextinstanceid}&mode={$mode}&hook={$hook}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/entry_disapproved.php b/mod/glossary/classes/event/entry_disapproved.php index faa47213d2a..8e9d2cf333b 100644 --- a/mod/glossary/classes/event/entry_disapproved.php +++ b/mod/glossary/classes/event/entry_disapproved.php @@ -74,17 +74,6 @@ class entry_disapproved extends \core\event\base { 'hook' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'disapprove entry', - "showentry.php?id={$this->contextinstanceid}&eid={$this->objectid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/entry_updated.php b/mod/glossary/classes/event/entry_updated.php index 88c10de469c..188832927de 100644 --- a/mod/glossary/classes/event/entry_updated.php +++ b/mod/glossary/classes/event/entry_updated.php @@ -80,17 +80,6 @@ class entry_updated extends \core\event\base { 'hook' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'update entry', - "view.php?id={$this->contextinstanceid}&mode=entry&hook={$this->objectid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/classes/event/entry_viewed.php b/mod/glossary/classes/event/entry_viewed.php index f04695568a5..a5f7d7971e8 100644 --- a/mod/glossary/classes/event/entry_viewed.php +++ b/mod/glossary/classes/event/entry_viewed.php @@ -74,17 +74,6 @@ class entry_viewed extends \core\event\base { array('eid' => $this->objectid)); } - /** - * Return the legacy event log data. - * - * @return array|null - */ - public function get_legacy_logdata() { - return array($this->courseid, 'glossary', 'view entry', - "showentry.php?eid={$this->objectid}", - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/glossary/tests/event/events_test.php b/mod/glossary/tests/event/events_test.php index b039a6b230e..87b262c013e 100644 --- a/mod/glossary/tests/event/events_test.php +++ b/mod/glossary/tests/event/events_test.php @@ -158,9 +158,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); $this->assertEquals($glossary->id, $event->objectid); - $expected = array($course->id, 'glossary', 'view', 'view.php?id=' . $glossary->cmid . '&tab=-1', - $glossary->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEquals(new \moodle_url('/mod/glossary/view.php', array('id' => $glossary->cmid, 'mode' => $mode)), $event->get_url()); $this->assertEventContextNotUsed($event); } @@ -186,8 +183,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\course_module_instance_list_viewed', $event); $this->assertEquals(CONTEXT_COURSE, $event->contextlevel); $this->assertEquals($course->id, $event->contextinstanceid); - $expected = array($course->id, 'glossary', 'view all', 'index.php?id='.$course->id, ''); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -221,9 +216,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\entry_created', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - $expected = array($course->id, "glossary", "add entry", - "view.php?id={$glossary->cmid}&mode=entry&hook={$entry->id}", $entry->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -257,9 +249,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\entry_updated', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - $expected = array($course->id, "glossary", "update entry", - "view.php?id={$glossary->cmid}&mode=entry&hook={$entry->id}", $entry->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -302,9 +291,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\entry_deleted', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - $expected = array($course->id, "glossary", "delete entry", - "view.php?id={$glossary->cmid}&mode={$prevmode}&hook={$hook}", $entry->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -339,10 +325,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\category_created', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - //add_to_log($course->id, "glossary", "add category", "editcategories.php?id=$cm->id", $cat->id,$cm->id); - $expected = array($course->id, "glossary", "add category", - "editcategories.php?id={$glossary->cmid}", $category->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); // Update category and trigger event. @@ -364,10 +346,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\category_updated', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - //add_to_log($course->id, "glossary", "edit category", "editcategories.php?id=$cm->id", $hook,$cm->id); - $expected = array($course->id, "glossary", "edit category", - "editcategories.php?id={$glossary->cmid}", $category->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); @@ -391,10 +369,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\category_deleted', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - //add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id); - $expected = array($course->id, "glossary", "delete category", - "editcategories.php?id={$glossary->cmid}", $category->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -445,9 +419,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\entry_approved', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - $expected = array($course->id, "glossary", "approve entry", - "showentry.php?id={$glossary->cmid}&eid={$entry->id}", $entry->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); @@ -474,9 +445,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\entry_disapproved', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - $expected = array($course->id, "glossary", "disapprove entry", - "showentry.php?id={$glossary->cmid}&eid={$entry->id}", $entry->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -507,9 +475,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_glossary\event\entry_viewed', $event); $this->assertEquals(CONTEXT_MODULE, $event->contextlevel); $this->assertEquals($glossary->cmid, $event->contextinstanceid); - $expected = array($course->id, "glossary", "view entry", - "showentry.php?eid={$entry->id}", $entry->id, $glossary->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php b/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php index f587a7a8a13..545bab2b62f 100644 --- a/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php +++ b/mod/h5pactivity/tests/event/course_module_instance_list_viewed_test.php @@ -64,8 +64,6 @@ class course_module_instance_list_viewed_test extends advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_h5pactivity\event\course_module_instance_list_viewed', $event); $this->assertEquals(context_course::instance($course->id), $event->get_context()); - $expected = [$course->id, 'h5pactivity', 'view all', 'index.php?id='.$course->id, '']; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/mod/h5pactivity/tests/event/course_module_viewed_test.php b/mod/h5pactivity/tests/event/course_module_viewed_test.php index 8426db7dcc6..acad09525aa 100644 --- a/mod/h5pactivity/tests/event/course_module_viewed_test.php +++ b/mod/h5pactivity/tests/event/course_module_viewed_test.php @@ -68,8 +68,6 @@ class course_module_viewed_test extends advanced_testcase { $this->assertInstanceOf('\mod_h5pactivity\event\course_module_viewed', $event); $this->assertEquals(context_module::instance($activity->cmid), $event->get_context()); $this->assertEquals($activity->id, $event->objectid); - $expected = [$course->id, 'h5pactivity', 'view', 'view.php?id=' . $activity->cmid, $activity->id, $activity->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/mod/lesson/classes/event/essay_assessed.php b/mod/lesson/classes/event/essay_assessed.php index 92079ac4e89..33e4e4d07be 100644 --- a/mod/lesson/classes/event/essay_assessed.php +++ b/mod/lesson/classes/event/essay_assessed.php @@ -64,17 +64,6 @@ class essay_assessed extends \core\event\base { "recorded a mark '$this->objectid' in the lesson with course module id '$this->contextinstanceid'."; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - $lesson = $this->get_record_snapshot('lesson', $this->other['lessonid']); - return array($this->courseid, 'lesson', 'update grade', 'essay.php?id=' . - $this->contextinstanceid, $lesson->name, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/lesson/classes/event/essay_attempt_viewed.php b/mod/lesson/classes/event/essay_attempt_viewed.php index 1af109f0bd9..0241f2e2337 100644 --- a/mod/lesson/classes/event/essay_attempt_viewed.php +++ b/mod/lesson/classes/event/essay_attempt_viewed.php @@ -74,16 +74,6 @@ class essay_attempt_viewed extends \core\event\base { "the attempt with id '$this->objectid' for the lesson activity with course module id '$this->contextinstanceid'."; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'lesson', 'view grade', 'essay.php?id=' . $this->contextinstanceid . '&mode=grade&attemptid=' - . $this->objectid, get_string('manualgrading', 'lesson'), $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/lesson/classes/event/highscore_added.php b/mod/lesson/classes/event/highscore_added.php index 25d61bebc94..a30f9df2f4b 100644 --- a/mod/lesson/classes/event/highscore_added.php +++ b/mod/lesson/classes/event/highscore_added.php @@ -84,16 +84,6 @@ class highscore_added extends \core\event\base { "id '$this->contextinstanceid'."; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'lesson', 'update highscores', 'highscores.php?id=' . $this->contextinstanceid, - $this->other['nickname'], $this->contextinstanceid); - } - /** * Custom validations. * diff --git a/mod/lesson/classes/event/highscores_viewed.php b/mod/lesson/classes/event/highscores_viewed.php index 91fa720cd22..9173a50698a 100644 --- a/mod/lesson/classes/event/highscores_viewed.php +++ b/mod/lesson/classes/event/highscores_viewed.php @@ -76,18 +76,6 @@ class highscores_viewed extends \core\event\base { "id '$this->contextinstanceid'."; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - $lesson = $this->get_record_snapshot('lesson', $this->objectid); - - return array($this->courseid, 'lesson', 'view highscores', 'highscores.php?id=' . $this->contextinstanceid, - $lesson->name, $this->contextinstanceid); - } - public static function get_objectid_mapping() { // The 'highscore' functionality was removed from core. return false; diff --git a/mod/lesson/classes/event/lesson_ended.php b/mod/lesson/classes/event/lesson_ended.php index e090a789f86..e8bfde2704f 100644 --- a/mod/lesson/classes/event/lesson_ended.php +++ b/mod/lesson/classes/event/lesson_ended.php @@ -73,16 +73,6 @@ class lesson_ended extends \core\event\base { return "The user with id '$this->userid' ended the lesson with course module id '$this->contextinstanceid'."; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'lesson', 'end', 'view.php?id=' . $this->contextinstanceid, $this->objectid, - $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'lesson', 'restore' => 'lesson'); } diff --git a/mod/lesson/classes/event/lesson_started.php b/mod/lesson/classes/event/lesson_started.php index 204d0ce7798..a55997fe3a3 100644 --- a/mod/lesson/classes/event/lesson_started.php +++ b/mod/lesson/classes/event/lesson_started.php @@ -72,16 +72,6 @@ class lesson_started extends \core\event\base { return "The user with id '$this->userid' started the lesson with course module id '$this->contextinstanceid'."; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'lesson', 'start', 'view.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'lesson', 'restore' => 'lesson'); } diff --git a/mod/lesson/tests/event/events_test.php b/mod/lesson/tests/event/events_test.php index e753b8abf67..24bfc74cc59 100644 --- a/mod/lesson/tests/event/events_test.php +++ b/mod/lesson/tests/event/events_test.php @@ -197,9 +197,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_lesson\event\essay_attempt_viewed', $event); $this->assertEquals(\context_module::instance($this->lesson->properties()->cmid), $event->get_context()); - $expected = array($this->course->id, 'lesson', 'view grade', 'essay.php?id=' . $this->lesson->properties()->cmid . - '&mode=grade&attemptid='.$this->lesson->id, get_string('manualgrading', 'lesson'), $this->lesson->properties()->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -216,9 +213,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_lesson\event\lesson_started', $event); $this->assertEquals(\context_module::instance($this->lesson->properties()->cmid), $event->get_context()); - $expected = array($this->course->id, 'lesson', 'start', 'view.php?id=' . $this->lesson->properties()->cmid, - $this->lesson->properties()->id, $this->lesson->properties()->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -290,9 +284,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_lesson\event\lesson_ended', $event); $this->assertEquals(\context_module::instance($this->lesson->properties()->cmid), $event->get_context()); - $expected = array($this->course->id, 'lesson', 'end', 'view.php?id=' . $this->lesson->properties()->cmid, - $this->lesson->properties()->id, $this->lesson->properties()->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -326,9 +317,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_lesson\event\essay_assessed', $event); $this->assertEquals(\context_module::instance($this->lesson->properties()->cmid), $event->get_context()); - $expected = array($this->course->id, 'lesson', 'update grade', 'essay.php?id=' . $this->lesson->properties()->cmid, - $this->lesson->name, $this->lesson->properties()->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/mod/lti/classes/event/unknown_service_api_called.php b/mod/lti/classes/event/unknown_service_api_called.php index 6dd453dc689..962c826ed57 100644 --- a/mod/lti/classes/event/unknown_service_api_called.php +++ b/mod/lti/classes/event/unknown_service_api_called.php @@ -87,23 +87,4 @@ class unknown_service_api_called extends \core\event\base { public static function get_name() { return get_string('ltiunknownserviceapicall', 'mod_lti'); } - - /** - * Does this event replace a legacy event? - * - * @return null|string legacy event name - */ - public static function get_legacy_eventname() { - return 'lti_unknown_service_api_call'; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return mixed - */ - protected function get_legacy_eventdata() { - return $this->eventdata; - } - } diff --git a/mod/quiz/classes/event/attempt_abandoned.php b/mod/quiz/classes/event/attempt_abandoned.php index b6435cf19b8..bd129c0e348 100644 --- a/mod/quiz/classes/event/attempt_abandoned.php +++ b/mod/quiz/classes/event/attempt_abandoned.php @@ -69,15 +69,6 @@ class attempt_abandoned extends \core\event\base { return get_string('eventquizattemptabandoned', 'mod_quiz'); } - /** - * Does this event replace a legacy event? - * - * @return string legacy event name - */ - static public function get_legacy_eventname() { - return 'quiz_attempt_abandoned'; - } - /** * Returns relevant URL. * @@ -87,28 +78,6 @@ class attempt_abandoned extends \core\event\base { return new \moodle_url('/mod/quiz/review.php', ['attempt' => $this->objectid]); } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $attempt = $this->get_record_snapshot('quiz_attempts', $this->objectid); - - $legacyeventdata = new \stdClass(); - $legacyeventdata->component = 'mod_quiz'; - $legacyeventdata->attemptid = $this->objectid; - $legacyeventdata->timestamp = $attempt->timemodified; - $legacyeventdata->userid = $this->relateduserid; - $legacyeventdata->quizid = $attempt->quiz; - $legacyeventdata->cmid = $this->contextinstanceid; - $legacyeventdata->courseid = $this->courseid; - $legacyeventdata->submitterid = $this->other['submitterid']; - - return $legacyeventdata; - - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_becameoverdue.php b/mod/quiz/classes/event/attempt_becameoverdue.php index b4298da02b4..1ec54603f25 100644 --- a/mod/quiz/classes/event/attempt_becameoverdue.php +++ b/mod/quiz/classes/event/attempt_becameoverdue.php @@ -72,15 +72,6 @@ class attempt_becameoverdue extends \core\event\base { return get_string('eventquizattempttimelimitexceeded', 'mod_quiz'); } - /** - * Does this event replace a legacy event? - * - * @return string legacy event name - */ - static public function get_legacy_eventname() { - return 'quiz_attempt_overdue'; - } - /** * Returns relevant URL. * @@ -90,27 +81,6 @@ class attempt_becameoverdue extends \core\event\base { return new \moodle_url('/mod/quiz/review.php', ['attempt' => $this->objectid]); } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $attempt = $this->get_record_snapshot('quiz_attempts', $this->objectid); - - $legacyeventdata = new \stdClass(); - $legacyeventdata->component = 'mod_quiz'; - $legacyeventdata->attemptid = $this->objectid; - $legacyeventdata->timestamp = $attempt->timemodified; - $legacyeventdata->userid = $this->relateduserid; - $legacyeventdata->quizid = $attempt->quiz; - $legacyeventdata->cmid = $this->contextinstanceid; - $legacyeventdata->courseid = $this->courseid; - $legacyeventdata->submitterid = $this->other['submitterid']; - - return $legacyeventdata; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_deleted.php b/mod/quiz/classes/event/attempt_deleted.php index c656f7c1162..537090b67e3 100644 --- a/mod/quiz/classes/event/attempt_deleted.php +++ b/mod/quiz/classes/event/attempt_deleted.php @@ -78,16 +78,6 @@ class attempt_deleted extends \core\event\base { return new \moodle_url('/mod/quiz/report.php', ['id' => $this->contextinstanceid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'delete attempt', 'report.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_preview_started.php b/mod/quiz/classes/event/attempt_preview_started.php index 5565dec8bb5..6f3d5b1930b 100644 --- a/mod/quiz/classes/event/attempt_preview_started.php +++ b/mod/quiz/classes/event/attempt_preview_started.php @@ -79,16 +79,6 @@ class attempt_preview_started extends \core\event\base { return new \moodle_url('/mod/quiz/view.php', ['id' => $this->contextinstanceid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'preview', 'view.php?id=' . $this->contextinstanceid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_reviewed.php b/mod/quiz/classes/event/attempt_reviewed.php index 3bca6d11f83..99833c98197 100644 --- a/mod/quiz/classes/event/attempt_reviewed.php +++ b/mod/quiz/classes/event/attempt_reviewed.php @@ -78,16 +78,6 @@ class attempt_reviewed extends \core\event\base { return new \moodle_url('/mod/quiz/review.php', ['attempt' => $this->objectid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'review', 'review.php?attempt=' . $this->objectid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_started.php b/mod/quiz/classes/event/attempt_started.php index 681c4bb6c90..20dc3a51e09 100644 --- a/mod/quiz/classes/event/attempt_started.php +++ b/mod/quiz/classes/event/attempt_started.php @@ -68,15 +68,6 @@ class attempt_started extends \core\event\base { return get_string('eventquizattemptstarted', 'mod_quiz'); } - /** - * Does this event replace a legacy event? - * - * @return string legacy event name - */ - static public function get_legacy_eventname() { - return 'quiz_attempt_started'; - } - /** * Returns relevant URL. * @@ -86,39 +77,6 @@ class attempt_started extends \core\event\base { return new \moodle_url('/mod/quiz/review.php', ['attempt' => $this->objectid]); } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $attempt = $this->get_record_snapshot('quiz_attempts', $this->objectid); - - $legacyeventdata = new \stdClass(); - $legacyeventdata->component = 'mod_quiz'; - $legacyeventdata->attemptid = $attempt->id; - $legacyeventdata->timestart = $attempt->timestart; - $legacyeventdata->timestamp = $attempt->timestart; - $legacyeventdata->userid = $this->relateduserid; - $legacyeventdata->quizid = $attempt->quiz; - $legacyeventdata->cmid = $this->contextinstanceid; - $legacyeventdata->courseid = $this->courseid; - - return $legacyeventdata; - } - - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $attempt = $this->get_record_snapshot('quiz_attempts', $this->objectid); - - return [$this->courseid, 'quiz', 'attempt', 'review.php?attempt=' . $this->objectid, - $attempt->quiz, $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_submitted.php b/mod/quiz/classes/event/attempt_submitted.php index 3c186ca125b..9c7cce554cd 100644 --- a/mod/quiz/classes/event/attempt_submitted.php +++ b/mod/quiz/classes/event/attempt_submitted.php @@ -70,15 +70,6 @@ class attempt_submitted extends \core\event\base { return get_string('eventquizattemptsubmitted', 'mod_quiz'); } - /** - * Does this event replace a legacy event? - * - * @return string legacy event name - */ - static public function get_legacy_eventname() { - return 'quiz_attempt_submitted'; - } - /** * Returns relevant URL. * @@ -88,28 +79,6 @@ class attempt_submitted extends \core\event\base { return new \moodle_url('/mod/quiz/review.php', ['attempt' => $this->objectid]); } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $attempt = $this->get_record_snapshot('quiz_attempts', $this->objectid); - - $legacyeventdata = new \stdClass(); - $legacyeventdata->component = 'mod_quiz'; - $legacyeventdata->attemptid = $this->objectid; - $legacyeventdata->timestamp = $attempt->timefinish; - $legacyeventdata->userid = $this->relateduserid; - $legacyeventdata->quizid = $attempt->quiz; - $legacyeventdata->cmid = $this->contextinstanceid; - $legacyeventdata->courseid = $this->courseid; - $legacyeventdata->submitterid = $this->other['submitterid']; - $legacyeventdata->timefinish = $attempt->timefinish; - - return $legacyeventdata; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_summary_viewed.php b/mod/quiz/classes/event/attempt_summary_viewed.php index b08e2e14a37..31b4d8566c7 100644 --- a/mod/quiz/classes/event/attempt_summary_viewed.php +++ b/mod/quiz/classes/event/attempt_summary_viewed.php @@ -81,16 +81,6 @@ class attempt_summary_viewed extends \core\event\base { return new \moodle_url('/mod/quiz/summary.php', ['attempt' => $this->objectid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'view summary', 'summary.php?attempt=' . $this->objectid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/attempt_viewed.php b/mod/quiz/classes/event/attempt_viewed.php index 05c34b7d1e7..60b64f6b407 100644 --- a/mod/quiz/classes/event/attempt_viewed.php +++ b/mod/quiz/classes/event/attempt_viewed.php @@ -85,16 +85,6 @@ class attempt_viewed extends \core\event\base { ]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'continue attempt', 'review.php?attempt=' . $this->objectid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/edit_page_viewed.php b/mod/quiz/classes/event/edit_page_viewed.php index 2d102b4e5d1..1a2dd294f5c 100644 --- a/mod/quiz/classes/event/edit_page_viewed.php +++ b/mod/quiz/classes/event/edit_page_viewed.php @@ -78,16 +78,6 @@ class edit_page_viewed extends \core\event\base { return new \moodle_url('/mod/quiz/edit.php', ['cmid' => $this->contextinstanceid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'editquestions', 'view.php?id=' . $this->contextinstanceid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/group_override_deleted.php b/mod/quiz/classes/event/group_override_deleted.php index 9ae146d8877..584c703859f 100644 --- a/mod/quiz/classes/event/group_override_deleted.php +++ b/mod/quiz/classes/event/group_override_deleted.php @@ -79,16 +79,6 @@ class group_override_deleted extends \core\event\base { return new \moodle_url('/mod/quiz/overrides.php', ['cmid' => $this->contextinstanceid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'delete override', 'overrides.php?cmid=' . $this->contextinstanceid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/group_override_updated.php b/mod/quiz/classes/event/group_override_updated.php index d60fc19f327..439830ab941 100644 --- a/mod/quiz/classes/event/group_override_updated.php +++ b/mod/quiz/classes/event/group_override_updated.php @@ -79,16 +79,6 @@ class group_override_updated extends \core\event\base { return new \moodle_url('/mod/quiz/overrideedit.php', ['id' => $this->objectid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'edit override', 'overrideedit.php?id=' . $this->objectid, $this->other['quizid'], - $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/question_manually_graded.php b/mod/quiz/classes/event/question_manually_graded.php index f769181da1e..7f0b668f9f5 100644 --- a/mod/quiz/classes/event/question_manually_graded.php +++ b/mod/quiz/classes/event/question_manually_graded.php @@ -81,16 +81,6 @@ class question_manually_graded extends \core\event\base { 'slot' => $this->other['slot']]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'manualgrade', 'comment.php?attempt=' . $this->other['attemptid'] . - '&slot=' . $this->other['slot'], $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/report_viewed.php b/mod/quiz/classes/event/report_viewed.php index f8c32e03dc0..6523c123ba1 100644 --- a/mod/quiz/classes/event/report_viewed.php +++ b/mod/quiz/classes/event/report_viewed.php @@ -82,16 +82,6 @@ class report_viewed extends \core\event\base { 'mode' => $this->other['reportname']]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'report', 'report.php?id=' . $this->contextinstanceid . '&mode=' . - $this->other['reportname'], $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/user_override_deleted.php b/mod/quiz/classes/event/user_override_deleted.php index c6bed782fa1..0ccbd09a894 100644 --- a/mod/quiz/classes/event/user_override_deleted.php +++ b/mod/quiz/classes/event/user_override_deleted.php @@ -78,16 +78,6 @@ class user_override_deleted extends \core\event\base { return new \moodle_url('/mod/quiz/overrides.php', ['cmid' => $this->contextinstanceid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'delete override', 'overrides.php?cmid=' . $this->contextinstanceid, - $this->other['quizid'], $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/classes/event/user_override_updated.php b/mod/quiz/classes/event/user_override_updated.php index d801d2bfab5..465302456bb 100644 --- a/mod/quiz/classes/event/user_override_updated.php +++ b/mod/quiz/classes/event/user_override_updated.php @@ -79,16 +79,6 @@ class user_override_updated extends \core\event\base { return new \moodle_url('/mod/quiz/overrideedit.php', ['id' => $this->objectid]); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return [$this->courseid, 'quiz', 'edit override', 'overrideedit.php?id=' . $this->objectid, $this->other['quizid'], - $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/quiz/tests/event/events_test.php b/mod/quiz/tests/event/events_test.php index ae5dab4d5f7..983f6af3361 100644 --- a/mod/quiz/tests/event/events_test.php +++ b/mod/quiz/tests/event/events_test.php @@ -129,19 +129,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($quizobj->get_context(), $event->get_context()); $this->assertEquals($attempt->userid, $event->relateduserid); $this->assertEquals(null, $event->other['submitterid']); // Should be the user, but PHP Unit complains... - $this->assertEquals('quiz_attempt_submitted', $event->get_legacy_eventname()); - $legacydata = new \stdClass(); - $legacydata->component = 'mod_quiz'; - $legacydata->attemptid = (string) $attempt->id; - $legacydata->timestamp = $timefinish; - $legacydata->userid = $attempt->userid; - $legacydata->cmid = $quizobj->get_cmid(); - $legacydata->courseid = $quizobj->get_courseid(); - $legacydata->quizid = $quizobj->get_quizid(); - // Submitterid should be the user, but as we are in PHP Unit, CLI_SCRIPT is set to true which sets null in submitterid. - $legacydata->submitterid = null; - $legacydata->timefinish = $timefinish; - $this->assertEventLegacyData($legacydata, $event); $this->assertEventContextNotUsed($event); } @@ -166,17 +153,6 @@ class events_test extends \advanced_testcase { $this->assertNotEmpty($event->get_description()); // Submitterid should be the user, but as we are in PHP Unit, CLI_SCRIPT is set to true which sets null in submitterid. $this->assertEquals(null, $event->other['submitterid']); - $this->assertEquals('quiz_attempt_overdue', $event->get_legacy_eventname()); - $legacydata = new \stdClass(); - $legacydata->component = 'mod_quiz'; - $legacydata->attemptid = (string) $attempt->id; - $legacydata->timestamp = $timefinish; - $legacydata->userid = $attempt->userid; - $legacydata->cmid = $quizobj->get_cmid(); - $legacydata->courseid = $quizobj->get_courseid(); - $legacydata->quizid = $quizobj->get_quizid(); - $legacydata->submitterid = null; // Should be the user, but PHP Unit complains... - $this->assertEventLegacyData($legacydata, $event); $this->assertEventContextNotUsed($event); } @@ -200,17 +176,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($attempt->userid, $event->relateduserid); // Submitterid should be the user, but as we are in PHP Unit, CLI_SCRIPT is set to true which sets null in submitterid. $this->assertEquals(null, $event->other['submitterid']); - $this->assertEquals('quiz_attempt_abandoned', $event->get_legacy_eventname()); - $legacydata = new \stdClass(); - $legacydata->component = 'mod_quiz'; - $legacydata->attemptid = (string) $attempt->id; - $legacydata->timestamp = $timefinish; - $legacydata->userid = $attempt->userid; - $legacydata->cmid = $quizobj->get_cmid(); - $legacydata->courseid = $quizobj->get_courseid(); - $legacydata->quizid = $quizobj->get_quizid(); - $legacydata->submitterid = null; // Should be the user, but PHP Unit complains... - $this->assertEventLegacyData($legacydata, $event); $this->assertEventContextNotUsed($event); } @@ -236,24 +201,7 @@ class events_test extends \advanced_testcase { $this->assertEquals($attempt->id, $event->objectid); $this->assertEquals($attempt->userid, $event->relateduserid); $this->assertEquals($quizobj->get_context(), $event->get_context()); - $this->assertEquals('quiz_attempt_started', $event->get_legacy_eventname()); $this->assertEquals(\context_module::instance($quizobj->get_cmid()), $event->get_context()); - // Check legacy log data. - $expected = [$quizobj->get_courseid(), 'quiz', 'attempt', 'review.php?attempt=' . $attempt->id, - $quizobj->get_quizid(), $quizobj->get_cmid()]; - $this->assertEventLegacyLogData($expected, $event); - // Check legacy event data. - $legacydata = new \stdClass(); - $legacydata->component = 'mod_quiz'; - $legacydata->attemptid = $attempt->id; - $legacydata->timestart = $attempt->timestart; - $legacydata->timestamp = $attempt->timestart; - $legacydata->userid = $attempt->userid; - $legacydata->quizid = $quizobj->get_quizid(); - $legacydata->cmid = $quizobj->get_cmid(); - $legacydata->courseid = $quizobj->get_courseid(); - $this->assertEventLegacyData($legacydata, $event); - $this->assertEventContextNotUsed($event); } /** @@ -389,8 +337,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\edit_page_viewed', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'editquestions', 'view.php?id=' . $quiz->cmid, $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -409,9 +355,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\attempt_deleted', $event); $this->assertEquals(\context_module::instance($quizobj->get_cmid()), $event->get_context()); - $expected = [$quizobj->get_courseid(), 'quiz', 'delete attempt', 'report.php?id=' . $quizobj->get_cmid(), - $attempt->id, $quizobj->get_cmid()]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -461,9 +404,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\report_viewed', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'report', 'report.php?id=' . $quiz->cmid . '&mode=overview', - $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -500,8 +440,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\attempt_reviewed', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'review', 'review.php?attempt=1', $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -538,8 +476,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\attempt_summary_viewed', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'view summary', 'summary.php?attempt=1', $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -645,8 +581,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\user_override_updated', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'edit override', 'overrideedit.php?id=1', $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -682,8 +616,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\group_override_updated', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'edit override', 'overrideedit.php?id=1', $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -714,8 +646,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\user_override_deleted', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'delete override', 'overrides.php?cmid=' . $quiz->cmid, $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -746,8 +676,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\group_override_deleted', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'delete override', 'overrides.php?cmid=' . $quiz->cmid, $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -785,8 +713,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\attempt_viewed', $event); $this->assertEquals(\context_module::instance($quiz->cmid), $event->get_context()); - $expected = [$course->id, 'quiz', 'continue attempt', 'review.php?attempt=1', $quiz->id, $quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -812,9 +738,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\attempt_preview_started', $event); $this->assertEquals(\context_module::instance($quizobj->get_cmid()), $event->get_context()); - $expected = [$quizobj->get_courseid(), 'quiz', 'preview', 'view.php?id=' . $quizobj->get_cmid(), - $quizobj->get_quizid(), $quizobj->get_cmid()]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -848,9 +771,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\mod_quiz\event\question_manually_graded', $event); $this->assertEquals(\context_module::instance($quizobj->get_cmid()), $event->get_context()); - $expected = [$quizobj->get_courseid(), 'quiz', 'manualgrade', 'comment.php?attempt=2&slot=3', - $quizobj->get_quizid(), $quizobj->get_cmid()]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/mod/resource/tests/event/events_test.php b/mod/resource/tests/event/events_test.php index 8ddb9acbf00..a60e695c6a0 100644 --- a/mod/resource/tests/event/events_test.php +++ b/mod/resource/tests/event/events_test.php @@ -66,8 +66,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_resource\event\course_module_instance_list_viewed', $event); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'resource', 'view all', 'index.php?id='.$course->id, ''); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -98,8 +96,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_resource\event\course_module_viewed', $event); $this->assertEquals(\context_module::instance($resource->cmid), $event->get_context()); $this->assertEquals($resource->id, $event->objectid); - $expected = array($course->id, 'resource', 'view', 'view.php?id=' . $resource->cmid, $resource->id, $resource->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/mod/survey/classes/event/course_module_viewed.php b/mod/survey/classes/event/course_module_viewed.php index 6fcb582e3df..e51c902d31b 100644 --- a/mod/survey/classes/event/course_module_viewed.php +++ b/mod/survey/classes/event/course_module_viewed.php @@ -51,16 +51,6 @@ class course_module_viewed extends \core\event\course_module_viewed { $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, $this->objecttable, 'view '. $this->other['viewed'], 'view.php?id=' . - $this->contextinstanceid, $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/survey/classes/event/report_downloaded.php b/mod/survey/classes/event/report_downloaded.php index 62f9f92e3b2..80af6347e2a 100644 --- a/mod/survey/classes/event/report_downloaded.php +++ b/mod/survey/classes/event/report_downloaded.php @@ -83,15 +83,6 @@ class report_downloaded extends \core\event\base { return new \moodle_url("/mod/survey/download.php", $params); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "survey", "download", $this->get_url(), $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/survey/classes/event/report_viewed.php b/mod/survey/classes/event/report_viewed.php index a9a44b4b036..605836e5ae3 100644 --- a/mod/survey/classes/event/report_viewed.php +++ b/mod/survey/classes/event/report_viewed.php @@ -84,16 +84,6 @@ class report_viewed extends \core\event\base { return new \moodle_url("/mod/survey/report.php", $params); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "survey", "view report", "report.php?id=" . $this->contextinstanceid, $this->objectid, - $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'survey', 'restore' => 'survey'); } diff --git a/mod/survey/classes/event/response_submitted.php b/mod/survey/classes/event/response_submitted.php index 9d748f422dc..d2638ff68f0 100644 --- a/mod/survey/classes/event/response_submitted.php +++ b/mod/survey/classes/event/response_submitted.php @@ -77,16 +77,6 @@ class response_submitted extends \core\event\base { return new \moodle_url("/mod/survey/view.php", array('id' => $this->contextinstanceid)); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "survey", "submit", "view.php?id=" . $this->contextinstanceid, $this->other['surveyid'], - $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/survey/tests/event/events_test.php b/mod/survey/tests/event/events_test.php index 74e169892d6..cf5bd501c80 100644 --- a/mod/survey/tests/event/events_test.php +++ b/mod/survey/tests/event/events_test.php @@ -69,9 +69,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_survey\event\report_downloaded', $event); $this->assertEquals(\context_module::instance($survey->cmid), $event->get_context()); $this->assertEquals($survey->id, $event->objectid); - $url = new \moodle_url('/mod/survey/download.php', array('id' => $survey->cmid, 'type' => 'xls')); - $expected = array($course->id, "survey", "download", $url->out(), $survey->id, $survey->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -103,9 +100,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_survey\event\report_viewed', $event); $this->assertEquals(\context_module::instance($survey->cmid), $event->get_context()); $this->assertEquals($survey->id, $event->objectid); - $expected = array($course->id, "survey", "view report", 'report.php?id=' . $survey->cmid, $survey->id, $survey->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -136,8 +130,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_survey\event\response_submitted', $event); $this->assertEquals(\context_module::instance($survey->cmid), $event->get_context()); $this->assertEquals($survey->id, $event->other['surveyid']); - $expected = array($course->id, "survey", "submit", 'view.php?id=' . $survey->cmid, $survey->id, $survey->cmid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/mod/wiki/classes/event/comments_viewed.php b/mod/wiki/classes/event/comments_viewed.php index 9d18302bd3c..59c75f5ceaa 100644 --- a/mod/wiki/classes/event/comments_viewed.php +++ b/mod/wiki/classes/event/comments_viewed.php @@ -55,16 +55,6 @@ class comments_viewed extends \core\event\comments_viewed { "with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'comments', - 'comments.php?pageid=' . $this->objectid, $this->objectid, $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_created.php b/mod/wiki/classes/event/page_created.php index 9b97a94e750..4482ffec109 100644 --- a/mod/wiki/classes/event/page_created.php +++ b/mod/wiki/classes/event/page_created.php @@ -64,16 +64,6 @@ class page_created extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'add page', - 'view.php?pageid=' . $this->objectid, $this->objectid, $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_deleted.php b/mod/wiki/classes/event/page_deleted.php index 52eed433370..4067d4c3dc2 100644 --- a/mod/wiki/classes/event/page_deleted.php +++ b/mod/wiki/classes/event/page_deleted.php @@ -70,16 +70,6 @@ class page_deleted extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'admin', 'admin.php?pageid=' . $this->objectid, $this->objectid, - $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_diff_viewed.php b/mod/wiki/classes/event/page_diff_viewed.php index 8d43c1352b0..e0348a5b044 100644 --- a/mod/wiki/classes/event/page_diff_viewed.php +++ b/mod/wiki/classes/event/page_diff_viewed.php @@ -71,17 +71,6 @@ class page_diff_viewed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'diff', 'diff.php?pageid=' . $this->objectid . '&comparewith=' . - $this->other['comparewith'] . '&compare=' . $this->other['compare'], $this->objectid, - $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_history_viewed.php b/mod/wiki/classes/event/page_history_viewed.php index 52af74d77e5..1d22570f5a1 100644 --- a/mod/wiki/classes/event/page_history_viewed.php +++ b/mod/wiki/classes/event/page_history_viewed.php @@ -64,16 +64,6 @@ class page_history_viewed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'history', - 'history.php?pageid=' . $this->objectid, $this->objectid, $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_locks_deleted.php b/mod/wiki/classes/event/page_locks_deleted.php index cf81976b27d..e7f20e88784 100644 --- a/mod/wiki/classes/event/page_locks_deleted.php +++ b/mod/wiki/classes/event/page_locks_deleted.php @@ -70,16 +70,6 @@ class page_locks_deleted extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'overridelocks', 'view.php?pageid=' . $this->objectid, $this->objectid, - $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_map_viewed.php b/mod/wiki/classes/event/page_map_viewed.php index a668badefb9..cd3080230b7 100644 --- a/mod/wiki/classes/event/page_map_viewed.php +++ b/mod/wiki/classes/event/page_map_viewed.php @@ -70,16 +70,6 @@ class page_map_viewed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'map', - 'map.php?pageid=' . $this->objectid, $this->objectid, $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_updated.php b/mod/wiki/classes/event/page_updated.php index 7075535c21f..c49c46d451d 100644 --- a/mod/wiki/classes/event/page_updated.php +++ b/mod/wiki/classes/event/page_updated.php @@ -70,16 +70,6 @@ class page_updated extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'edit', 'view.php?pageid=' . $this->objectid, $this->objectid, - $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_version_deleted.php b/mod/wiki/classes/event/page_version_deleted.php index ef0f7bfbd6f..67c14d4d480 100644 --- a/mod/wiki/classes/event/page_version_deleted.php +++ b/mod/wiki/classes/event/page_version_deleted.php @@ -70,16 +70,6 @@ class page_version_deleted extends \core\event\base { "for the wiki with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'admin', 'admin.php?pageid=' . $this->other['pageid'], $this->other['pageid'], - $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_version_restored.php b/mod/wiki/classes/event/page_version_restored.php index 3a10c0f8978..c70230b6fdd 100644 --- a/mod/wiki/classes/event/page_version_restored.php +++ b/mod/wiki/classes/event/page_version_restored.php @@ -70,16 +70,6 @@ class page_version_restored extends \core\event\base { "for the wiki with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'restore', - 'view.php?pageid=' . $this->other['pageid'], $this->other['pageid'], $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_version_viewed.php b/mod/wiki/classes/event/page_version_viewed.php index aed8a7c84f7..0040bf37e25 100644 --- a/mod/wiki/classes/event/page_version_viewed.php +++ b/mod/wiki/classes/event/page_version_viewed.php @@ -70,17 +70,6 @@ class page_version_viewed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return(array($this->courseid, 'wiki', 'history', - 'viewversion.php?pageid=' . $this->objectid . '&versionid=' . $this->other['versionid'], - $this->objectid, $this->contextinstanceid)); - } - /** * Get URL related to the action. * diff --git a/mod/wiki/classes/event/page_viewed.php b/mod/wiki/classes/event/page_viewed.php index 357663281c8..26f3d63d870 100644 --- a/mod/wiki/classes/event/page_viewed.php +++ b/mod/wiki/classes/event/page_viewed.php @@ -73,25 +73,6 @@ class page_viewed extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - if (!empty($this->other['wid'])) { - return(array($this->courseid, 'wiki', 'view', - 'view.php?wid=' . $this->data['other']['wid'] . '&title=' . $this->data['other']['title'], - $this->data['other']['wid'], $this->contextinstanceid)); - } else if (!empty($this->other['prettyview'])) { - return(array($this->courseid, 'wiki', 'view', - 'prettyview.php?pageid=' . $this->objectid, $this->objectid, $this->contextinstanceid)); - } else { - return(array($this->courseid, 'wiki', 'view', - 'view.php?pageid=' . $this->objectid, $this->objectid, $this->contextinstanceid)); - } - } - /** * Get URL related to the action. * diff --git a/mod/wiki/tests/event/events_test.php b/mod/wiki/tests/event/events_test.php index 1d9fd3a6ec1..e1363b6722d 100644 --- a/mod/wiki/tests/event/events_test.php +++ b/mod/wiki/tests/event/events_test.php @@ -144,9 +144,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_wiki\event\comments_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($this->course->id, 'wiki', 'comments', 'comments.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -172,9 +169,6 @@ class events_test extends \advanced_testcase { // Checking that the event contains the expected values. $this->assertInstanceOf('\mod_wiki\event\course_module_instance_list_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($this->course->id, 'wiki', 'view all', 'index.php?id=' . $this->course->id, ''); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -204,10 +198,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\course_module_viewed', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($this->wiki->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'view', 'view.php?id=' . $this->wiki->cmid, - $this->wiki->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -239,9 +229,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_viewed', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'view', 'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -274,9 +261,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_viewed', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'view', 'prettyview.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -300,10 +284,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_created', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'add page', - 'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -331,24 +311,18 @@ class events_test extends \advanced_testcase { $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->other['pageid']); $this->assertEquals($oldversion->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'admin', 'admin.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); // Checking that the event contains the page_deleted event. $event = array_pop($events); $this->assertInstanceOf('\mod_wiki\event\page_deleted', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'admin', 'admin.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); // Checking that the event contains the expected values. $event = array_pop($events); $this->assertInstanceOf('\mod_wiki\event\page_locks_deleted', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'overridelocks', 'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); // Delete all pages. $page1 = $this->wikigenerator->create_first_page($this->wiki); @@ -366,9 +340,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_deleted', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page2->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'admin', 'admin.php?pageid=' . $page2->id, $page2->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -393,10 +364,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_updated', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'edit', - 'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -432,10 +399,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_diff_viewed', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'diff', 'diff.php?pageid=' . $page->id . '&comparewith=' . - 1 . '&compare=' . 2, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -467,9 +430,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_wiki\event\page_history_viewed', $event); $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); - $expected = array($this->course->id, 'wiki', 'history', 'history.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -505,9 +465,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); $this->assertEquals(0, $event->other['option']); - $expected = array($this->course->id, 'wiki', 'map', 'map.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -543,10 +500,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($context, $event->get_context()); $this->assertEquals($page->id, $event->objectid); $this->assertEquals(1, $event->other['versionid']); - $expected = array($this->course->id, 'wiki', 'history', 'viewversion.php?pageid=' . $page->id . '&versionid=1', - $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } /** @@ -571,8 +524,5 @@ class events_test extends \advanced_testcase { $this->assertEquals($context, $event->get_context()); $this->assertEquals($version->id, $event->objectid); $this->assertEquals($page->id, $event->other['pageid']); - $expected = array($this->course->id, 'wiki', 'restore', 'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); } } diff --git a/notes/tests/event/events_test.php b/notes/tests/event/events_test.php index a0425b6cb68..c449a3630bb 100644 --- a/notes/tests/event/events_test.php +++ b/notes/tests/event/events_test.php @@ -81,8 +81,6 @@ class events_test extends \advanced_testcase { $logurl = new \moodle_url('index.php', array('course' => $this->eventnote->courseid, 'user' => $this->eventnote->userid)); $logurl->set_anchor('note-' . $this->eventnote->id); - $arr = array($this->eventnote->courseid, 'notes', 'delete', $logurl, 'delete note'); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } @@ -107,13 +105,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($note->userid, $event->relateduserid); $this->assertEquals('post', $event->objecttable); $this->assertEquals(NOTES_STATE_SITE, $event->other['publishstate']); - - // Test legacy data. - $logurl = new \moodle_url('index.php', - array('course' => $note->courseid, 'user' => $note->userid)); - $logurl->set_anchor('note-' . $note->id); - $arr = array($note->courseid, 'notes', 'add', $logurl, 'add note'); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } @@ -138,13 +129,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($note->userid, $event->relateduserid); $this->assertEquals('post', $event->objecttable); $this->assertEquals(NOTES_STATE_DRAFT, $event->other['publishstate']); - - // Test legacy data. - $logurl = new \moodle_url('index.php', - array('course' => $note->courseid, 'user' => $note->userid)); - $logurl->set_anchor('note-' . $note->id); - $arr = array($note->courseid, 'notes', 'update', $logurl, 'update note'); - $this->assertEventLegacyLogData($arr, $event); $this->assertEventContextNotUsed($event); } @@ -170,9 +154,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\core\event\notes_viewed', $event); $this->assertEquals($coursecontext, $event->get_context()); - $expected = array($this->eventnote->courseid, 'notes', 'view', 'index.php?course=' . - $this->eventnote->courseid.'&user=' . $this->eventnote->userid, 'view notes'); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/question/bank/managecategories/tests/question_category_object_test.php b/question/bank/managecategories/tests/question_category_object_test.php index 8b6efbaacd7..398a769cd3a 100644 --- a/question/bank/managecategories/tests/question_category_object_test.php +++ b/question/bank/managecategories/tests/question_category_object_test.php @@ -261,8 +261,6 @@ class question_category_object_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\question_category_created', $event); $this->assertEquals(context_module::instance($this->quiz->cmid), $event->get_context()); - $expected = [$this->course->id, 'quiz', 'addcategory', 'view.php?id=' . $this->quiz->cmid , $categoryid, $this->quiz->cmid]; - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } diff --git a/report/completion/classes/event/user_report_viewed.php b/report/completion/classes/event/user_report_viewed.php index f8193a85096..461c08a1334 100644 --- a/report/completion/classes/event/user_report_viewed.php +++ b/report/completion/classes/event/user_report_viewed.php @@ -64,16 +64,6 @@ class user_report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the user completion report for the user with id '$this->relateduserid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $url = 'report/completion/user.php?id=' . $this->relateduserid . '&course=' . $this->courseid; - return array($this->courseid, 'course', 'report completion', $url, $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/completion/tests/event/events_test.php b/report/completion/tests/event/events_test.php index 2ed2d966c94..c3b58673e61 100644 --- a/report/completion/tests/event/events_test.php +++ b/report/completion/tests/event/events_test.php @@ -91,9 +91,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(3, $event->relateduserid); $this->assertEquals(new \moodle_url('/report/completion/user.php', array('id' => 3, 'course' => $course->id)), $event->get_url()); - $expected = array($course->id, 'course', 'report completion', "report/completion/user.php?id=3&course=$course->id", - $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/report/eventlist/classes/list_generator.php b/report/eventlist/classes/list_generator.php index 0929f54449d..e9dbd034937 100644 --- a/report/eventlist/classes/list_generator.php +++ b/report/eventlist/classes/list_generator.php @@ -302,7 +302,6 @@ class report_eventlist_list_generator { $eventdata[$eventfullpath]['crud'] = self::get_crud_string($eventdata[$eventfullpath]['crud']); $eventdata[$eventfullpath]['edulevel'] = self::get_edulevel_string($eventdata[$eventfullpath]['edulevel']); - $eventdata[$eventfullpath]['legacyevent'] = $eventfullpath::get_legacy_eventname(); // Mess around getting since information. $ref = new \ReflectionClass($eventdata[$eventfullpath]['eventname']); diff --git a/report/eventlist/eventdetail.php b/report/eventlist/eventdetail.php index 9f1566740e3..f560e246671 100644 --- a/report/eventlist/eventdetail.php +++ b/report/eventlist/eventdetail.php @@ -61,7 +61,6 @@ $eventinformation['explanation'] = $eventname::get_explanation($eventname); // Get event information nicely if we can. if (!$ref->isAbstract()) { $eventinformation = array_merge($eventinformation, $eventname::get_static_info()); - $eventinformation['legacyevent'] = $eventname::get_legacy_eventname(); $eventinformation['crud'] = report_eventlist_list_generator::get_crud_string($eventinformation['crud']); $eventinformation['edulevel'] = report_eventlist_list_generator::get_edulevel_string($eventinformation['edulevel']); } else { diff --git a/report/log/classes/event/report_viewed.php b/report/log/classes/event/report_viewed.php index eaf24ab0654..a3d83b1fe54 100644 --- a/report/log/classes/event/report_viewed.php +++ b/report/log/classes/event/report_viewed.php @@ -73,15 +73,6 @@ class report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the log report for the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "course", "report log", "report/log/index.php?id=$this->courseid", $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/log/classes/event/user_report_viewed.php b/report/log/classes/event/user_report_viewed.php index 46672d00d54..4c22e633b5d 100644 --- a/report/log/classes/event/user_report_viewed.php +++ b/report/log/classes/event/user_report_viewed.php @@ -69,16 +69,6 @@ class user_report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the user log report for the user with id '$this->relateduserid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $url = 'report/log/user.php?id=' . $this->relateduserid . '&course=' . $this->courseid . '&mode=' . $this->other['mode']; - return array($this->courseid, 'course', 'report log', $url, $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/log/tests/event/events_test.php b/report/log/tests/event/events_test.php index 848d5628841..c5ff682ba7d 100644 --- a/report/log/tests/event/events_test.php +++ b/report/log/tests/event/events_test.php @@ -66,8 +66,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\report_log\event\report_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, "course", "report log", "report/log/index.php?id=$course->id", $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/report/log/index.php', array('id' => $event->courseid)); $this->assertEquals($url, $event->get_url()); @@ -96,9 +94,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\report_log\event\user_report_viewed', $event); $this->assertEquals($context, $event->get_context()); - $url = 'report/log/user.php?id=' . $user->id . '&course=' . $course->id . '&mode=today'; - $expected = array($course->id, "course", "report log", $url, $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/report/log/user.php', array('course' => $course->id, 'id' => $user->id, 'mode' => 'today')); $this->assertEquals($url, $event->get_url()); diff --git a/report/loglive/classes/event/report_viewed.php b/report/loglive/classes/event/report_viewed.php index f37ae0301e9..570bb2edd5d 100644 --- a/report/loglive/classes/event/report_viewed.php +++ b/report/loglive/classes/event/report_viewed.php @@ -63,15 +63,6 @@ class report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the live log report for the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'report live', "report/loglive/index.php?id=$this->courseid", $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/loglive/tests/event/events_test.php b/report/loglive/tests/event/events_test.php index 3ad88a512c7..cb57595a785 100644 --- a/report/loglive/tests/event/events_test.php +++ b/report/loglive/tests/event/events_test.php @@ -63,8 +63,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\report_loglive\event\report_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, 'course', 'report live', "report/loglive/index.php?id=$course->id", $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/report/loglive/index.php', array('id' => $course->id)); $this->assertEquals($url, $event->get_url()); diff --git a/report/outline/classes/event/activity_report_viewed.php b/report/outline/classes/event/activity_report_viewed.php index 09df8365a53..252df476e14 100644 --- a/report/outline/classes/event/activity_report_viewed.php +++ b/report/outline/classes/event/activity_report_viewed.php @@ -63,15 +63,6 @@ class activity_report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the outline activity report for the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'course', 'report outline', "report/outline/index.php?id=$this->courseid", $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/outline/classes/event/report_viewed.php b/report/outline/classes/event/report_viewed.php index 45277b9bea7..e2c36af999e 100644 --- a/report/outline/classes/event/report_viewed.php +++ b/report/outline/classes/event/report_viewed.php @@ -70,16 +70,6 @@ class report_viewed extends \core\event\base { "for the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $url = "report/outline/user.php?id=". $this->userid . "&course=" . $this->courseid . "&mode=" . $this->other['mode']; - return array($this->courseid, 'course', 'report outline', $url, $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/participation/classes/event/report_viewed.php b/report/participation/classes/event/report_viewed.php index 8a4d8aea4f1..49627c7e2c3 100644 --- a/report/participation/classes/event/report_viewed.php +++ b/report/participation/classes/event/report_viewed.php @@ -73,16 +73,6 @@ class report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the course participation report for the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "course", "report participation", "report/participation/index.php?id=" . $this->courseid, - $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/questioninstances/classes/event/report_viewed.php b/report/questioninstances/classes/event/report_viewed.php index 36e3f6520e2..bca71bd5a73 100644 --- a/report/questioninstances/classes/event/report_viewed.php +++ b/report/questioninstances/classes/event/report_viewed.php @@ -70,16 +70,6 @@ class report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the question instances report."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $requestedqtype = $this->other['requestedqtype']; - return array(SITEID, "admin", "report questioninstances", "report/questioninstances/index.php?qtype=$requestedqtype", $requestedqtype); - } - /** * Returns relevant URL. * diff --git a/report/questioninstances/tests/event/events_test.php b/report/questioninstances/tests/event/events_test.php index 278c222d912..9704ea31b30 100644 --- a/report/questioninstances/tests/event/events_test.php +++ b/report/questioninstances/tests/event/events_test.php @@ -56,8 +56,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\report_questioninstances\event\report_viewed', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, "admin", "report questioninstances", "report/questioninstances/index.php?qtype=$requestedqtype", $requestedqtype); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $url = new \moodle_url('/report/questioninstances/index.php', array('qtype' => $requestedqtype)); $this->assertEquals($url, $event->get_url()); diff --git a/report/stats/classes/event/report_viewed.php b/report/stats/classes/event/report_viewed.php index 35803d00dac..118dba47a10 100644 --- a/report/stats/classes/event/report_viewed.php +++ b/report/stats/classes/event/report_viewed.php @@ -71,15 +71,6 @@ class report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the statistics report for the course with id '$this->courseid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, "course", "report stats", "report/stats/index.php?course=$this->courseid", $this->courseid); - } - /** * Returns relevant URL. * diff --git a/report/stats/classes/event/user_report_viewed.php b/report/stats/classes/event/user_report_viewed.php index 3854175dfab..68107dfc31a 100644 --- a/report/stats/classes/event/user_report_viewed.php +++ b/report/stats/classes/event/user_report_viewed.php @@ -63,16 +63,6 @@ class user_report_viewed extends \core\event\base { return "The user with id '$this->userid' viewed the user statistics report for the user with id '$this->relateduserid'."; } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - $url = 'report/stats/user.php?id=' . $this->relateduserid . '&course=' . $this->courseid; - return (array($this->courseid, 'course', 'report stats', $url, $this->courseid)); - } - /** * Returns relevant URL. * diff --git a/report/stats/tests/event/events_test.php b/report/stats/tests/event/events_test.php index 25e7ce38b1a..c4034d31ffd 100644 --- a/report/stats/tests/event/events_test.php +++ b/report/stats/tests/event/events_test.php @@ -66,8 +66,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\report_stats\event\report_viewed', $event); $this->assertEquals($context, $event->get_context()); - $expected = array($course->id, "course", "report stats", "report/stats/index.php?course=$course->id", $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -93,9 +91,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\report_stats\event\user_report_viewed', $event); $this->assertEquals($context, $event->get_context()); - $url = $url = 'report/stats/user.php?id=' . $user->id . '&course=' . $course->id; - $expected = array($course->id, 'course', 'report stats', $url, $course->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } diff --git a/tag/classes/tag.php b/tag/classes/tag.php index fd5ff3a1aa6..0297522aa6d 100644 --- a/tag/classes/tag.php +++ b/tag/classes/tag.php @@ -1092,10 +1092,6 @@ class core_tag_tag { 'rawname' => $this->rawname ) )); - if (isset($data['rawname'])) { - $event->set_legacy_logdata(array($COURSE->id, 'tag', 'update', 'index.php?id='. $this->id, - $originalname . '->'. $this->name)); - } $event->trigger(); return true; } diff --git a/tag/tests/event/events_test.php b/tag/tests/event/events_test.php index 64213de687c..8cac237e2df 100644 --- a/tag/tests/event/events_test.php +++ b/tag/tests/event/events_test.php @@ -69,8 +69,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\tag_updated', $event); $this->assertEquals($systemcontext, $event->get_context()); - $expected = array(SITEID, 'tag', 'update', 'index.php?id=' . $tag->id, $oldname . '->'. $tag->name); - $this->assertEventLegacyLogData($expected, $event); // Trigger and capture the event when setting the type of a tag. $sink = $this->redirectEvents(); @@ -81,8 +79,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\tag_updated', $event); $this->assertEquals($systemcontext, $event->get_context()); - $expected = array(0, 'tag', 'update', 'index.php?id=' . $tag->id, $tag->name); - $this->assertEventLegacyLogData($expected, $event); // Trigger and capture the event for setting the description of a tag. $sink = $this->redirectEvents(); @@ -94,8 +90,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\tag_updated', $event); $this->assertEquals($systemcontext, $event->get_context()); - $expected = array(0, 'tag', 'update', 'index.php?id=' . $tag->id, $tag->name); - $this->assertEventLegacyLogData($expected, $event); } /** @@ -117,8 +111,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(1, $DB->count_records('tag_instance', array('component' => 'core'))); $this->assertInstanceOf('\core\event\tag_added', $event); $this->assertEquals(\context_course::instance($course->id), $event->get_context()); - $expected = array($course->id, 'coursetags', 'add', 'tag/search.php?query=A+tag', 'Course tagged'); - $this->assertEventLegacyLogData($expected, $event); // Create a question to tag. $questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question'); @@ -137,8 +129,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(1, $DB->count_records('tag_instance', array('component' => 'core'))); $this->assertInstanceOf('\core\event\tag_added', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = null; - $this->assertEventLegacyLogData($expected, $event); } /** @@ -284,8 +274,6 @@ class events_test extends \advanced_testcase { // Check that the event data is valid. $this->assertInstanceOf('\core\event\tag_flagged', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'tag', 'flag', 'index.php?id=' . $tag->id, $tag->id, '', '2'); - $this->assertEventLegacyLogData($expected, $event); // Unset the flag for both (though by default tag2 should have been created with 0 already). foreach ($tags as $t) { @@ -309,14 +297,10 @@ class events_test extends \advanced_testcase { $event = $events[0]; $this->assertInstanceOf('\core\event\tag_flagged', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'tag', 'flag', 'index.php?id=' . $tag->id, $tag->id, '', '2'); - $this->assertEventLegacyLogData($expected, $event); $event = $events[1]; $this->assertInstanceOf('\core\event\tag_flagged', $event); $this->assertEquals(\context_system::instance(), $event->get_context()); - $expected = array(SITEID, 'tag', 'flag', 'index.php?id=' . $tag2->id, $tag2->id, '', '2'); - $this->assertEventLegacyLogData($expected, $event); } /** diff --git a/user/tests/userlib_test.php b/user/tests/userlib_test.php index 35b05d00227..901f940acf9 100644 --- a/user/tests/userlib_test.php +++ b/user/tests/userlib_test.php @@ -201,11 +201,7 @@ class userlib_test extends \advanced_testcase { // Test event. $this->assertInstanceOf('\core\event\user_updated', $event); $this->assertSame($user->id, $event->objectid); - $this->assertSame('user_updated', $event->get_legacy_eventname()); - $this->assertEventLegacyData($dbuser, $event); $this->assertEquals(\context_user::instance($user->id), $event->get_context()); - $expectedlogdata = array(SITEID, 'user', 'update', 'view.php?id='.$user->id, ''); - $this->assertEventLegacyLogData($expectedlogdata, $event); // Update user with no password update. $password = $user->password = hash_internal_user_password('M00dLe@T'); @@ -296,11 +292,7 @@ class userlib_test extends \advanced_testcase { // Test event. $this->assertInstanceOf('\core\event\user_created', $event); $this->assertEquals($user['id'], $event->objectid); - $this->assertEquals('user_created', $event->get_legacy_eventname()); $this->assertEquals(\context_user::instance($user['id']), $event->get_context()); - $this->assertEventLegacyData($dbuser, $event); - $expectedlogdata = array(SITEID, 'user', 'add', '/view.php?id='.$event->objectid, fullname($dbuser)); - $this->assertEventLegacyLogData($expectedlogdata, $event); // Verify event is not triggred by user_create_user when needed. $user = array('username' => 'usernametest2'); // Create another user. diff --git a/webservice/lib.php b/webservice/lib.php index 993d1960c17..503deaf9809 100644 --- a/webservice/lib.php +++ b/webservice/lib.php @@ -95,8 +95,6 @@ class webservice { $params['other']['reason'] = 'token_expired'; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', get_string('tokenauthlog', 'webservice'), '', - get_string('invalidtimedtoken', 'webservice'), 0)); $event->trigger(); $DB->delete_records('external_tokens', array('token' => $token->token)); throw new webservice_access_exception('Invalid token - token expired - check validuntil time for the token'); @@ -108,8 +106,6 @@ class webservice { $params['other']['reason'] = 'ip_restricted'; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', get_string('tokenauthlog', 'webservice'), '', - get_string('failedtolog', 'webservice') . ": " . getremoteaddr(), 0)); $event->trigger(); throw new webservice_access_exception('Invalid token - IP:' . getremoteaddr() . ' is not supported'); @@ -178,7 +174,6 @@ class webservice { $params['other']['reason'] = 'user_unconfirmed'; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', 'user unconfirmed', '', $user->username)); $event->trigger(); throw new moodle_exception('usernotconfirmed', 'moodle', '', $user->username); } @@ -189,7 +184,6 @@ class webservice { $params['other']['reason'] = 'user_suspended'; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', 'user suspended', '', $user->username)); $event->trigger(); throw new moodle_exception('wsaccessusersuspended', 'moodle', '', $user->username); } @@ -200,7 +194,6 @@ class webservice { $params['other']['reason'] = 'nologin'; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', 'nologin auth attempt with web service', '', $user->username)); $event->trigger(); throw new moodle_exception('wsaccessusernologin', 'moodle', '', $user->username); } @@ -214,7 +207,6 @@ class webservice { $params['other']['reason'] = 'password_expired'; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', 'expired password', '', $user->username)); $event->trigger(); throw new moodle_exception('passwordisexpired', 'webservice'); } @@ -1046,8 +1038,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['reason'] = 'password'; $params['other']['username'] = $this->username; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, 'webservice', get_string('simpleauthlog', 'webservice'), '' , - get_string('failedtolog', 'webservice').": ".$this->username."/".$this->password." - ".getremoteaddr() , 0)); $event->trigger(); throw new moodle_exception('wrongusernamepassword', 'webservice'); @@ -1073,8 +1063,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['reason'] = 'user_deleted'; $params['other']['username'] = $user->username; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, '', '', '', get_string('wsaccessuserdeleted', 'webservice', - $user->username) . " - ".getremoteaddr(), 0, $user->id)); $event->trigger(); throw new moodle_exception('wsaccessuserdeleted', 'webservice', '', $user->username); } @@ -1085,8 +1073,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['reason'] = 'user_unconfirmed'; $params['other']['username'] = $user->username; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, '', '', '', get_string('wsaccessuserunconfirmed', 'webservice', - $user->username) . " - ".getremoteaddr(), 0, $user->id)); $event->trigger(); throw new moodle_exception('wsaccessuserunconfirmed', 'webservice', '', $user->username); } @@ -1097,8 +1083,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['reason'] = 'user_unconfirmed'; $params['other']['username'] = $user->username; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, '', '', '', get_string('wsaccessusersuspended', 'webservice', - $user->username) . " - ".getremoteaddr(), 0, $user->id)); $event->trigger(); throw new moodle_exception('wsaccessusersuspended', 'webservice', '', $user->username); } @@ -1116,8 +1100,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['reason'] = 'password_expired'; $params['other']['username'] = $user->username; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, '', '', '', get_string('wsaccessuserexpired', 'webservice', - $user->username) . " - ".getremoteaddr(), 0, $user->id)); $event->trigger(); throw new moodle_exception('wsaccessuserexpired', 'webservice', '', $user->username); } @@ -1129,8 +1111,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['reason'] = 'login'; $params['other']['username'] = $user->username; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, '', '', '', get_string('wsaccessusernologin', 'webservice', - $user->username) . " - ".getremoteaddr(), 0, $user->id)); $event->trigger(); throw new moodle_exception('wsaccessusernologin', 'webservice', '', $user->username); } @@ -1171,8 +1151,6 @@ abstract class webservice_server implements webservice_server_interface { $params = $loginfaileddefaultparams; $params['other']['reason'] = 'invalid_token'; $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata(array(SITEID, 'webservice', get_string('tokenauthlog', 'webservice'), '' , - get_string('failedtolog', 'webservice').": ".$this->token. " - ".getremoteaddr() , 0)); $event->trigger(); throw new moodle_exception('invalidtoken', 'webservice'); } @@ -1195,8 +1173,6 @@ abstract class webservice_server implements webservice_server_interface { $params['other']['tokenid'] = $token->id; $event = \core\event\webservice_login_failed::create($params); $event->add_record_snapshot('external_tokens', $token); - $event->set_legacy_logdata(array(SITEID, 'webservice', get_string('tokenauthlog', 'webservice'), '' , - get_string('failedtolog', 'webservice').": ".getremoteaddr() , 0)); $event->trigger(); throw new webservice_access_exception('Invalid service - IP:' . getremoteaddr() . ' is not supported - check this allowed user'); @@ -1337,7 +1313,6 @@ abstract class webservice_base_server extends webservice_server { ) ); $event = \core\event\webservice_function_called::create($params); - $event->set_legacy_logdata(array(SITEID, 'webservice', $this->functionname, '' , getremoteaddr() , 0, $this->userid)); $event->trigger(); // Do additional setup stuff. diff --git a/webservice/soap/locallib.php b/webservice/soap/locallib.php index ebfa5ca046c..593f2d9c288 100644 --- a/webservice/soap/locallib.php +++ b/webservice/soap/locallib.php @@ -140,8 +140,6 @@ class webservice_soap_server extends webservice_base_server { ) ); $event = \core\event\webservice_function_called::create($params); - $logdataparams = array(SITEID, 'webservice_soap', '', '', $this->serviceclass . ' ' . getremoteaddr(), 0, $this->userid); - $event->set_legacy_logdata($logdataparams); $event->trigger(); // Handle the SOAP request. diff --git a/webservice/tests/event/events_test.php b/webservice/tests/event/events_test.php index 20de794adbb..6ceef550580 100644 --- a/webservice/tests/event/events_test.php +++ b/webservice/tests/event/events_test.php @@ -46,14 +46,12 @@ class events_test extends \advanced_testcase { $sink = $this->redirectEvents(); - $fakelogdata = array(1, 'B', true, null); $params = array( 'other' => array( 'function' => 'A function' ) ); $event = \core\event\webservice_function_called::create($params); - $event->set_legacy_logdata($fakelogdata); $event->trigger(); $events = $sink->get_events(); @@ -62,7 +60,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals('A function', $event->other['function']); - $this->assertEventLegacyLogData($fakelogdata, $event); $this->assertEventContextNotUsed($event); } @@ -73,7 +70,6 @@ class events_test extends \advanced_testcase { $sink = $this->redirectEvents(); - $fakelogdata = array(1, 'B', true, null); $params = array( 'other' => array( 'reason' => 'Unit Test', @@ -82,7 +78,6 @@ class events_test extends \advanced_testcase { ) ); $event = \core\event\webservice_login_failed::create($params); - $event->set_legacy_logdata($fakelogdata); $event->trigger(); $events = $sink->get_events(); @@ -93,7 +88,6 @@ class events_test extends \advanced_testcase { $this->assertEquals($params['other']['reason'], $event->other['reason']); $this->assertEquals($params['other']['method'], $event->other['method']); $this->assertEquals($params['other']['tokenid'], $event->other['tokenid']); - $this->assertEventLegacyLogData($fakelogdata, $event); // We cannot set the token in the other properties. $params['other']['token'] = 'I should not be set'; @@ -144,9 +138,6 @@ class events_test extends \advanced_testcase { // Assert that the event contains the right information. $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($service->id, $event->objectid); - $returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices"; - $expected = array(SITEID, 'webservice', 'add', $returnurl, get_string('addservice', 'webservice', $service)); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -189,9 +180,6 @@ class events_test extends \advanced_testcase { // Assert that the event contains the right information. $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($service->id, $event->objectid); - $returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices"; - $expected = array(SITEID, 'webservice', 'edit', $returnurl, get_string('editservice', 'webservice', $service)); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -234,9 +222,6 @@ class events_test extends \advanced_testcase { // Assert that the event contains the right information. $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals($service->id, $event->objectid); - $returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices"; - $expected = array(SITEID, 'webservice', 'delete', $returnurl, get_string('deleteservice', 'webservice', $service)); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -263,9 +248,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals(1, $event->objectid); $this->assertEquals(2, $event->relateduserid); - $expected = array(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id=' . $params['objectid'], - 'add', '', $params['relateduserid']); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -292,9 +274,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals(1, $event->objectid); $this->assertEquals(2, $event->relateduserid); - $expected = array(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id=' . $params['objectid'], - 'remove', '', $params['relateduserid']); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -322,8 +301,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals(1, $event->objectid); $this->assertEquals(2, $event->relateduserid); - $expected = array(SITEID, 'webservice', 'automatically create user token', '' , 'User ID: ' . 2); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } @@ -352,8 +329,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_system::instance(), $event->get_context()); $this->assertEquals(1, $event->objectid); - $expected = array(SITEID, 'webservice', 'sending requested user token', '' , 'User ID: ' . $user->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); } } From 5dace7abc836faad083be0804a535d13a7bc7bdc Mon Sep 17 00:00:00 2001 From: Mathew May Date: Thu, 12 Jan 2023 10:52:01 +0800 Subject: [PATCH 3/5] MDL-52805 core: Plugins with removed tests due to old events --- mod/bigbluebuttonbn/classes/event/base.php | 29 -- .../classes/test/testcase_helper_trait.php | 12 +- .../task/upgrade_recordings_task_test.php | 12 +- mod/scorm/classes/event/attempt_deleted.php | 10 - .../classes/event/course_module_viewed.php | 10 - .../classes/event/interactions_viewed.php | 11 - mod/scorm/classes/event/report_viewed.php | 10 - mod/scorm/classes/event/sco_launched.php | 10 - mod/scorm/classes/event/tracks_viewed.php | 11 - .../classes/event/user_report_viewed.php | 11 - mod/scorm/tests/event/events_test.php | 265 ------------------ .../classes/event/assessable_uploaded.php | 47 ---- .../event/assessment_evaluations_reset.php | 10 - .../classes/event/assessment_reevaluated.php | 10 - .../classes/event/assessments_reset.php | 10 - .../classes/event/course_module_viewed.php | 24 -- mod/workshop/classes/event/phase_switched.php | 10 - .../classes/event/submission_assessed.php | 10 - .../classes/event/submission_created.php | 11 - .../classes/event/submission_deleted.php | 11 - .../classes/event/submission_reassessed.php | 10 - .../classes/event/submission_updated.php | 11 - .../classes/event/submission_viewed.php | 11 - mod/workshop/locallib.php | 1 - mod/workshop/tests/event/events_test.php | 91 ------ 25 files changed, 12 insertions(+), 646 deletions(-) diff --git a/mod/bigbluebuttonbn/classes/event/base.php b/mod/bigbluebuttonbn/classes/event/base.php index 629b943778d..de47014dcd3 100644 --- a/mod/bigbluebuttonbn/classes/event/base.php +++ b/mod/bigbluebuttonbn/classes/event/base.php @@ -93,35 +93,6 @@ abstract class base extends \core\event\base { $this->data['objecttable'] = 'bigbluebuttonbn'; } - /** - * Return legacy data for add_to_log(). - * - * @return array - */ - protected function get_legacy_logdata() { - if (isset($this->legacylogdata)) { - return $this->legacylogdata; - } - - return null; - } - - /** - * Sets the legacy event log data. - * - * @param string $action The current action - * @param string $info A detailed description of the change. But no more than 255 characters. - * @param string $url The url to the assign module instance. - */ - public function set_legacy_logdata($action = '', $info = '', $url = '') { - $fullurl = 'view.php?id=' . $this->contextinstanceid; - if ($url != '') { - $fullurl .= '&' . $url; - } - - $this->legacylogdata = [$this->courseid, 'bigbluebuttonbn', $action, $fullurl, $info, $this->contextinstanceid]; - } - /** * Custom validation. * diff --git a/mod/bigbluebuttonbn/classes/test/testcase_helper_trait.php b/mod/bigbluebuttonbn/classes/test/testcase_helper_trait.php index b94eea7c43d..df44bc74669 100644 --- a/mod/bigbluebuttonbn/classes/test/testcase_helper_trait.php +++ b/mod/bigbluebuttonbn/classes/test/testcase_helper_trait.php @@ -283,7 +283,7 @@ trait testcase_helper_trait { * @param bool $withremoterecordings create recording on the mock server ? * @return array */ - protected function create_legacy_log_entries( + protected function create_log_entries( instance $instance, int $userid, int $count = 30, @@ -304,10 +304,10 @@ trait testcase_helper_trait { // Create a recording. $starttime = time() - random_int(HOURSECS, WEEKSECS); $recording = $plugingenerator->create_recording([ - 'bigbluebuttonbnid' => $instance->get_instance_id(), - 'groupid' => $instance->get_group_id(), - 'starttime' => $starttime, - 'endtime' => $starttime + HOURSECS, + 'bigbluebuttonbnid' => $instance->get_instance_id(), + 'groupid' => $instance->get_group_id(), + 'starttime' => $starttime, + 'endtime' => $starttime + HOURSECS, ], true); // Create them on the server only. $baselogdata['meetingid'] = $instance->get_meeting_id(); @@ -323,7 +323,7 @@ trait testcase_helper_trait { $data = []; } $baselogdata['meta'] = json_encode(array_merge([ - 'recording' => array_diff_key($data, $metaonly), + 'recording' => array_diff_key($data, $metaonly), ], $metaonly)); } else { diff --git a/mod/bigbluebuttonbn/tests/task/upgrade_recordings_task_test.php b/mod/bigbluebuttonbn/tests/task/upgrade_recordings_task_test.php index 28c05e81252..24abb24f6e0 100644 --- a/mod/bigbluebuttonbn/tests/task/upgrade_recordings_task_test.php +++ b/mod/bigbluebuttonbn/tests/task/upgrade_recordings_task_test.php @@ -197,8 +197,8 @@ class upgrade_recordings_task_test extends advanced_testcase { $plugingenerator = $this->getDataGenerator()->get_plugin_generator('mod_bigbluebuttonbn'); [$teacher, $groups, $instance, $groupedinstance, $deletedinstance] = $this->setup_basic_course_and_meeting(); - $this->create_legacy_log_entries($instance, $teacher->id, 5, false); - $this->create_legacy_log_entries($instance, $teacher->id, 5, false, false); + $this->create_log_entries($instance, $teacher->id, 5); + $this->create_log_entries($instance, $teacher->id, 5, false, false); $this->assertEquals(10, $DB->count_records('bigbluebuttonbn_logs', ['log' => 'Create'])); // Schedule the run. @@ -257,7 +257,7 @@ class upgrade_recordings_task_test extends advanced_testcase { 'instanceid' => $this->instance->get_instance_id(), 'groupid' => $this->instance->get_group_id(), ]); - $this->create_legacy_log_entries($this->instance, $user->id, 5, false); + $this->create_log_entries($this->instance, $user->id, 5); $plugingenerator->create_recording([ 'bigbluebuttonbnid' => $this->instance->get_instance_id(), 'groupid' => $this->instance->get_group_id(), @@ -292,12 +292,12 @@ class upgrade_recordings_task_test extends advanced_testcase { global $DB; [$teacher, $groups, $instance, $groupedinstance, $deletedinstance] = $this->setup_basic_course_and_meeting(); - $this->create_legacy_log_entries($instance, $teacher->id, 30, $importedrecording); + $this->create_log_entries($instance, $teacher->id, 30, $importedrecording); foreach ($groups as $group) { $groupinstance = instance::get_group_instance_from_instance($groupedinstance, $group->id); - $this->create_legacy_log_entries($groupinstance, $teacher->id, 15, $importedrecording); + $this->create_log_entries($groupinstance, $teacher->id, 15, $importedrecording); } - $this->create_legacy_log_entries($deletedinstance, $teacher->id, 15, $importedrecording); + $this->create_log_entries($deletedinstance, $teacher->id, 15, $importedrecording); course_delete_module($deletedinstance->get_cm_id()); // Truncate the recordings table to reflect what it would have looked like before this version. $DB->delete_records('bigbluebuttonbn_recordings'); diff --git a/mod/scorm/classes/event/attempt_deleted.php b/mod/scorm/classes/event/attempt_deleted.php index 2a0a1274ee5..32df60a2b4b 100644 --- a/mod/scorm/classes/event/attempt_deleted.php +++ b/mod/scorm/classes/event/attempt_deleted.php @@ -77,16 +77,6 @@ class attempt_deleted extends \core\event\base { return new \moodle_url('/mod/scorm/report.php', array('id' => $this->contextinstanceid)); } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'delete attempts', 'report.php?id=' . $this->contextinstanceid, - $this->other['attemptid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/scorm/classes/event/course_module_viewed.php b/mod/scorm/classes/event/course_module_viewed.php index a81e411a571..fcc53ab1682 100644 --- a/mod/scorm/classes/event/course_module_viewed.php +++ b/mod/scorm/classes/event/course_module_viewed.php @@ -44,16 +44,6 @@ class course_module_viewed extends \core\event\course_module_viewed { $this->data['objecttable'] = 'scorm'; } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'pre-view', 'view.php?id=' . $this->contextinstanceid, $this->objectid, - $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'scorm', 'restore' => 'scorm'); } diff --git a/mod/scorm/classes/event/interactions_viewed.php b/mod/scorm/classes/event/interactions_viewed.php index ad3f41be844..db7e8c1ce60 100644 --- a/mod/scorm/classes/event/interactions_viewed.php +++ b/mod/scorm/classes/event/interactions_viewed.php @@ -83,17 +83,6 @@ class interactions_viewed extends \core\event\base { return new \moodle_url('/mod/scorm/userreportinteractions.php', $params); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'userreportinteractions', 'report/userreportinteractions.php?id=' . - $this->contextinstanceid . '&user=' . $this->relateduserid . '&attempt=' . $this->other['attemptid'], - $this->other['instanceid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/scorm/classes/event/report_viewed.php b/mod/scorm/classes/event/report_viewed.php index e86e9466050..af031474376 100644 --- a/mod/scorm/classes/event/report_viewed.php +++ b/mod/scorm/classes/event/report_viewed.php @@ -78,16 +78,6 @@ class report_viewed extends \core\event\base { return new \moodle_url('/mod/scorm/report.php', array('id' => $this->contextinstanceid, 'mode' => $this->other['mode'])); } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'report', 'report.php?id=' . $this->contextinstanceid . - '&mode=' . $this->other['mode'], $this->other['scormid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/scorm/classes/event/sco_launched.php b/mod/scorm/classes/event/sco_launched.php index a26d221ae6b..8b95e1bc85b 100644 --- a/mod/scorm/classes/event/sco_launched.php +++ b/mod/scorm/classes/event/sco_launched.php @@ -79,16 +79,6 @@ class sco_launched extends \core\event\base { return new \moodle_url('/mod/scorm/player.php', array('cm' => $this->contextinstanceid, 'scoid' => $this->objectid)); } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'launch', 'view.php?id=' . $this->contextinstanceid, - $this->other['loadedcontent'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/scorm/classes/event/tracks_viewed.php b/mod/scorm/classes/event/tracks_viewed.php index 6554bb85878..66b7241b8ea 100644 --- a/mod/scorm/classes/event/tracks_viewed.php +++ b/mod/scorm/classes/event/tracks_viewed.php @@ -85,17 +85,6 @@ class tracks_viewed extends \core\event\base { return new \moodle_url('/mod/scorm/userreporttracks.php', $params); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'userreporttracks', 'report/userreporttracks.php?id=' . $this->contextinstanceid - . '&user=' . $this->relateduserid . '&attempt=' . $this->other['attemptid'] . '&scoid=' . $this->other['scoid'] - . '&mode=' . $this->other['mode'], $this->other['instanceid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/scorm/classes/event/user_report_viewed.php b/mod/scorm/classes/event/user_report_viewed.php index 6cec96852fb..f5ae0045608 100644 --- a/mod/scorm/classes/event/user_report_viewed.php +++ b/mod/scorm/classes/event/user_report_viewed.php @@ -82,17 +82,6 @@ class user_report_viewed extends \core\event\base { return new \moodle_url('/mod/scorm/userreport.php', $params); } - /** - * Return the legacy event log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'scorm', 'userreport', 'report/userreport.php?id=' . - $this->contextinstanceid . '&user=' . $this->relateduserid . '&attempt=' . $this->other['attemptid'], - $this->other['instanceid'], $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/scorm/tests/event/events_test.php b/mod/scorm/tests/event/events_test.php index f05177da285..deafc58c07c 100644 --- a/mod/scorm/tests/event/events_test.php +++ b/mod/scorm/tests/event/events_test.php @@ -83,9 +83,6 @@ class events_test extends \advanced_testcase { $this->assertEquals(\context_module::instance($this->eventcm->id), $event->get_context()); $this->assertEquals(4, $event->other['attemptid']); $this->assertEquals(2, $event->relateduserid); - $expected = array($this->eventcourse->id, 'scorm', 'delete attempts', 'report.php?id=' . $this->eventcm->id, - 4, $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $events[0]); $this->assertEventContextNotUsed($event); // Test event validations. @@ -96,83 +93,6 @@ class events_test extends \advanced_testcase { )); } - /** - * Tests for course module viewed event. - * - * There is no api involved so the best we can do is test legacy data by triggering event manually. - */ - public function test_course_module_viewed_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\course_module_viewed::create(array( - 'objectid' => $this->eventscorm->id, - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'pre-view', 'view.php?id=' . $this->eventcm->id, - $this->eventscorm->id, $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - } - - /** - * Tests for instance list viewed event. - * - * There is no api involved so the best we can do is test legacy data by triggering event manually. - */ - public function test_course_module_instance_list_viewed_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\course_module_instance_list_viewed::create(array( - 'context' => \context_course::instance($this->eventcourse->id), - 'courseid' => $this->eventcourse->id - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'view all', 'index.php?id=' . $this->eventcourse->id, ''); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - } - - /** - * Tests for interactions viewed. - * - * There is no api involved so the best we can do is test legacy data by triggering event manually and test validations. - */ - public function test_interactions_viewed_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\interactions_viewed::create(array( - 'relateduserid' => 5, - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id, - 'other' => array('attemptid' => 2, 'instanceid' => $this->eventscorm->id) - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'userreportinteractions', 'report/userreportinteractions.php?id=' . - $this->eventcm->id . '&user=5&attempt=' . 2, $this->eventscorm->id, $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - } - /** * Tests for interactions viewed validations. */ @@ -202,96 +122,6 @@ class events_test extends \advanced_testcase { } } - /** Tests for report viewed. - * - * There is no api involved so the best we can do is test legacy data and validations by triggering event manually. - */ - public function test_report_viewed_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\report_viewed::create(array( - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id, - 'other' => array( - 'scormid' => $this->eventscorm->id, - 'mode' => 'basic' - ) - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'report', 'report.php?id=' . $this->eventcm->id . '&mode=basic', - $this->eventscorm->id, $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - } - - /** Tests for sco launched event. - * - * There is no api involved so the best we can do is test legacy data and validations by triggering event manually. - */ - public function test_sco_launched_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\sco_launched::create(array( - 'objectid' => 2, - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id, - 'other' => array('loadedcontent' => 'url_to_content_that_was_laoded.php') - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'launch', 'view.php?id=' . $this->eventcm->id, - 'url_to_content_that_was_laoded.php', $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - - // Test validations. - $this->expectException(\coding_exception::class); - \mod_scorm\event\sco_launched::create(array( - 'objectid' => $this->eventscorm->id, - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id, - )); - } - - /** - * Tests for tracks viewed event. - * - * There is no api involved so the best we can do is test validations by triggering event manually. - */ - public function test_tracks_viewed_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\tracks_viewed::create(array( - 'relateduserid' => 5, - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id, - 'other' => array('attemptid' => 2, 'instanceid' => $this->eventscorm->id, 'scoid' => 3, 'mode' => 'interactions') - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'userreporttracks', 'report/userreporttracks.php?id=' . - $this->eventcm->id . '&user=5&attempt=' . 2 . '&scoid=3' . '&mode=interactions', - $this->eventscorm->id, $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - } - /** * Tests for tracks viewed event validations. */ @@ -333,33 +163,6 @@ class events_test extends \advanced_testcase { } } - /** - * Tests for userreport viewed event. - * - * There is no api involved so the best we can do is test validations and legacy log by triggering event manually. - */ - public function test_user_report_viewed_event() { - $this->resetAfterTest(); - $event = \mod_scorm\event\user_report_viewed::create(array( - 'relateduserid' => 5, - 'context' => \context_module::instance($this->eventcm->id), - 'courseid' => $this->eventcourse->id, - 'other' => array('attemptid' => 2, 'instanceid' => $this->eventscorm->id) - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->eventcourse->id, 'scorm', 'userreport', 'report/userreport.php?id=' . - $this->eventcm->id . '&user=5&attempt=' . 2, $this->eventscorm->id, $this->eventcm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - } - /** * Tests for userreport viewed event validations. */ @@ -413,40 +216,6 @@ class events_test extends \advanced_testcase { ); } - /** - * Tests for score submitted event. - * - * There is no api involved so the best we can do is test data by triggering event manually. - * - * @dataProvider get_scoreraw_submitted_event_provider - * - * @param string $cmielement a valid CMI raw score element - * @param string $cmivalue a valid CMI raw score value - */ - public function test_scoreraw_submitted_event($cmielement, $cmivalue) { - $this->resetAfterTest(); - $event = \mod_scorm\event\scoreraw_submitted::create(array( - 'other' => array('attemptid' => '2', 'cmielement' => $cmielement, 'cmivalue' => $cmivalue), - 'objectid' => $this->eventscorm->id, - 'context' => \context_module::instance($this->eventcm->id), - 'relateduserid' => $this->eventuser->id - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $sink->close(); - $event = reset($events); - $this->assertEquals(2, $event->other['attemptid']); - $this->assertEquals($cmielement, $event->other['cmielement']); - $this->assertEquals($cmivalue, $event->other['cmivalue']); - - // Check that no legacy log data is provided. - $this->assertEventLegacyLogData(null, $event); - $this->assertEventContextNotUsed($event); - } - /** * dataProvider for test_scoreraw_submitted_event_validations(). */ @@ -534,40 +303,6 @@ class events_test extends \advanced_testcase { ); } - /** - * Tests for status submitted event. - * - * There is no api involved so the best we can do is test data by triggering event manually. - * - * @dataProvider get_status_submitted_event_provider - * - * @param string $cmielement a valid CMI status element - * @param string $cmivalue a valid CMI status value - */ - public function test_status_submitted_event($cmielement, $cmivalue) { - $this->resetAfterTest(); - $event = \mod_scorm\event\status_submitted::create(array( - 'other' => array('attemptid' => '2', 'cmielement' => $cmielement, 'cmivalue' => $cmivalue), - 'objectid' => $this->eventscorm->id, - 'context' => \context_module::instance($this->eventcm->id), - 'relateduserid' => $this->eventuser->id - )); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $sink->close(); - $event = reset($events); - $this->assertEquals(2, $event->other['attemptid']); - $this->assertEquals($cmielement, $event->other['cmielement']); - $this->assertEquals($cmivalue, $event->other['cmivalue']); - - // Check that no legacy log data is provided. - $this->assertEventLegacyLogData(null, $event); - $this->assertEventContextNotUsed($event); - } - /** * dataProvider for test_status_submitted_event_validations(). */ diff --git a/mod/workshop/classes/event/assessable_uploaded.php b/mod/workshop/classes/event/assessable_uploaded.php index 34e1a1a0f6e..27535d590be 100644 --- a/mod/workshop/classes/event/assessable_uploaded.php +++ b/mod/workshop/classes/event/assessable_uploaded.php @@ -53,43 +53,6 @@ class assessable_uploaded extends \core\event\assessable_uploaded { "to the workshop activity with course module id '$this->contextinstanceid'."; } - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return \stdClass - */ - protected function get_legacy_eventdata() { - $eventdata = new \stdClass(); - $eventdata->modulename = 'workshop'; - $eventdata->cmid = $this->contextinstanceid; - $eventdata->itemid = $this->objectid; - $eventdata->courseid = $this->courseid; - $eventdata->userid = $this->userid; - $eventdata->content = $this->other['content']; - if ($this->other['pathnamehashes']) { - $eventdata->pathnamehashes = $this->other['pathnamehashes']; - } - return $eventdata; - } - - /** - * Return the legacy event name. - * - * @return string - */ - public static function get_legacy_eventname() { - return 'assessable_content_uploaded'; - } - - /** - * Return the legacy log data. - * - * @return array - */ - protected function get_legacy_logdata() { - return $this->legacylogdata; - } - /** * Return localised event name. * @@ -119,16 +82,6 @@ class assessable_uploaded extends \core\event\assessable_uploaded { $this->data['objecttable'] = 'workshop_submissions'; } - /** - * Set the legacy log data. - * - * @param array $legacylogdata - * @return void - */ - public function set_legacy_logdata($legacylogdata) { - $this->legacylogdata = $legacylogdata; - } - public static function get_objectid_mapping() { return array('db' => 'workshop_submissions', 'restore' => 'workshop_submission'); } diff --git a/mod/workshop/classes/event/assessment_evaluations_reset.php b/mod/workshop/classes/event/assessment_evaluations_reset.php index e9ea908f36a..3b25dcba4c0 100644 --- a/mod/workshop/classes/event/assessment_evaluations_reset.php +++ b/mod/workshop/classes/event/assessment_evaluations_reset.php @@ -62,16 +62,6 @@ class assessment_evaluations_reset extends \core\event\base { "'$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'update clear aggregated grade', 'view.php?id=' . $this->contextinstanceid, - $this->other['workshopid'], $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/workshop/classes/event/assessment_reevaluated.php b/mod/workshop/classes/event/assessment_reevaluated.php index 8e4f8a39746..56d602b1e15 100644 --- a/mod/workshop/classes/event/assessment_reevaluated.php +++ b/mod/workshop/classes/event/assessment_reevaluated.php @@ -63,16 +63,6 @@ class assessment_reevaluated extends \core\event\base { "course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'update aggregate grade', 'view.php?id=' . $this->contextinstanceid, - $this->objectid, $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/workshop/classes/event/assessments_reset.php b/mod/workshop/classes/event/assessments_reset.php index 8d7d2a083d9..e9662587232 100644 --- a/mod/workshop/classes/event/assessments_reset.php +++ b/mod/workshop/classes/event/assessments_reset.php @@ -61,16 +61,6 @@ class assessments_reset extends \core\event\base { "'$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'update clear assessments', 'view.php?id=' . $this->contextinstanceid, - $this->other['workshopid'], $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/workshop/classes/event/course_module_viewed.php b/mod/workshop/classes/event/course_module_viewed.php index 794384c4150..a9aee09d9e0 100644 --- a/mod/workshop/classes/event/course_module_viewed.php +++ b/mod/workshop/classes/event/course_module_viewed.php @@ -48,30 +48,6 @@ class course_module_viewed extends \core\event\course_module_viewed { $this->data['objecttable'] = 'workshop'; } - /** - * Does this event replace a legacy event? - * - * @return string legacy event name - */ - public static function get_legacy_eventname() { - return 'workshop_viewed'; - } - - /** - * Legacy event data if get_legacy_eventname() is not empty. - * - * @return mixed - */ - protected function get_legacy_eventdata() { - global $USER; - - $workshop = $this->get_record_snapshot('workshop', $this->objectid); - $course = $this->get_record_snapshot('course', $this->courseid); - $cm = $this->get_record_snapshot('course_modules', $this->contextinstanceid); - $workshop = new \workshop($workshop, $cm, $course); - return (object)array('workshop' => $workshop, 'user' => $USER); - } - public static function get_objectid_mapping() { return array('db' => 'workshop', 'restore' => 'workshop'); } diff --git a/mod/workshop/classes/event/phase_switched.php b/mod/workshop/classes/event/phase_switched.php index 16281932354..df7bf550132 100644 --- a/mod/workshop/classes/event/phase_switched.php +++ b/mod/workshop/classes/event/phase_switched.php @@ -62,16 +62,6 @@ class phase_switched extends \core\event\base { "'$this->contextinstanceid' to '{$this->other['workshopphase']}'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'update switch phase', 'view.php?id=' . $this->contextinstanceid, - $this->other['workshopphase'], $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/workshop/classes/event/submission_assessed.php b/mod/workshop/classes/event/submission_assessed.php index e2c9e3943d2..4231541cf14 100644 --- a/mod/workshop/classes/event/submission_assessed.php +++ b/mod/workshop/classes/event/submission_assessed.php @@ -63,16 +63,6 @@ class submission_assessed extends \core\event\base { "id '$this->relateduserid' in the workshop with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'add assessment ', 'assessment.php?asid=' . $this->objectid, - $this->other['submissionid'], $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/workshop/classes/event/submission_created.php b/mod/workshop/classes/event/submission_created.php index 3503f5265b9..dd86e69023b 100644 --- a/mod/workshop/classes/event/submission_created.php +++ b/mod/workshop/classes/event/submission_created.php @@ -78,17 +78,6 @@ class submission_created extends \core\event\base { array('cmid' => $this->contextinstanceid, 'id' => $this->objectid)); } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'add submission', - 'submission.php?cmid=' . $this->contextinstanceid . '&id=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'workshop_submissions', 'restore' => 'workshop_submission'); } diff --git a/mod/workshop/classes/event/submission_deleted.php b/mod/workshop/classes/event/submission_deleted.php index 69affe60d38..ccd4aafbf11 100644 --- a/mod/workshop/classes/event/submission_deleted.php +++ b/mod/workshop/classes/event/submission_deleted.php @@ -79,17 +79,6 @@ class submission_deleted extends \core\event\base { array('cmid' => $this->contextinstanceid, 'id' => $this->objectid)); } - /** - * Replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'delete submission', - 'submission.php?cmid=' . $this->contextinstanceid . '&id=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - /** * Defines mapping of the 'objectid' property when restoring course logs. * diff --git a/mod/workshop/classes/event/submission_reassessed.php b/mod/workshop/classes/event/submission_reassessed.php index 1c55c9678a6..4e61c4d084c 100644 --- a/mod/workshop/classes/event/submission_reassessed.php +++ b/mod/workshop/classes/event/submission_reassessed.php @@ -64,16 +64,6 @@ class submission_reassessed extends \core\event\base { "id '$this->relateduserid' in the workshop with course module id '$this->contextinstanceid'."; } - /** - * Return the legacy event log data. - * - * @return array|null - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'update assessment', 'assessment.php?asid=' . $this->objectid, - $this->other['submissionid'], $this->contextinstanceid); - } - /** * Return localised event name. * diff --git a/mod/workshop/classes/event/submission_updated.php b/mod/workshop/classes/event/submission_updated.php index b23ee777b0a..d47910ae8ca 100644 --- a/mod/workshop/classes/event/submission_updated.php +++ b/mod/workshop/classes/event/submission_updated.php @@ -78,17 +78,6 @@ class submission_updated extends \core\event\base { array('cmid' => $this->contextinstanceid, 'id' => $this->objectid)); } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'update submission', - 'submission.php?cmid=' . $this->contextinstanceid . '&id=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - public static function get_objectid_mapping() { return array('db' => 'workshop_submissions', 'restore' => 'workshop_submission'); } diff --git a/mod/workshop/classes/event/submission_viewed.php b/mod/workshop/classes/event/submission_viewed.php index c6ae693a5c1..fa48e4bf756 100644 --- a/mod/workshop/classes/event/submission_viewed.php +++ b/mod/workshop/classes/event/submission_viewed.php @@ -78,17 +78,6 @@ class submission_viewed extends \core\event\base { array('cmid' => $this->contextinstanceid, 'id' => $this->objectid)); } - /** - * replace add_to_log() statement. - * - * @return array of parameters to be passed to legacy add_to_log() function. - */ - protected function get_legacy_logdata() { - return array($this->courseid, 'workshop', 'view submission', - 'submission.php?cmid=' . $this->contextinstanceid . '&id=' . $this->objectid, - $this->objectid, $this->contextinstanceid); - } - /** * Custom validation. * diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php index f6dc727c323..7e8e5b2f66e 100644 --- a/mod/workshop/locallib.php +++ b/mod/workshop/locallib.php @@ -3027,7 +3027,6 @@ class workshop { $params['other']['pathnamehashes'] = array_keys($files); $event = \mod_workshop\event\assessable_uploaded::create($params); - $event->set_legacy_logdata($logdata); $event->trigger(); return $submission->id; diff --git a/mod/workshop/tests/event/events_test.php b/mod/workshop/tests/event/events_test.php index ea4c8ae89b6..2f98599b044 100644 --- a/mod/workshop/tests/event/events_test.php +++ b/mod/workshop/tests/event/events_test.php @@ -95,10 +95,6 @@ class events_test extends \advanced_testcase { $events = $sink->get_events(); $event = reset($events); - // Check that the legacy log data is valid. - $expected = array($this->course->id, 'workshop', 'update switch phase', 'view.php?id=' . $this->cm->id, - $newphase, $this->cm->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $sink->close(); @@ -151,9 +147,6 @@ class events_test extends \advanced_testcase { $this->assertInstanceOf('\mod_workshop\event\assessment_reevaluated', $event); $this->assertEquals('workshop_aggregations', $event->objecttable); $this->assertEquals(\context_module::instance($cm->id), $event->get_context()); - $expected = array($this->course->id, 'workshop', 'update aggregate grade', - 'view.php?id=' . $event->get_context()->instanceid, $event->objectid, $event->get_context()->instanceid); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $sink->close(); @@ -178,11 +171,6 @@ class events_test extends \advanced_testcase { $events = $sink->get_events(); $event = reset($events); - // Check that the legacy log data is valid. - $expected = array($this->course->id, 'workshop', 'update clear aggregated grade', 'view.php?id=' . $this->cm->id, - $this->workshop->id, $this->cm->id); - $this->assertEventLegacyLogData($expected, $event); - $sink->close(); } @@ -203,9 +191,6 @@ class events_test extends \advanced_testcase { $events = $sink->get_events(); $event = reset($events); - // Check that the legacy log data is valid. - $expected = array($this->course->id, 'workshop', 'view all', 'index.php?id=' . $this->course->id, ''); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $sink->close(); @@ -238,82 +223,6 @@ class events_test extends \advanced_testcase { $events = $sink->get_events(); $event = reset($events); - // Check that the legacy log data is valid. - $expected = array($this->course->id, 'workshop', 'add submission', - 'submission.php?cmid=' . $this->cm->id . '&id=' . $submissionid, $submissionid, $this->cm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - - $sink->close(); - } - - /** - * There is no api involved so the best we can do is test legacy data by triggering event manually. - */ - public function test_submission_updated_event() { - $this->resetAfterTest(); - $this->setAdminUser(); - - $user = $this->getDataGenerator()->create_user(); - $submissionid = 48; - - $event = \mod_workshop\event\submission_updated::create(array( - 'objectid' => $submissionid, - 'context' => $this->context, - 'courseid' => $this->course->id, - 'relateduserid' => $user->id, - 'other' => array( - 'submissiontitle' => 'The submission title' - ) - ) - ); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->course->id, 'workshop', 'update submission', - 'submission.php?cmid=' . $this->cm->id . '&id=' . $submissionid, $submissionid, $this->cm->id); - $this->assertEventLegacyLogData($expected, $event); - $this->assertEventContextNotUsed($event); - - $sink->close(); - } - - /** - * There is no api involved so the best we can do is test legacy data by triggering event manually. - */ - public function test_submission_viewed_event() { - $this->resetAfterTest(); - $this->setAdminUser(); - - $user = $this->getDataGenerator()->create_user(); - $submissionid = 48; - - $event = \mod_workshop\event\submission_viewed::create(array( - 'objectid' => $submissionid, - 'context' => $this->context, - 'courseid' => $this->course->id, - 'relateduserid' => $user->id, - 'other' => array( - 'workshopid' => $this->workshop->id - ) - ) - ); - - // Trigger and capture the event. - $sink = $this->redirectEvents(); - $event->trigger(); - $events = $sink->get_events(); - $event = reset($events); - - // Check that the legacy log data is valid. - $expected = array($this->course->id, 'workshop', 'view submission', - 'submission.php?cmid=' . $this->cm->id . '&id=' . $submissionid, $submissionid, $this->cm->id); - $this->assertEventLegacyLogData($expected, $event); $this->assertEventContextNotUsed($event); $sink->close(); From 33ebbddde22febf711fc34adce82ec99b2ffb217 Mon Sep 17 00:00:00 2001 From: Mathew May Date: Fri, 13 Jan 2023 11:58:09 +0800 Subject: [PATCH 4/5] MDL-52805 core: Remove legacy log plugin and more calls --- admin/renderer.php | 16 - admin/tool/log/classes/log/manager.php | 25 - admin/tool/log/db/install.php | 11 - .../legacy/classes/event/legacy_logged.php | 53 -- .../log/store/legacy/classes/log/store.php | 424 ---------------- .../store/legacy/classes/privacy/provider.php | 255 ---------- .../legacy/classes/task/cleanup_task.php | 69 --- admin/tool/log/store/legacy/db/tasks.php | 37 -- .../store/legacy/lang/en/logstore_legacy.php | 37 -- admin/tool/log/store/legacy/settings.php | 52 -- .../log/store/legacy/tests/fixtures/event.php | 47 -- .../log/store/legacy/tests/fixtures/store.php | 43 -- .../legacy/tests/privacy/provider_test.php | 472 ------------------ .../log/store/legacy/tests/store_test.php | 264 ---------- admin/tool/log/store/legacy/version.php | 29 -- admin/tool/log/tests/manager_test.php | 7 +- lib/classes/plugin_manager.php | 3 +- .../report/summary/classes/summary_table.php | 12 +- report/eventlist/classes/list_generator.php | 3 +- report/log/classes/table_log.php | 54 +- report/log/index.php | 5 - report/log/locallib.php | 38 +- report/log/tests/lib_test.php | 1 - report/loglive/classes/table_log.php | 8 +- report/loglive/tests/lib_test.php | 2 - report/outline/lib.php | 2 +- report/outline/locallib.php | 5 - report/outline/tests/behat/outline.feature | 18 - report/outline/tests/behat/user.feature | 30 -- report/outline/tests/lib_test.php | 1 - report/participation/lib.php | 2 +- report/participation/locallib.php | 5 - .../tests/behat/filter_participation.feature | 19 - report/participation/tests/lib_test.php | 1 - report/stats/lib.php | 2 +- report/stats/tests/lib_test.php | 1 - 36 files changed, 39 insertions(+), 2014 deletions(-) delete mode 100644 admin/tool/log/store/legacy/classes/event/legacy_logged.php delete mode 100644 admin/tool/log/store/legacy/classes/log/store.php delete mode 100644 admin/tool/log/store/legacy/classes/privacy/provider.php delete mode 100644 admin/tool/log/store/legacy/classes/task/cleanup_task.php delete mode 100644 admin/tool/log/store/legacy/db/tasks.php delete mode 100644 admin/tool/log/store/legacy/lang/en/logstore_legacy.php delete mode 100644 admin/tool/log/store/legacy/settings.php delete mode 100644 admin/tool/log/store/legacy/tests/fixtures/event.php delete mode 100644 admin/tool/log/store/legacy/tests/fixtures/store.php delete mode 100644 admin/tool/log/store/legacy/tests/privacy/provider_test.php delete mode 100644 admin/tool/log/store/legacy/tests/store_test.php delete mode 100644 admin/tool/log/store/legacy/version.php diff --git a/admin/renderer.php b/admin/renderer.php index 89a35af70de..80cf7d408b4 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -296,7 +296,6 @@ class core_admin_renderer extends plugin_renderer_base { $output .= $this->header(); $output .= $this->output->heading(get_string('notifications', 'admin')); $output .= $this->maturity_info($maturity); - $output .= $this->legacy_log_store_writing_error(); $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : ''; $output .= $this->insecure_dataroot_warning($insecuredataroot); $output .= $this->development_libs_directories_warning($devlibdir); @@ -2192,21 +2191,6 @@ class core_admin_renderer extends plugin_renderer_base { return $output; } - /** - * Check to see if writing to the deprecated legacy log store is enabled. - * - * @return string An error message if writing to the legacy log store is enabled. - */ - protected function legacy_log_store_writing_error() { - $enabled = get_config('logstore_legacy', 'loglegacy'); - $plugins = explode(',', get_config('tool_log', 'enabled_stores')); - $enabled = $enabled && in_array('logstore_legacy', $plugins); - - if ($enabled) { - return $this->warning(get_string('legacylogginginuse')); - } - } - /** * Display message about the benefits of registering on Moodle.org * diff --git a/admin/tool/log/classes/log/manager.php b/admin/tool/log/classes/log/manager.php index 2b1d49107fa..a65aefd8c3f 100644 --- a/admin/tool/log/classes/log/manager.php +++ b/admin/tool/log/classes/log/manager.php @@ -199,29 +199,4 @@ class manager implements \core\log\manager { $this->readers = null; $this->writers = null; } - - /** - * Legacy add_to_log() redirection. - * - * To be used only from deprecated add_to_log() function and event trigger() method. - * - * NOTE: this is hardcoded to legacy log store plugin, hopefully we can get rid of it soon. - * - * @param int $courseid The course id - * @param string $module The module name e.g. forum, journal, resource, course, user etc - * @param string $action 'view', 'update', 'add' or 'delete', possibly followed by another word to clarify - * @param string $url The file and parameters used to see the results of the action - * @param string $info Additional description information - * @param int $cm The course_module->id if there is one - * @param int|\stdClass $user If log regards $user other than $USER - * @param string $ip Override the IP, should only be used for restore. - * @param int $time Override the log time, should only be used for restore. - */ - public function legacy_add_to_log($courseid, $module, $action, $url = '', $info = '', - $cm = 0, $user = 0, $ip = null, $time = null) { - $this->init(); - if (isset($this->stores['logstore_legacy'])) { - $this->stores['logstore_legacy']->legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user, $ip, $time); - } - } } diff --git a/admin/tool/log/db/install.php b/admin/tool/log/db/install.php index 52d2d9de55d..0bfe4cacf0d 100644 --- a/admin/tool/log/db/install.php +++ b/admin/tool/log/db/install.php @@ -37,16 +37,5 @@ function xmldb_tool_log_install() { $enabled[] = 'logstore_standard'; } - // Enable legacy log reading, but only if there are existing data. - if (file_exists("$CFG->dirroot/$CFG->admin/tool/log/store/legacy")) { - unset_config('loglegacy', 'logstore_legacy'); - // Do not enabled legacy logging if somebody installed a new - // site and in less than one day upgraded to 2.7. - $params = array('yesterday' => time() - 60*60*24); - if ($DB->record_exists_select('log', "time < :yesterday", $params)) { - $enabled[] = 'logstore_legacy'; - } - } - set_config('enabled_stores', implode(',', $enabled), 'tool_log'); } diff --git a/admin/tool/log/store/legacy/classes/event/legacy_logged.php b/admin/tool/log/store/legacy/classes/event/legacy_logged.php deleted file mode 100644 index f37365f5100..00000000000 --- a/admin/tool/log/store/legacy/classes/event/legacy_logged.php +++ /dev/null @@ -1,53 +0,0 @@ -. - -namespace logstore_legacy\event; - -defined('MOODLE_INTERNAL') || die(); - -/** - * Legacy log emulation event class. - * - * @package core - * @since Moodle 2.7 - * @copyright 2013 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class legacy_logged extends \core\event\base { - - public function init() { - throw new \coding_exception('legacy events cannot be triggered'); - } - - public static function get_name() { - return get_string('eventlegacylogged', 'logstore_legacy'); - } - - public function get_description() { - return $this->other['module'] . ' ' . $this->other['action'] . ' ' . $this->other['info']; - } - - public function get_url() { - global $CFG; - require_once("$CFG->dirroot/course/lib.php"); - - $url = \make_log_url($this->other['module'], $this->other['url']); - if (!$url) { - return null; - } - return new \moodle_url($url); - } -} diff --git a/admin/tool/log/store/legacy/classes/log/store.php b/admin/tool/log/store/legacy/classes/log/store.php deleted file mode 100644 index 42ffcfbf763..00000000000 --- a/admin/tool/log/store/legacy/classes/log/store.php +++ /dev/null @@ -1,424 +0,0 @@ -. - -/** - * Legacy log reader. - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This is to be removed in Moodle 3.10 - * - * @package logstore_legacy - * @copyright 2013 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -namespace logstore_legacy\log; - -defined('MOODLE_INTERNAL') || die(); - -class store implements \tool_log\log\store, \core\log\sql_reader { - use \tool_log\helper\store, - \tool_log\helper\reader; - - /** - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This is to be removed in Moodle 3.10 - * - * @param \tool_log\log\manager $manager - */ - public function __construct(\tool_log\log\manager $manager) { - $this->helper_setup($manager); - } - - /** @var array list of db fields which needs to be replaced for legacy log query */ - protected static $standardtolegacyfields = array( - 'timecreated' => 'time', - 'courseid' => 'course', - 'contextinstanceid' => 'cmid', - 'origin' => 'ip', - 'anonymous' => 0, - ); - - /** @var string Regex to replace the crud params */ - const CRUD_REGEX = "/(crud).*?(<>|=|!=).*?'(.*?)'/s"; - - /** - * This method contains mapping required for Moodle core to make legacy store compatible with other sql_reader based - * queries. - * - * @param string $selectwhere Select statment - * @param array $params params for the sql - * @param string $sort sort fields - * - * @return array returns an array containing the sql predicate, an array of params and sorting parameter. - */ - protected static function replace_sql_legacy($selectwhere, array $params, $sort = '') { - // Following mapping is done to make can_delete_course() compatible with legacy store. - if ($selectwhere == "userid = :userid AND courseid = :courseid AND eventname = :eventname AND timecreated > :since" and - empty($sort)) { - $replace = "module = 'course' AND action = 'new' AND userid = :userid AND url = :url AND time > :since"; - $params += array('url' => "view.php?id={$params['courseid']}"); - return array($replace, $params, $sort); - } - - // Replace db field names to make it compatible with legacy log. - foreach (self::$standardtolegacyfields as $from => $to) { - $selectwhere = str_replace($from, $to, $selectwhere); - if (!empty($sort)) { - $sort = str_replace($from, $to, $sort); - } - if (isset($params[$from])) { - $params[$to] = $params[$from]; - unset($params[$from]); - } - } - - // Replace crud fields. - $selectwhere = preg_replace_callback("/(crud).*?(<>|=|!=).*?'(.*?)'/s", self::class .'::replace_crud', $selectwhere); - - return array($selectwhere, $params, $sort); - } - - /** - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.10 - * - * @param string $selectwhere - * @param array $params - * @param string $sort - * @param int $limitfrom - * @param int $limitnum - * @return array - */ - public function get_events_select($selectwhere, array $params, $sort, $limitfrom, $limitnum) { - global $DB; - - $sort = self::tweak_sort_by_id($sort); - - // Replace the query with hardcoded mappings required for core. - list($selectwhere, $params, $sort) = self::replace_sql_legacy($selectwhere, $params, $sort); - - $records = array(); - - try { - // A custom report + on the fly SQL rewriting = a possible exception. - $records = $DB->get_recordset_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum); - } catch (\moodle_exception $ex) { - debugging("error converting legacy event data " . $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER); - return array(); - } - - $events = array(); - - foreach ($records as $data) { - $events[$data->id] = $this->get_log_event($data); - } - - $records->close(); - - return $events; - } - - /** - * Get whether events are present for the given select clause. - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * - * @param string $selectwhere select conditions. - * @param array $params params. - * - * @return bool Whether events available for the given conditions - */ - public function get_events_select_exists(string $selectwhere, array $params): bool { - global $DB; - - // Replace the query with hardcoded mappings required for core. - list($selectwhere, $params) = self::replace_sql_legacy($selectwhere, $params); - - try { - return $DB->record_exists_select('log', $selectwhere, $params); - } catch (\moodle_exception $ex) { - debugging("error converting legacy event data " . $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER); - return false; - } - } - - /** - * Fetch records using given criteria returning a Traversable object. - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.10 - * - * Note that the traversable object contains a moodle_recordset, so - * remember that is important that you call close() once you finish - * using it. - * - * @param string $selectwhere - * @param array $params - * @param string $sort - * @param int $limitfrom - * @param int $limitnum - * @return \Traversable|\core\event\base[] - */ - public function get_events_select_iterator($selectwhere, array $params, $sort, $limitfrom, $limitnum) { - global $DB; - - $sort = self::tweak_sort_by_id($sort); - - // Replace the query with hardcoded mappings required for core. - list($selectwhere, $params, $sort) = self::replace_sql_legacy($selectwhere, $params, $sort); - - try { - $recordset = $DB->get_recordset_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum); - } catch (\moodle_exception $ex) { - debugging("error converting legacy event data " . $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER); - return new \EmptyIterator; - } - - return new \core\dml\recordset_walk($recordset, array($this, 'get_log_event')); - } - - /** - * Returns an event from the log data. - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.10 - * - * @param stdClass $data Log data - * @return \core\event\base - */ - public function get_log_event($data) { - return \logstore_legacy\event\legacy_logged::restore_legacy($data); - } - - /** - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.10 - * - * @param string $selectwhere - * @param array $params - * @return int - */ - public function get_events_select_count($selectwhere, array $params) { - global $DB; - - // Replace the query with hardcoded mappings required for core. - list($selectwhere, $params) = self::replace_sql_legacy($selectwhere, $params); - - try { - return $DB->count_records_select('log', $selectwhere, $params); - } catch (\moodle_exception $ex) { - debugging("error converting legacy event data " . $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER); - return 0; - } - } - - /** - * Are the new events appearing in the reader? - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.10 - * - * @return bool true means new log events are being added, false means no new data will be added - */ - public function is_logging() { - return (bool)$this->get_config('loglegacy', true); - } - - /** - * @deprecated since Moodle 3.6 MDL-52953 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.10 - */ - public function dispose() { - } - - /** - * Legacy add_to_log() code. - * @deprecated since Moodle 3.1 MDL-45104 - Please use supported log stores such as "standard" or "external" instead. - * @todo MDL-52805 This will be removed in Moodle 3.3 - * - * @param int $courseid The course id - * @param string $module The module name e.g. forum, journal, resource, course, user etc - * @param string $action 'view', 'update', 'add' or 'delete', possibly followed by another word to clarify. - * @param string $url The file and parameters used to see the results of the action - * @param string $info Additional description information - * @param int $cm The course_module->id if there is one - * @param int|\stdClass $user If log regards $user other than $USER - * @param string $ip Override the IP, should only be used for restore. - * @param int $time Override the log time, should only be used for restore. - */ - public function legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user, $ip = null, $time = null) { - // Note that this function intentionally does not follow the normal Moodle DB access idioms. - // This is for a good reason: it is the most frequently used DB update function, - // so it has been optimised for speed. - global $DB, $CFG, $USER; - if (!$this->is_logging()) { - return; - } - - if ($cm === '' || is_null($cm)) { // Postgres won't translate empty string to its default. - $cm = 0; - } - - if ($user) { - $userid = $user; - } else { - if (\core\session\manager::is_loggedinas()) { // Don't log. - return; - } - $userid = empty($USER->id) ? '0' : $USER->id; - } - - if (isset($CFG->logguests) and !$CFG->logguests) { - if (!$userid or isguestuser($userid)) { - return; - } - } - - $remoteaddr = (is_null($ip)) ? getremoteaddr() : $ip; - - $timenow = (is_null($time)) ? time() : $time; - if (!empty($url)) { // Could break doing html_entity_decode on an empty var. - $url = html_entity_decode($url, ENT_QUOTES, 'UTF-8'); - } else { - $url = ''; - } - - // Restrict length of log lines to the space actually available in the - // database so that it doesn't cause a DB error. Log a warning so that - // developers can avoid doing things which are likely to cause this on a - // routine basis. - if (\core_text::strlen($action) > 40) { - $action = \core_text::substr($action, 0, 37) . '...'; - debugging('Warning: logged very long action', DEBUG_DEVELOPER); - } - - if (!empty($info) && \core_text::strlen($info) > 255) { - $info = \core_text::substr($info, 0, 252) . '...'; - debugging('Warning: logged very long info', DEBUG_DEVELOPER); - } - - // If the 100 field size is changed, also need to alter print_log in course/lib.php. - if (!empty($url) && \core_text::strlen($url) > 100) { - $url = \core_text::substr($url, 0, 97) . '...'; - debugging('Warning: logged very long URL', DEBUG_DEVELOPER); - } - - if (defined('MDL_PERFDB')) { - global $PERF; - $PERF->logwrites++; - }; - - $log = array('time' => $timenow, 'userid' => $userid, 'course' => $courseid, 'ip' => $remoteaddr, - 'module' => $module, 'cmid' => $cm, 'action' => $action, 'url' => $url, 'info' => $info); - - try { - $DB->insert_record_raw('log', $log, false); - } catch (\dml_exception $e) { - debugging('Error: Could not insert a new entry to the Moodle log. ' . $e->errorcode, DEBUG_ALL); - - // MDL-11893, alert $CFG->supportemail if insert into log failed. - if ($CFG->supportemail and empty($CFG->noemailever)) { - // Function email_to_user is not usable because email_to_user tries to write to the logs table, - // and this will get caught in an infinite loop, if disk is full. - $site = get_site(); - $subject = 'Insert into log failed at your moodle site ' . $site->fullname; - $message = "Insert into log table failed at " . date('l dS \of F Y h:i:s A') . - ".\n It is possible that your disk is full.\n\n"; - $message .= "The failed query parameters are:\n\n" . var_export($log, true); - - $lasttime = get_config('admin', 'lastloginserterrormail'); - if (empty($lasttime) || time() - $lasttime > 60 * 60 * 24) { // Limit to 1 email per day. - // Using email directly rather than messaging as they may not be able to log in to access a message. - mail($CFG->supportemail, $subject, $message); - set_config('lastloginserterrormail', time(), 'admin'); - } - } - } - } - - /** - * Generate a replace string for crud related sql conditions. This function is called as callback to preg_replace_callback() - * on the actual sql. - * - * @param array $match matched string for the passed pattern - * - * @return string The sql string to use instead of original - */ - protected static function replace_crud($match) { - $return = ''; - unset($match[0]); // The first entry is the whole string. - foreach ($match as $m) { - // We hard code LIKE here because we are not worried about case sensitivity and want this to be fast. - switch ($m) { - case 'crud' : - $replace = 'action'; - break; - case 'c' : - switch ($match[2]) { - case '=' : - $replace = " LIKE '%add%'"; - break; - case '!=' : - case '<>' : - $replace = " NOT LIKE '%add%'"; - break; - default: - $replace = ''; - } - break; - case 'r' : - switch ($match[2]) { - case '=' : - $replace = " LIKE '%view%' OR action LIKE '%report%'"; - break; - case '!=' : - case '<>' : - $replace = " NOT LIKE '%view%' AND action NOT LIKE '%report%'"; - break; - default: - $replace = ''; - } - break; - case 'u' : - switch ($match[2]) { - case '=' : - $replace = " LIKE '%update%'"; - break; - case '!=' : - case '<>' : - $replace = " NOT LIKE '%update%'"; - break; - default: - $replace = ''; - } - break; - case 'd' : - switch ($match[2]) { - case '=' : - $replace = " LIKE '%delete%'"; - break; - case '!=' : - case '<>' : - $replace = " NOT LIKE '%delete%'"; - break; - default: - $replace = ''; - } - break; - default : - $replace = ''; - } - $return .= $replace; - } - return $return; - } -} diff --git a/admin/tool/log/store/legacy/classes/privacy/provider.php b/admin/tool/log/store/legacy/classes/privacy/provider.php deleted file mode 100644 index 271f7ac67a1..00000000000 --- a/admin/tool/log/store/legacy/classes/privacy/provider.php +++ /dev/null @@ -1,255 +0,0 @@ -. - -/** - * Data provider. - * - * @package logstore_legacy - * @copyright 2018 Frédéric Massart - * @author Frédéric Massart - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -namespace logstore_legacy\privacy; -defined('MOODLE_INTERNAL') || die(); - -use context; -use core_privacy\local\metadata\collection; -use core_privacy\local\request\approved_contextlist; -use core_privacy\local\request\contextlist; -use core_privacy\local\request\transform; -use core_privacy\local\request\writer; -use tool_log\local\privacy\helper; - -/** - * Data provider class. - * - * @package logstore_legacy - * @copyright 2018 Frédéric Massart - * @author Frédéric Massart - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class provider implements - \core_privacy\local\metadata\provider, - \tool_log\local\privacy\logstore_provider, - \tool_log\local\privacy\logstore_userlist_provider { - - /** - * Returns metadata. - * - * @param collection $collection The initialised collection to add items to. - * @return collection A listing of user data stored through this system. - */ - public static function get_metadata(collection $collection) : collection { - $collection->add_external_location_link('log', [ - 'time' => 'privacy:metadata:log:time', - 'userid' => 'privacy:metadata:log:userid', - 'ip' => 'privacy:metadata:log:ip', - 'action' => 'privacy:metadata:log:action', - 'url' => 'privacy:metadata:log:url', - 'info' => 'privacy:metadata:log:info', - ], 'privacy:metadata:log'); - return $collection; - } - - /** - * Add contexts that contain user information for the specified user. - * - * @param contextlist $contextlist The contextlist to add the contexts to. - * @param int $userid The user to find the contexts for. - * @return void - */ - public static function add_contexts_for_userid(contextlist $contextlist, $userid) { - $sql = " - SELECT ctx.id - FROM {context} ctx - JOIN {log} l - ON (l.cmid = 0 AND l.course = ctx.instanceid AND ctx.contextlevel = :courselevel) - OR (l.cmid > 0 AND l.cmid = ctx.instanceid AND ctx.contextlevel = :modulelevel) - OR (l.course <= 0 AND ctx.id = :syscontextid) - WHERE l.userid = :userid"; - $params = [ - 'courselevel' => CONTEXT_COURSE, - 'modulelevel' => CONTEXT_MODULE, - 'syscontextid' => SYSCONTEXTID, - 'userid' => $userid, - ]; - $contextlist->add_from_sql($sql, $params); - } - - /** - * Add user IDs that contain user information for the specified context. - * - * @param \core_privacy\local\request\userlist $userlist The userlist to add the users to. - * @return void - */ - public static function add_userids_for_context(\core_privacy\local\request\userlist $userlist) { - $context = $userlist->get_context(); - list($insql, $params) = static::get_sql_where_from_contexts([$context]); - - $sql = "SELECT l.userid - FROM {log} l - WHERE $insql"; - $userlist->add_from_sql('userid', $sql, $params); - } - - /** - * Export all user data for the specified user, in the specified contexts. - * - * @param approved_contextlist $contextlist The approved contexts to export information for. - */ - public static function export_user_data(approved_contextlist $contextlist) { - global $DB; - - $userid = $contextlist->get_user()->id; - list($insql, $inparams) = static::get_sql_where_from_contexts($contextlist->get_contexts()); - if (empty($insql)) { - return; - } - $sql = "userid = :userid AND $insql"; - $params = array_merge($inparams, ['userid' => $userid]); - - $path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_legacy')]; - $flush = function($lastcontextid, $data) use ($path) { - $context = context::instance_by_id($lastcontextid); - writer::with_context($context)->export_data($path, (object) ['logs' => $data]); - }; - - $lastcontextid = null; - $data = []; - $recordset = $DB->get_recordset_select('log', $sql, $params, 'course, cmid, time, id'); - foreach ($recordset as $record) { - $event = \logstore_legacy\event\legacy_logged::restore_legacy($record); - $context = $event->get_context(); - if ($lastcontextid && $lastcontextid != $context->id) { - $flush($lastcontextid, $data); - $data = []; - } - - $extra = $event->get_logextra(); - $data[] = [ - 'name' => $event->get_name(), - 'description' => $event->get_description(), - 'timecreated' => transform::datetime($event->timecreated), - 'ip' => $extra['ip'], - 'origin' => helper::transform_origin($extra['origin']), - ]; - - $lastcontextid = $context->id; - } - if ($lastcontextid) { - $flush($lastcontextid, $data); - } - $recordset->close(); - } - - /** - * Delete all data for all users in the specified context. - * - * @param context $context The specific context to delete data for. - */ - public static function delete_data_for_all_users_in_context(context $context) { - global $DB; - list($sql, $params) = static::get_sql_where_from_contexts([$context]); - if (empty($sql)) { - return; - } - $DB->delete_records_select('log', $sql, $params); - } - - /** - * Delete all user data for the specified user, in the specified contexts. - * - * @param approved_contextlist $contextlist The approved contexts and user information to delete information for. - */ - public static function delete_data_for_user(approved_contextlist $contextlist) { - global $DB; - list($sql, $params) = static::get_sql_where_from_contexts($contextlist->get_contexts()); - if (empty($sql)) { - return; - } - $userid = $contextlist->get_user()->id; - $DB->delete_records_select('log', "$sql AND userid = :userid", array_merge($params, ['userid' => $userid])); - } - - - /** - * Delete all data for a list of users in the specified context. - * - * @param \core_privacy\local\request\approved_userlist $userlist The specific context and users to delete data for. - * @return void - */ - public static function delete_data_for_userlist(\core_privacy\local\request\approved_userlist $userlist) { - global $DB; - list($sql, $params) = static::get_sql_where_from_contexts([$userlist->get_context()]); - if (empty($sql)) { - return; - } - list($usersql, $userparams) = $DB->get_in_or_equal($userlist->get_userids(), SQL_PARAMS_NAMED); - $params = array_merge($params, $userparams); - $DB->delete_records_select('log', "$sql AND userid $usersql", $params); - } - - /** - * Get an SQL where statement from a list of contexts. - * - * @param array $contexts The contexts. - * @return array [$sql, $params] - */ - protected static function get_sql_where_from_contexts(array $contexts) { - global $DB; - - $sorted = array_reduce($contexts, function ($carry, $context) { - $level = $context->contextlevel; - if ($level == CONTEXT_MODULE || $level == CONTEXT_COURSE) { - $carry[$level][] = $context->instanceid; - } else if ($level == CONTEXT_SYSTEM) { - $carry[$level] = $context->id; - } - return $carry; - }, [ - CONTEXT_COURSE => [], - CONTEXT_MODULE => [], - CONTEXT_SYSTEM => null, - ]); - - $sqls = []; - $params = []; - - if (!empty($sorted[CONTEXT_MODULE])) { - list($insql, $inparams) = $DB->get_in_or_equal($sorted[CONTEXT_MODULE], SQL_PARAMS_NAMED); - $sqls[] = "cmid $insql"; - $params = array_merge($params, $inparams); - } - - if (!empty($sorted[CONTEXT_COURSE])) { - list($insql, $inparams) = $DB->get_in_or_equal($sorted[CONTEXT_COURSE], SQL_PARAMS_NAMED); - - $sqls[] = "cmid = 0 AND course $insql"; - $params = array_merge($params, $inparams); - } - - if (!empty($sorted[CONTEXT_SYSTEM])) { - $sqls[] = "course <= 0"; - } - - if (empty($sqls)) { - return [null, null]; - } - - return ['((' . implode(') OR (', $sqls) . '))', $params]; - } -} diff --git a/admin/tool/log/store/legacy/classes/task/cleanup_task.php b/admin/tool/log/store/legacy/classes/task/cleanup_task.php deleted file mode 100644 index 4d0e62aa926..00000000000 --- a/admin/tool/log/store/legacy/classes/task/cleanup_task.php +++ /dev/null @@ -1,69 +0,0 @@ -. - -/** - * Legacy log reader. - * - * @package logstore_legacy - * @copyright 2014 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -namespace logstore_legacy\task; - -defined('MOODLE_INTERNAL') || die(); - -class cleanup_task extends \core\task\scheduled_task { - - /** - * Get a descriptive name for this task (shown to admins). - * - * @return string - */ - public function get_name() { - return get_string('taskcleanup', 'logstore_legacy'); - } - - /** - * Do the job. - * Throw exceptions on errors (the job will be retried). - */ - public function execute() { - global $CFG, $DB; - - if (empty($CFG->loglifetime)) { - return; - } - - $loglifetime = time() - ($CFG->loglifetime * 3600 * 24); // Value in days. - $lifetimep = array($loglifetime); - $start = time(); - - while ($min = $DB->get_field_select("log", "MIN(time)", "time < ?", $lifetimep)) { - // Break this down into chunks to avoid transaction for too long and generally thrashing database. - // Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually. - // If the cleanup has just been enabled, it might take e.g a month to clean the years of logs. - $params = array(min($min + 3600 * 24, $loglifetime)); - $DB->delete_records_select("log", "time < ?", $params); - if (time() > $start + 300) { - // Do not churn on log deletion for too long each run. - break; - } - } - - mtrace(" Deleted old legacy log records"); - } -} diff --git a/admin/tool/log/store/legacy/db/tasks.php b/admin/tool/log/store/legacy/db/tasks.php deleted file mode 100644 index 7aeed6772b0..00000000000 --- a/admin/tool/log/store/legacy/db/tasks.php +++ /dev/null @@ -1,37 +0,0 @@ -. - -/** - * Legacy log reader cron task. - * - * @package logstore_legacy - * @copyright 2014 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); - -$tasks = array( - array( - 'classname' => '\logstore_legacy\task\cleanup_task', - 'blocking' => 0, - 'minute' => 'R', - 'hour' => '5', - 'day' => '*', - 'dayofweek' => '*', - 'month' => '*' - ), -); \ No newline at end of file diff --git a/admin/tool/log/store/legacy/lang/en/logstore_legacy.php b/admin/tool/log/store/legacy/lang/en/logstore_legacy.php deleted file mode 100644 index d40f4cfd180..00000000000 --- a/admin/tool/log/store/legacy/lang/en/logstore_legacy.php +++ /dev/null @@ -1,37 +0,0 @@ -. - -/** - * Legacy log reader lang strings. - * - * @package logstore_legacy - * @copyright 2013 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -$string['eventlegacylogged'] = 'Legacy event logged'; -$string['loglegacy'] = 'Log legacy data'; -$string['loglegacy_help'] = 'This plugin records log data to the legacy log table (mdl_log). This functionality has been replaced by newer, richer and more efficient logging plugins, so you should only run this plugin if you have old custom reports that directly query the old log table. Writing to the legacy logs will increase load, so it is recommended that you disable this plugin for performance reasons when it is not needed.'; -$string['pluginname'] = 'Legacy log'; -$string['pluginname_desc'] = 'A log plugin that stores log entries in the legacy log table.'; -$string['privacy:metadata:log'] = 'A collection of past events'; -$string['privacy:metadata:log:action'] = 'A description of the action'; -$string['privacy:metadata:log:info'] = 'Additional information'; -$string['privacy:metadata:log:ip'] = 'The IP address used at the time of the event'; -$string['privacy:metadata:log:time'] = 'The time when the action took place'; -$string['privacy:metadata:log:url'] = 'The URL related to the event'; -$string['privacy:metadata:log:userid'] = 'The ID of the user who performed the action'; -$string['taskcleanup'] = 'Legacy log table cleanup'; diff --git a/admin/tool/log/store/legacy/settings.php b/admin/tool/log/store/legacy/settings.php deleted file mode 100644 index 0a7149ecb7c..00000000000 --- a/admin/tool/log/store/legacy/settings.php +++ /dev/null @@ -1,52 +0,0 @@ -. - -/** - * Legacy logging settings. - * - * @package logstore_legacy - * @copyright 2014 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); - -if ($hassiteconfig) { - $settings->add(new admin_setting_configcheckbox('logstore_legacy/loglegacy', - new lang_string('loglegacy', 'logstore_legacy'), - new lang_string('loglegacy_help', 'logstore_legacy'), 0)); - - $settings->add(new admin_setting_configcheckbox('logguests', - new lang_string('logguests', 'admin'), - new lang_string('logguests_help', 'admin'), 1)); - - $options = array(0 => new lang_string('neverdeletelogs'), - 1000 => new lang_string('numdays', '', 1000), - 365 => new lang_string('numdays', '', 365), - 180 => new lang_string('numdays', '', 180), - 150 => new lang_string('numdays', '', 150), - 120 => new lang_string('numdays', '', 120), - 90 => new lang_string('numdays', '', 90), - 60 => new lang_string('numdays', '', 60), - 35 => new lang_string('numdays', '', 35), - 10 => new lang_string('numdays', '', 10), - 5 => new lang_string('numdays', '', 5), - 2 => new lang_string('numdays', '', 2)); - - $settings->add(new admin_setting_configselect('loglifetime', - new lang_string('loglifetime', 'admin'), - new lang_string('configloglifetime', 'admin'), 0, $options)); -} diff --git a/admin/tool/log/store/legacy/tests/fixtures/event.php b/admin/tool/log/store/legacy/tests/fixtures/event.php deleted file mode 100644 index 4afb22bd77d..00000000000 --- a/admin/tool/log/store/legacy/tests/fixtures/event.php +++ /dev/null @@ -1,47 +0,0 @@ -. - -/** - * Fixtures for legacy logging testing. - * - * @package logstore_legacy - * @copyright 2014 Petr Skoda - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -namespace logstore_legacy\event; - -defined('MOODLE_INTERNAL') || die(); - - -class unittest_executed extends \core\event\base { - public static function get_name() { - return 'xxx'; - } - - public function get_description() { - return 'yyy'; - } - - protected function init() { - $this->data['crud'] = 'u'; - $this->data['edulevel'] = self::LEVEL_PARTICIPATING; - } - - public function get_url() { - return new \moodle_url('/somepath/somefile.php', array('id' => $this->data['other']['sample'])); - } -} diff --git a/admin/tool/log/store/legacy/tests/fixtures/store.php b/admin/tool/log/store/legacy/tests/fixtures/store.php deleted file mode 100644 index f8fe163ca01..00000000000 --- a/admin/tool/log/store/legacy/tests/fixtures/store.php +++ /dev/null @@ -1,43 +0,0 @@ -. - -/** - * Fixtures for legacy logging testing. - * - * @package logstore_legacy - * @copyright 2014 onwards Ankit Agarwal - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -namespace logstore_legacy\test; - -defined('MOODLE_INTERNAL') || die(); - -class unittest_logstore_legacy extends \logstore_legacy\log\store { - - /** - * Wrapper to make protected method accessible during testing. - * - * @param string $select sql predicate. - * @param array $params sql params. - * @param string $sort sort options. - * - * @return array returns array of sql predicate, params and sorting criteria. - */ - public static function replace_sql_legacy($select, array $params, $sort = '') { - return parent::replace_sql_legacy($select, $params, $sort); - } -} diff --git a/admin/tool/log/store/legacy/tests/privacy/provider_test.php b/admin/tool/log/store/legacy/tests/privacy/provider_test.php deleted file mode 100644 index f42a19d4bbb..00000000000 --- a/admin/tool/log/store/legacy/tests/privacy/provider_test.php +++ /dev/null @@ -1,472 +0,0 @@ -. - -/** - * Data provider tests. - * - * @package logstore_legacy - * @category test - * @copyright 2018 Frédéric Massart - * @author Frédéric Massart - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -namespace logstore_legacy\privacy; - -defined('MOODLE_INTERNAL') || die(); -global $CFG; - -use core_privacy\tests\provider_testcase; -use core_privacy\local\request\contextlist; -use core_privacy\local\request\approved_contextlist; -use core_privacy\local\request\transform; -use core_privacy\local\request\writer; -use logstore_legacy\privacy\provider; -use logstore_legacy\event\unittest_executed; - -require_once(__DIR__ . '/../fixtures/event.php'); - -/** - * Data provider testcase class. - * - * @package logstore_legacy - * @category test - * @copyright 2018 Frédéric Massart - * @author Frédéric Massart - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class provider_test extends provider_testcase { - - public function setUp(): void { - $this->resetAfterTest(); - } - - public function test_get_contexts_for_userid() { - $u1 = $this->getDataGenerator()->create_user(); - $u2 = $this->getDataGenerator()->create_user(); - $u3 = $this->getDataGenerator()->create_user(); - $c1 = $this->getDataGenerator()->create_course(); - $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]); - $sysctx = \context_system::instance(); - $c1ctx = \context_course::instance($c1->id); - $cm1ctx = \context_module::instance($cm1->cmid); - - $this->enable_logging(); - $manager = get_log_manager(true); - - // User 1 is the author. - $this->setUser($u1); - $this->assert_contextlist_equals($this->get_contextlist_for_user($u1), []); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 1]]); - $e->trigger(); - $this->assert_contextlist_equals($this->get_contextlist_for_user($u1), [$cm1ctx]); - - // User 2 is the author. - $this->setUser($u2); - $this->assert_contextlist_equals($this->get_contextlist_for_user($u2), []); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 2]]); - $e->trigger(); - $this->assert_contextlist_equals($this->get_contextlist_for_user($u2), [$cm1ctx]); - - // User 3 is the author. - $this->setUser($u3); - $this->assert_contextlist_equals($this->get_contextlist_for_user($u3), []); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 3]]); - $e->trigger(); - $this->assert_contextlist_equals($this->get_contextlist_for_user($u3), [$sysctx]); - } - - /** - * Test returning user IDs for a given context. - */ - public function test_add_userids_for_context() { - $u1 = $this->getDataGenerator()->create_user(); - $u2 = $this->getDataGenerator()->create_user(); - $u3 = $this->getDataGenerator()->create_user(); - $course = $this->getDataGenerator()->create_course(); - $module = $this->getDataGenerator()->create_module('url', ['course' => $course]); - $sysctx = \context_system::instance(); - $c1ctx = \context_course::instance($course->id); - $cm1ctx = \context_module::instance($module->cmid); - - $userctx = \context_user::instance($u1->id); - - $this->enable_logging(); - $manager = get_log_manager(true); - - $this->setUser($u1); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 1]]); - $e->trigger(); - $this->setUser($u2); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 2]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 3]]); - $e->trigger(); - $this->setUser($u3); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 4]]); - $e->trigger(); - $this->setUser($u1); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 5]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 6]]); - $e->trigger(); - $this->setUser($u2); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 7]]); - $e->trigger(); - $this->setUser($u3); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 8]]); - $e->trigger(); - - // Start with system and check that each of the contexts returns what we expected. - $userlist = new \core_privacy\local\request\userlist($sysctx, 'logstore_legacy'); - provider::add_userids_for_context($userlist); - $systemuserids = $userlist->get_userids(); - $this->assertCount(2, $systemuserids); - $this->assertNotFalse(array_search($u1->id, $systemuserids)); - $this->assertNotFalse(array_search($u2->id, $systemuserids)); - // Check the course context. - $userlist = new \core_privacy\local\request\userlist($c1ctx, 'logstore_legacy'); - provider::add_userids_for_context($userlist); - $courseuserids = $userlist->get_userids(); - $this->assertCount(2, $courseuserids); - $this->assertNotFalse(array_search($u1->id, $courseuserids)); - $this->assertNotFalse(array_search($u3->id, $courseuserids)); - // Check the module context. - $userlist = new \core_privacy\local\request\userlist($cm1ctx, 'logstore_legacy'); - provider::add_userids_for_context($userlist); - $moduleuserids = $userlist->get_userids(); - $this->assertCount(3, $moduleuserids); - $this->assertNotFalse(array_search($u1->id, $moduleuserids)); - $this->assertNotFalse(array_search($u2->id, $moduleuserids)); - $this->assertNotFalse(array_search($u3->id, $moduleuserids)); - } - - public function test_delete_data_for_user() { - global $DB; - - $u1 = $this->getDataGenerator()->create_user(); - $u2 = $this->getDataGenerator()->create_user(); - $u3 = $this->getDataGenerator()->create_user(); - $c1 = $this->getDataGenerator()->create_course(); - $c2 = $this->getDataGenerator()->create_course(); - $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]); - $sysctx = \context_system::instance(); - $c1ctx = \context_course::instance($c1->id); - $c2ctx = \context_course::instance($c2->id); - $cm1ctx = \context_module::instance($cm1->cmid); - - $this->enable_logging(); - $manager = get_log_manager(true); - - // User 1 is the author. - $this->setUser($u1); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 1]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 2]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 3]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 4]]); - $e->trigger(); - - // User 2 is the author. - $this->setUser($u2); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 5]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 6]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 7]]); - $e->trigger(); - - // Assert what we have. - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => 0])); - $this->assertEquals(4, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete other context. - provider::delete_data_for_user(new approved_contextlist($u1, 'logstore_legacy', [$c2ctx->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => 0])); - $this->assertEquals(4, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete system. - provider::delete_data_for_user(new approved_contextlist($u1, 'logstore_legacy', [$sysctx->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => 0])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete course. - provider::delete_data_for_user(new approved_contextlist($u1, 'logstore_legacy', [$c1ctx->id])); - $this->assertTrue($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => 0])); - $this->assertEquals(2, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete course. - provider::delete_data_for_user(new approved_contextlist($u1, 'logstore_legacy', [$cm1ctx->id])); - $this->assertFalse($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['userid' => $u1->id, 'cmid' => 0, 'course' => 0])); - $this->assertEquals(0, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - } - - public function test_delete_data_for_all_users_in_context() { - global $DB; - - $u1 = $this->getDataGenerator()->create_user(); - $u2 = $this->getDataGenerator()->create_user(); - $u3 = $this->getDataGenerator()->create_user(); - $c1 = $this->getDataGenerator()->create_course(); - $c2 = $this->getDataGenerator()->create_course(); - $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]); - $sysctx = \context_system::instance(); - $c1ctx = \context_course::instance($c1->id); - $c2ctx = \context_course::instance($c2->id); - $cm1ctx = \context_module::instance($cm1->cmid); - - $this->enable_logging(); - $manager = get_log_manager(true); - - // User 1 is the author. - $this->setUser($u1); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 1]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 2]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 3]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 4]]); - $e->trigger(); - - // User 2 is the author. - $this->setUser($u2); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 5]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 6]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 7]]); - $e->trigger(); - - // Assert what we have. - $this->assertTrue($DB->record_exists('log', ['cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['cmid' => 0, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['cmid' => 0, 'course' => 0])); - $this->assertEquals(4, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete other context. - provider::delete_data_for_all_users_in_context($c2ctx); - $this->assertTrue($DB->record_exists('log', ['cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['cmid' => 0, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['cmid' => 0, 'course' => 0])); - $this->assertEquals(4, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete system. - provider::delete_data_for_all_users_in_context($sysctx); - $this->assertTrue($DB->record_exists('log', ['cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertTrue($DB->record_exists('log', ['cmid' => 0, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['cmid' => 0, 'course' => 0])); - $this->assertEquals(3, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(2, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete course. - provider::delete_data_for_all_users_in_context($c1ctx); - $this->assertTrue($DB->record_exists('log', ['cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['cmid' => 0, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['cmid' => 0, 'course' => 0])); - $this->assertEquals(2, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(1, $DB->count_records('log', ['userid' => $u2->id])); - - // Delete course. - provider::delete_data_for_all_users_in_context($cm1ctx); - $this->assertFalse($DB->record_exists('log', ['cmid' => $cm1->cmid, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['cmid' => 0, 'course' => $c1->id])); - $this->assertFalse($DB->record_exists('log', ['cmid' => 0, 'course' => 0])); - $this->assertEquals(0, $DB->count_records('log', ['userid' => $u1->id])); - $this->assertEquals(0, $DB->count_records('log', ['userid' => $u2->id])); - } - - /** - * Test the deletion of data for a list of users in a context. - */ - public function test_delete_data_for_userlist() { - global $DB; - - $u1 = $this->getDataGenerator()->create_user(); - $u2 = $this->getDataGenerator()->create_user(); - $u3 = $this->getDataGenerator()->create_user(); - $course = $this->getDataGenerator()->create_course(); - $module = $this->getDataGenerator()->create_module('url', ['course' => $course]); - $sysctx = \context_system::instance(); - $c1ctx = \context_course::instance($course->id); - $cm1ctx = \context_module::instance($module->cmid); - - $userctx = \context_user::instance($u1->id); - - $this->enable_logging(); - $manager = get_log_manager(true); - - $this->setUser($u1); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 1]]); - $e->trigger(); - $this->setUser($u2); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 2]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 3]]); - $e->trigger(); - $this->setUser($u3); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 4]]); - $e->trigger(); - $this->setUser($u1); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 5]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 6]]); - $e->trigger(); - $this->setUser($u2); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 7]]); - $e->trigger(); - $this->setUser($u3); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 8]]); - $e->trigger(); - - // System context deleting one user. - $this->assertEquals(3, $DB->count_records('log', ['cmid' => 0, 'course' => 0])); - $userlist = new \core_privacy\local\request\approved_userlist($sysctx, 'logstore_legacy', [$u2->id]); - provider::delete_data_for_userlist($userlist); - $this->assertEquals(1, $DB->count_records('log', ['cmid' => 0, 'course' => 0])); - - // Course context deleting one user. - $this->assertEquals(2, $DB->count_records('log', ['cmid' => 0, 'course' => $course->id])); - $userlist = new \core_privacy\local\request\approved_userlist($c1ctx, 'logstore_legacy', [$u1->id]); - provider::delete_data_for_userlist($userlist); - $this->assertEquals(1, $DB->count_records('log', ['cmid' => 0, 'course' => $course->id])); - - // Module context deleting two users. - $this->assertEquals(3, $DB->count_records('log', ['cmid' => $module->cmid, 'course' => $course->id])); - $userlist = new \core_privacy\local\request\approved_userlist($cm1ctx, 'logstore_legacy', [$u1->id, $u3->id]); - provider::delete_data_for_userlist($userlist); - $this->assertEquals(1, $DB->count_records('log', ['cmid' => $module->cmid, 'course' => $course->id])); - } - - public function test_export_data_for_user() { - global $DB; - - $u1 = $this->getDataGenerator()->create_user(); - $u2 = $this->getDataGenerator()->create_user(); - $u3 = $this->getDataGenerator()->create_user(); - $c1 = $this->getDataGenerator()->create_course(); - $c2 = $this->getDataGenerator()->create_course(); - $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]); - $sysctx = \context_system::instance(); - $c1ctx = \context_course::instance($c1->id); - $c2ctx = \context_course::instance($c2->id); - $cm1ctx = \context_module::instance($cm1->cmid); - - $this->enable_logging(); - $manager = get_log_manager(true); - $path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_legacy')]; - - // User 1 is the author. - $this->setUser($u1); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 1]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 2]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 3]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 4]]); - $e->trigger(); - - // User 2 is the author. - $this->setUser($u2); - $e = unittest_executed::create(['context' => $cm1ctx, 'other' => ['sample' => 5]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $c1ctx, 'other' => ['sample' => 6]]); - $e->trigger(); - $e = unittest_executed::create(['context' => $sysctx, 'other' => ['sample' => 7]]); - $e->trigger(); - - // Test export. - provider::export_user_data(new approved_contextlist($u1, 'logstore_legacy', [$cm1ctx->id])); - $data = writer::with_context($c1ctx)->get_data($path); - $this->assertEmpty($data); - $data = writer::with_context($cm1ctx)->get_data($path); - $this->assertCount(2, $data->logs); - - writer::reset(); - provider::export_user_data(new approved_contextlist($u1, 'logstore_legacy', [$c1ctx->id])); - $data = writer::with_context($cm1ctx)->get_data($path); - $this->assertEmpty($data); - $data = writer::with_context($c1ctx)->get_data($path); - $this->assertCount(1, $data->logs); - - writer::reset(); - provider::export_user_data(new approved_contextlist($u1, 'logstore_legacy', [$sysctx->id])); - $data = writer::with_context($sysctx)->get_data($path); - $this->assertCount(1, $data->logs); - } - - /** - * Assert the content of a context list. - * - * @param contextlist $contextlist The collection. - * @param array $expected List of expected contexts or IDs. - * @return void - */ - protected function assert_contextlist_equals($contextlist, array $expected) { - $expectedids = array_map(function($context) { - if (is_object($context)) { - return $context->id; - } - return $context; - }, $expected); - $contextids = array_map('intval', $contextlist->get_contextids()); - sort($contextids); - sort($expectedids); - $this->assertEquals($expectedids, $contextids); - } - - /** - * Enable logging. - * - * @return void - */ - protected function enable_logging() { - set_config('enabled_stores', 'logstore_legacy', 'tool_log'); - set_config('loglegacy', 1, 'logstore_legacy'); - get_log_manager(true); - } - - /** - * Get the contextlist for a user. - * - * @param object $user The user. - * @return contextlist - */ - protected function get_contextlist_for_user($user) { - $contextlist = new contextlist(); - provider::add_contexts_for_userid($contextlist, $user->id); - return $contextlist; - } -} diff --git a/admin/tool/log/store/legacy/tests/store_test.php b/admin/tool/log/store/legacy/tests/store_test.php deleted file mode 100644 index 611d8c13daf..00000000000 --- a/admin/tool/log/store/legacy/tests/store_test.php +++ /dev/null @@ -1,264 +0,0 @@ -. - -namespace logstore_legacy; - -defined('MOODLE_INTERNAL') || die(); - -require_once(__DIR__ . '/fixtures/event.php'); -require_once(__DIR__ . '/fixtures/store.php'); - -/** - * Legacy log store tests. - * - * @package logstore_legacy - * @copyright 2014 Petr Skoda {@link http://skodak.org/} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ -class store_test extends \advanced_testcase { - public function test_log_writing() { - global $DB; - $this->resetAfterTest(); - - $this->setAdminUser(); - $user1 = $this->getDataGenerator()->create_user(); - $course1 = $this->getDataGenerator()->create_course(); - $module1 = $this->getDataGenerator()->create_module('resource', array('course' => $course1)); - $course2 = $this->getDataGenerator()->create_course(); - - // Enable legacy logging plugin. - set_config('enabled_stores', 'logstore_legacy', 'tool_log'); - set_config('loglegacy', 1, 'logstore_legacy'); - $manager = get_log_manager(true); - - $stores = $manager->get_readers(); - $this->assertCount(1, $stores); - $this->assertEquals(array('logstore_legacy'), array_keys($stores)); - $store = $stores['logstore_legacy']; - $this->assertInstanceOf('logstore_legacy\log\store', $store); - $this->assertInstanceOf('core\log\sql_reader', $store); - $this->assertTrue($store->is_logging()); - - $logs = $DB->get_records('log', array(), 'id ASC'); - $this->assertCount(0, $logs); - - $this->setCurrentTimeStart(); - - $this->setUser(0); - $event1 = \logstore_legacy\event\unittest_executed::create( - array('context' => \context_module::instance($module1->cmid), 'other' => array('sample' => 5, 'xx' => 10))); - $event1->trigger(); - - $this->setUser($user1); - $event2 = \logstore_legacy\event\unittest_executed::create( - array('context' => \context_course::instance($course2->id), 'other' => array('sample' => 6, 'xx' => 11))); - $event2->trigger(); - - $logs = $DB->get_records('log', array(), 'id ASC'); - $this->assertCount(2, $logs); - - $log = array_shift($logs); - $this->assertNotEmpty($log->id); - $this->assertTimeCurrent($log->time); - $this->assertEquals(0, $log->userid); - $this->assertSame('0.0.0.0', $log->ip); - $this->assertEquals($course1->id, $log->course); - $this->assertSame('core_unittest', $log->module); - $this->assertEquals($module1->cmid, $log->cmid); - $this->assertSame('view', $log->action); - $this->assertSame('unittest.php?id=5', $log->url); - $this->assertSame('bbb', $log->info); - - $oldlogid = $log->id; - $log = array_shift($logs); - $this->assertGreaterThan($oldlogid, $log->id); - $this->assertNotEmpty($log->id); - $this->assertTimeCurrent($log->time); - $this->assertEquals($user1->id, $log->userid); - $this->assertSame('0.0.0.0', $log->ip); - $this->assertEquals($course2->id, $log->course); - $this->assertSame('core_unittest', $log->module); - $this->assertEquals(0, $log->cmid); - $this->assertSame('view', $log->action); - $this->assertSame('unittest.php?id=6', $log->url); - $this->assertSame('bbb', $log->info); - - // Test if disabling works. - set_config('enabled_stores', 'logstore_legacy', 'tool_log'); - set_config('loglegacy', 0, 'logstore_legacy'); - $manager = get_log_manager(true); - $stores = $manager->get_readers(); - $store = $stores['logstore_legacy']; - $this->assertFalse($store->is_logging()); - - \logstore_legacy\event\unittest_executed::create( - array('context' => \context_system::instance(), 'other' => array('sample' => 5, 'xx' => 10)))->trigger(); - $this->assertEquals(2, $DB->count_records('log')); - - // Another way to disable legacy completely. - set_config('enabled_stores', 'logstore_standard', 'tool_log'); - set_config('loglegacy', 1, 'logstore_legacy'); - get_log_manager(true); - - \logstore_legacy\event\unittest_executed::create( - array('context' => \context_system::instance(), 'other' => array('sample' => 5, 'xx' => 10)))->trigger(); - $this->assertEquals(2, $DB->count_records('log')); - // Set everything back. - set_config('enabled_stores', '', 'tool_log'); - set_config('loglegacy', 0, 'logstore_legacy'); - get_log_manager(true); - } - - /** - * Test replace_sql_legacy() - */ - public function test_replace_sql_legacy() { - $selectwhere = "userid = :userid AND courseid = :courseid AND eventname = :eventname AND timecreated > :since"; - $params = array('userid' => 2, 'since' => 3, 'courseid' => 4, 'eventname' => '\core\event\course_created'); - $expectedselect = "module = 'course' AND action = 'new' AND userid = :userid AND url = :url AND time > :since"; - $expectedparams = $params + array('url' => "view.php?id=4"); - - list($replaceselect, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals($replaceselect, $expectedselect); - $this->assertEquals($replaceparams, $expectedparams); - - // Test CRUD related changes. - $selectwhere = "edulevel = 0"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals($selectwhere, $updatewhere); - - $selectwhere = "edulevel = 0 and crud = 'u'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action LIKE '%update%'", $updatewhere); - - $selectwhere = "edulevel = 0 and crud != 'u'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action NOT LIKE '%update%'", $updatewhere); - - $selectwhere = "edulevel = 0 and crud <> 'u'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action NOT LIKE '%update%'", $updatewhere); - - $selectwhere = "edulevel = 0 and crud = 'r'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action LIKE '%view%' OR action LIKE '%report%'", $updatewhere); - - $selectwhere = "edulevel = 0 and crud != 'r'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action NOT LIKE '%view%' AND action NOT LIKE '%report%'", $updatewhere); - - $selectwhere = "edulevel = 0 and crud <> 'r'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action NOT LIKE '%view%' AND action NOT LIKE '%report%'", $updatewhere); - - // The slq is incorrect, since quotes must not be present. Make sure this is not parsed. - $selectwhere = "edulevel = 0 and 'crud' != 'u'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertNotEquals("edulevel = 0 and action NOT LIKE '%update%'", $updatewhere); - - $selectwhere = "edulevel = 0 and crud = 'u' OR crud != 'r' or crud <> 'd'"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("edulevel = 0 and action LIKE '%update%' OR action NOT LIKE '%view%' AND action NOT LIKE '%report%' or action NOT LIKE '%delete%'", $updatewhere); - - // The anonymous select returns all data. - $selectwhere = "anonymous = 0"; - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertSame("0 = 0", $updatewhere); - - // Test legacy field names are mapped. - $selectwhere = "timecreated = :timecreated and courseid = :courseid and contextinstanceid = :contextinstanceid and origin = :origin"; - $params = array('timecreated' => 2, 'courseid' => 3, 'contextinstanceid' => 4, 'origin' => 5 ); - $expectedparams = array('time' => 2, 'course' => 3, 'cmid' => 4, 'ip' => 5); - list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); - $this->assertEquals("time = :time and course = :course and cmid = :cmid and ip = :ip", $updatewhere); - $this->assertSame($expectedparams, $replaceparams); - - // Test sorting parameters. - $selectwhere = "courseid = 3"; - $params = array(); - $sort = 'timecreated DESC'; - list($updatewhere, $replaceparams, $sort) = - \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params, $sort); - $this->assertSame('time DESC', $sort); - - $sort = 'courseid DESC'; - list($updatewhere, $replaceparams, $sort) = - \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params, $sort); - $this->assertSame('course DESC', $sort); - - $sort = 'contextinstanceid DESC'; - list($updatewhere, $replaceparams, $sort) = - \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params, $sort); - $this->assertSame('cmid DESC', $sort); - - $sort = 'origin DESC'; - list($updatewhere, $replaceparams, $sort) = - \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params, $sort); - $this->assertSame('ip DESC', $sort); - } - - /* - * Test logmanager::get_supported_reports returns all reports that require this store. - */ - public function test_get_supported_reports() { - $logmanager = get_log_manager(); - $allreports = \core_component::get_plugin_list('report'); - - // Make sure all supported reports are installed. - $expectedreports = array_intersect_key([ - 'log' => 'report_log', - 'loglive' => 'report_loglive', - 'outline' => 'report_outline', - 'participation' => 'report_participation', - 'stats' => 'report_stats' - ], $allreports); - - $supportedreports = $logmanager->get_supported_reports('logstore_legacy'); - - foreach ($expectedreports as $expectedreport) { - $this->assertArrayHasKey($expectedreport, $supportedreports); - } - } - - /** - * Test that the legacy log cleanup works correctly. - */ - public function test_cleanup_task() { - global $DB; - - $this->resetAfterTest(); - - // Create some records spread over various days; test multiple iterations in cleanup. - $record = (object) array('time' => time()); - $DB->insert_record('log', $record); - $record->time -= 3600 * 24 * 30; - $DB->insert_record('log', $record); - $record->time -= 3600 * 24 * 30; - $DB->insert_record('log', $record); - $record->time -= 3600 * 24 * 30; - $DB->insert_record('log', $record); - $this->assertEquals(4, $DB->count_records('log')); - - // Remove all logs before "today". - set_config('loglifetime', 1); - - $this->expectOutputString(" Deleted old legacy log records\n"); - $clean = new \logstore_legacy\task\cleanup_task(); - $clean->execute(); - - $this->assertEquals(1, $DB->count_records('log')); - } -} diff --git a/admin/tool/log/store/legacy/version.php b/admin/tool/log/store/legacy/version.php deleted file mode 100644 index 495cef4020f..00000000000 --- a/admin/tool/log/store/legacy/version.php +++ /dev/null @@ -1,29 +0,0 @@ -. - -/** - * Legacy log reader. - * - * @package logstore_legacy - * @copyright 2013 Petr Skoda {@link http://skodak.org} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -defined('MOODLE_INTERNAL') || die(); - -$plugin->version = 2022112800; // The current plugin version (Date: YYYYMMDDXX). -$plugin->requires = 2022111800; // Requires this Moodle version. -$plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics). diff --git a/admin/tool/log/tests/manager_test.php b/admin/tool/log/tests/manager_test.php index 46d5af672fc..a9fb357117a 100644 --- a/admin/tool/log/tests/manager_test.php +++ b/admin/tool/log/tests/manager_test.php @@ -36,15 +36,14 @@ class manager_test extends \advanced_testcase { $this->assertCount(0, $stores); $this->assertFileExists("$CFG->dirroot/$CFG->admin/tool/log/store/standard/version.php"); - $this->assertFileExists("$CFG->dirroot/$CFG->admin/tool/log/store/legacy/version.php"); - set_config('enabled_stores', 'logstore_standard,logstore_legacy', 'tool_log'); + set_config('enabled_stores', 'logstore_standard', 'tool_log'); $manager = get_log_manager(true); $this->assertInstanceOf('core\log\manager', $manager); $stores = $manager->get_readers(); $this->assertIsArray($stores); - $this->assertCount(2, $stores); + $this->assertCount(1, $stores); foreach ($stores as $key => $store) { $this->assertIsString($key); $this->assertInstanceOf('core\log\sql_reader', $store); @@ -61,7 +60,7 @@ class manager_test extends \advanced_testcase { $stores = $manager->get_readers('core\log\sql_reader'); $this->assertIsArray($stores); - $this->assertCount(2, $stores); + $this->assertCount(1, $stores); foreach ($stores as $key => $store) { $this->assertIsString($key); $this->assertInstanceOf('core\log\sql_reader', $store); diff --git a/lib/classes/plugin_manager.php b/lib/classes/plugin_manager.php index cbcce1c2b5d..00ab4be4d43 100644 --- a/lib/classes/plugin_manager.php +++ b/lib/classes/plugin_manager.php @@ -1745,6 +1745,7 @@ class core_plugin_manager { 'binarius', 'boxxie', 'brick', 'canvas', 'formal_white', 'formfactor', 'fusion', 'leatherbound', 'magazine', 'mymobile', 'nimble', 'nonzero', 'overlay', 'serenity', 'sky_high', 'splash', 'standard', 'standardold'), + 'logstore' => ['legacy'], 'webservice' => array('amf', 'xmlrpc'), ); @@ -1908,7 +1909,7 @@ class core_plugin_manager { ), 'logstore' => array( - 'database', 'legacy', 'standard', + 'database', 'standard', ), 'ltiservice' => array( diff --git a/mod/forum/report/summary/classes/summary_table.php b/mod/forum/report/summary/classes/summary_table.php index 6e921400e2a..72c32a15c90 100644 --- a/mod/forum/report/summary/classes/summary_table.php +++ b/mod/forum/report/summary/classes/summary_table.php @@ -747,7 +747,7 @@ class summary_table extends table_sql { foreach ($readers as $reader) { // If reader is not a sql_internal_table_reader and not legacy store then return. - if (!($reader instanceof \core\log\sql_internal_table_reader) && !($reader instanceof logstore_legacy\log\store)) { + if (!($reader instanceof \core\log\sql_internal_table_reader)) { continue; } $logreader = $reader; @@ -770,14 +770,8 @@ class summary_table extends table_sql { $this->create_log_summary_temp_table(); - if ($this->logreader instanceof logstore_legacy\log\store) { - $logtable = 'log'; - // Anonymous actions are never logged in legacy log. - $nonanonymous = ''; - } else { - $logtable = $this->logreader->get_internal_log_table_name(); - $nonanonymous = 'AND anonymous = 0'; - } + $logtable = $this->logreader->get_internal_log_table_name(); + $nonanonymous = 'AND anonymous = 0'; // Apply dates filter if applied. $datewhere = $this->sql->filterbase['dateslog'] ?? ''; diff --git a/report/eventlist/classes/list_generator.php b/report/eventlist/classes/list_generator.php index e9dbd034937..6f76b303593 100644 --- a/report/eventlist/classes/list_generator.php +++ b/report/eventlist/classes/list_generator.php @@ -54,7 +54,6 @@ class report_eventlist_list_generator { // List of exceptional events that will cause problems if displayed. $eventsignore = [ \core\event\unknown_logged::class, - \logstore_legacy\event\legacy_logged::class, ]; $eventinformation = []; @@ -248,7 +247,7 @@ class report_eventlist_list_generator { if (method_exists($plugineventname, 'get_static_info')) { if ($detail) { $ref = new \ReflectionClass($plugineventname); - if (!$ref->isAbstract() && $plugintype . '_' . $plugin !== 'logstore_legacy') { + if (!$ref->isAbstract()) { $noncorepluginlist = self::format_data($noncorepluginlist, $plugineventname); } } else { diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php index 4c982f64605..f240d8ebfcb 100644 --- a/report/log/classes/table_log.php +++ b/report/log/classes/table_log.php @@ -274,12 +274,7 @@ class report_log_table_log extends table_sql { */ public function col_eventname($event) { // Event name. - if ($this->filterparams->logreader instanceof logstore_legacy\log\store) { - // Hack for support of logstore_legacy. - $eventname = $event->eventname; - } else { - $eventname = $event->get_name(); - } + $eventname = $event->get_name(); // Only encode as an action link if we're not downloading. if (($url = $event->get_url()) && empty($this->download)) { $eventname = $this->action_link($url, $eventname, 'action'); @@ -370,17 +365,7 @@ class report_log_table_log extends table_sql { global $DB; // In new logs we have a field to pick, and in legacy try get this from action. - if ($this->filterparams->logreader instanceof logstore_legacy\log\store) { - $action = $this->get_legacy_crud_action($this->filterparams->action); - $firstletter = substr($action, 0, 1); - if ($firstletter == '-') { - $sql = $DB->sql_like('action', ':action', false, true, true); - $params['action'] = '%'.substr($action, 1).'%'; - } else { - $sql = $DB->sql_like('action', ':action', false); - $params['action'] = '%'.$action.'%'; - } - } else if (!empty($this->filterparams->action)) { + if (!empty($this->filterparams->action)) { list($sql, $params) = $DB->get_in_or_equal(str_split($this->filterparams->action), SQL_PARAMS_NAMED, 'crud'); $sql = "crud " . $sql; @@ -402,16 +387,10 @@ class report_log_table_log extends table_sql { $joins = array(); $params = array(); - if ($this->filterparams->logreader instanceof logstore_legacy\log\store) { - // The legacy store doesn't support context level. - $joins[] = "cmid = :cmid"; - $params['cmid'] = $this->filterparams->modid; - } else { - $joins[] = "contextinstanceid = :contextinstanceid"; - $joins[] = "contextlevel = :contextmodule"; - $params['contextinstanceid'] = $this->filterparams->modid; - $params['contextmodule'] = CONTEXT_MODULE; - } + $joins[] = "contextinstanceid = :contextinstanceid"; + $joins[] = "contextlevel = :contextmodule"; + $params['contextinstanceid'] = $this->filterparams->modid; + $params['contextmodule'] = CONTEXT_MODULE; $sql = implode(' AND ', $joins); return array($sql, $params); @@ -430,8 +409,7 @@ class report_log_table_log extends table_sql { $params = array(); // If we filter by userid and module id we also need to filter by crud and edulevel to ensure DB index is engaged. - $useextendeddbindex = !($this->filterparams->logreader instanceof logstore_legacy\log\store) - && !empty($this->filterparams->userid) && !empty($this->filterparams->modid); + $useextendeddbindex = !empty($this->filterparams->userid) && !empty($this->filterparams->modid); $groupid = 0; if (!empty($this->filterparams->courseid) && $this->filterparams->courseid != SITEID) { @@ -503,16 +481,14 @@ class report_log_table_log extends table_sql { } } - if (!($this->filterparams->logreader instanceof logstore_legacy\log\store)) { - // Filter out anonymous actions, this is N/A for legacy log because it never stores them. - if ($this->filterparams->modid) { - $context = context_module::instance($this->filterparams->modid); - } else { - $context = context_course::instance($this->filterparams->courseid); - } - if (!has_capability('moodle/site:viewanonymousevents', $context)) { - $joins[] = "anonymous = 0"; - } + // Filter out anonymous actions, this is N/A for legacy log because it never stores them. + if ($this->filterparams->modid) { + $context = context_module::instance($this->filterparams->modid); + } else { + $context = context_course::instance($this->filterparams->courseid); + } + if (!has_capability('moodle/site:viewanonymousevents', $context)) { + $joins[] = "anonymous = 0"; } $selector = implode(' AND ', $joins); diff --git a/report/log/index.php b/report/log/index.php index 8db48419616..82df2860a91 100644 --- a/report/log/index.php +++ b/report/log/index.php @@ -94,11 +94,6 @@ if (($edulevel != -1)) { if ($origin !== '') { $params['origin'] = $origin; } -// Legacy store hack, as edulevel is not supported. -if ($logreader == 'logstore_legacy') { - $params['edulevel'] = -1; - $edulevel = -1; -} $url = new moodle_url("/report/log/index.php", $params); $PAGE->set_url('/report/log/index.php', array('id' => $id)); diff --git a/report/log/locallib.php b/report/log/locallib.php index 24847dafa15..1ac18e333cb 100644 --- a/report/log/locallib.php +++ b/report/log/locallib.php @@ -59,7 +59,7 @@ function report_log_print_graph($course, $user, $typeormode, $date=0, $logreader $reader = $readers[$logreader]; } // If reader is not a sql_internal_table_reader and not legacy store then don't show graph. - if (!($reader instanceof \core\log\sql_internal_table_reader) && !($reader instanceof logstore_legacy\log\store)) { + if (!($reader instanceof \core\log\sql_internal_table_reader)) { return array(); } $coursecontext = context_course::instance($course->id); @@ -114,23 +114,15 @@ function report_log_usercourse($userid, $courseid, $coursestart, $logreader = '' } // If reader is not a sql_internal_table_reader and not legacy store then return. - if (!($reader instanceof \core\log\sql_internal_table_reader) && !($reader instanceof logstore_legacy\log\store)) { + if (!($reader instanceof \core\log\sql_internal_table_reader)) { return array(); } $coursestart = (int)$coursestart; // Note: unfortunately pg complains if you use name parameter or column alias in GROUP BY. - if ($reader instanceof logstore_legacy\log\store) { - $logtable = 'log'; - $timefield = 'time'; - $coursefield = 'course'; - // Anonymous actions are never logged in legacy log. - $nonanonymous = ''; - } else { - $logtable = $reader->get_internal_log_table_name(); - $timefield = 'timecreated'; - $coursefield = 'courseid'; - $nonanonymous = 'AND anonymous = 0'; - } + $logtable = $reader->get_internal_log_table_name(); + $timefield = 'timecreated'; + $coursefield = 'courseid'; + $nonanonymous = 'AND anonymous = 0'; $params = array(); $courseselect = ''; @@ -166,24 +158,16 @@ function report_log_userday($userid, $courseid, $daystart, $logreader = '') { } // If reader is not a sql_internal_table_reader and not legacy store then return. - if (!($reader instanceof \core\log\sql_internal_table_reader) && !($reader instanceof logstore_legacy\log\store)) { + if (!($reader instanceof \core\log\sql_internal_table_reader)) { return array(); } $daystart = (int)$daystart; // Note: unfortunately pg complains if you use name parameter or column alias in GROUP BY. - if ($reader instanceof logstore_legacy\log\store) { - $logtable = 'log'; - $timefield = 'time'; - $coursefield = 'course'; - // Anonymous actions are never logged in legacy log. - $nonanonymous = ''; - } else { - $logtable = $reader->get_internal_log_table_name(); - $timefield = 'timecreated'; - $coursefield = 'courseid'; - $nonanonymous = 'AND anonymous = 0'; - } + $logtable = $reader->get_internal_log_table_name(); + $timefield = 'timecreated'; + $coursefield = 'courseid'; + $nonanonymous = 'AND anonymous = 0'; $params = array('userid' => $userid); $courseselect = ''; diff --git a/report/log/tests/lib_test.php b/report/log/tests/lib_test.php index 4ac092ed46a..722d1b9bb0b 100644 --- a/report/log/tests/lib_test.php +++ b/report/log/tests/lib_test.php @@ -67,7 +67,6 @@ class lib_test extends \advanced_testcase { $supportedstores = array( 'logstore_database' => '\logstore_database\log\store', - 'logstore_legacy' => '\logstore_legacy\log\store', 'logstore_standard' => '\logstore_standard\log\store' ); diff --git a/report/loglive/classes/table_log.php b/report/loglive/classes/table_log.php index 68a5bec38b3..b29951e62dc 100644 --- a/report/loglive/classes/table_log.php +++ b/report/loglive/classes/table_log.php @@ -230,13 +230,7 @@ class report_loglive_table_log extends table_sql { * @return string HTML for the event name column */ public function col_eventname($event) { - // Event name. - if ($this->filterparams->logreader instanceof logstore_legacy\log\store) { - // Hack for support of logstore_legacy. - $eventname = $event->eventname; - } else { - $eventname = $event->get_name(); - } + $eventname = $event->get_name(); if ($url = $event->get_url()) { $eventname = $this->action_link($url, $eventname, 'action'); } diff --git a/report/loglive/tests/lib_test.php b/report/loglive/tests/lib_test.php index d7e099ac39e..5698bfc75ac 100644 --- a/report/loglive/tests/lib_test.php +++ b/report/loglive/tests/lib_test.php @@ -42,8 +42,6 @@ class lib_test extends \advanced_testcase { $allstores = \core_component::get_plugin_list_with_class('logstore', 'log\store'); $supportedstores = array( - 'logstore_database' => '\logstore_legacy\log\database', - 'logstore_legacy' => '\logstore_legacy\log\store', 'logstore_standard' => '\logstore_standard\log\store' ); diff --git a/report/outline/lib.php b/report/outline/lib.php index 7e4cd42df3e..c4eadeef8d9 100644 --- a/report/outline/lib.php +++ b/report/outline/lib.php @@ -119,7 +119,7 @@ function report_outline_page_type_list($pagetype, $parentcontext, $currentcontex * @return bool returns true if the store is supported by the report, false otherwise. */ function report_outline_supports_logstore($instance) { - if ($instance instanceof \core\log\sql_internal_table_reader || $instance instanceof \logstore_legacy\log\store) { + if ($instance instanceof \core\log\sql_internal_table_reader) { return true; } return false; diff --git a/report/outline/locallib.php b/report/outline/locallib.php index 87067cddde6..fe523b1170c 100644 --- a/report/outline/locallib.php +++ b/report/outline/locallib.php @@ -82,11 +82,6 @@ function report_outline_get_common_log_variables() { // Get preferred reader. if (!empty($readers)) { foreach ($readers as $readerpluginname => $reader) { - // If legacy reader is preferred reader. - if ($readerpluginname == 'logstore_legacy') { - $uselegacyreader = true; - } - // If sql_internal_table_reader is preferred reader. if ($reader instanceof \core\log\sql_internal_table_reader) { $useinternalreader = true; diff --git a/report/outline/tests/behat/outline.feature b/report/outline/tests/behat/outline.feature index 6e6526ab248..775d1c00f9b 100644 --- a/report/outline/tests/behat/outline.feature +++ b/report/outline/tests/behat/outline.feature @@ -24,24 +24,6 @@ Feature: View an outline report | book | Book name | | C1 | book1 | When I am on the "Course 1" course page logged in as admin - Scenario: View the outline report when only the legacy log reader is enabled - Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And I click on "Disable" "link" in the "Standard log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - And I am on the "Course 1" course page logged in as student1 - And I follow "Forum name" - And I am on "Course 1" course homepage - And I follow "Book name" - And I am on the "Course 1" course page logged in as student2 - And I follow "Book name" - And I am on the "Course 1" course page logged in as teacher1 - When I navigate to "Reports" in current page administration - And I click on "Activity report" "link" - Then I should see "2 views by 2 users" in the "Book name" "table_row" - And I should see "1 views by 1 users" in the "Forum name" "table_row" - Scenario: View the outline report when only the standard log reader is enabled Given I navigate to "Plugins > Logging > Manage log stores" in site administration And "Enable" "link" should exist in the "Legacy log" "table_row" diff --git a/report/outline/tests/behat/user.feature b/report/outline/tests/behat/user.feature index dc08edcfd55..0f1631bc98c 100644 --- a/report/outline/tests/behat/user.feature +++ b/report/outline/tests/behat/user.feature @@ -24,36 +24,6 @@ Feature: View the user page for the outline report | url | URL name | URL description | C1 | folder1 | http://www.google.com | When I log in as "admin" - Scenario: View the user page when only the legacy log reader is enabled - Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And I click on "Disable" "link" in the "Standard log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - # We want to view this multiple times, to make sure the count is working. - And I follow "Folder name" - And I reload the page - And I reload the page - And I reload the page - # We want to view this multiple times, to make sure the count is working. - And I am on "Course 1" course homepage - And I follow "URL name" - And I reload the page - And I reload the page - And I follow "Profile" in the user menu - And I click on "Course 1" "link" in the "region-main" "region" - When I follow "Outline report" - Then I should see "4 views" in the "Folder name" "table_row" - And I should see "3 views" in the "URL name" "table_row" - And I follow "Profile" in the user menu - And I click on "Course 1" "link" in the "region-main" "region" - And I follow "Complete report" - And I should see "4 views" - And I should see "3 views" - Scenario: View the user page when only the standard log reader is enabled Given I navigate to "Plugins > Logging > Manage log stores" in site administration And "Enable" "link" should exist in the "Legacy log" "table_row" diff --git a/report/outline/tests/lib_test.php b/report/outline/tests/lib_test.php index 71168530438..ecd938e57d9 100644 --- a/report/outline/tests/lib_test.php +++ b/report/outline/tests/lib_test.php @@ -79,7 +79,6 @@ class lib_test extends \advanced_testcase { $allstores = \core_component::get_plugin_list_with_class('logstore', 'log\store'); $supportedstores = array( - 'logstore_legacy' => '\logstore_legacy\log\store', 'logstore_standard' => '\logstore_standard\log\store' ); diff --git a/report/participation/lib.php b/report/participation/lib.php index 75d4904902a..4763b3a6c49 100644 --- a/report/participation/lib.php +++ b/report/participation/lib.php @@ -65,7 +65,7 @@ function report_participation_page_type_list($pagetype, $parentcontext, $current * @return bool returns true if the store is supported by the report, false otherwise. */ function report_participation_supports_logstore($instance) { - if ($instance instanceof \core\log\sql_internal_table_reader || $instance instanceof \logstore_legacy\log\store) { + if ($instance instanceof \core\log\sql_internal_table_reader) { return true; } return false; diff --git a/report/participation/locallib.php b/report/participation/locallib.php index 8ab59b47a9b..45b9d31320c 100644 --- a/report/participation/locallib.php +++ b/report/participation/locallib.php @@ -38,11 +38,6 @@ function report_participation_get_log_table_name() { // Get preferred reader. if (!empty($readers)) { foreach ($readers as $readerpluginname => $reader) { - // If legacy reader is preferred reader. - if ($readerpluginname == 'logstore_legacy') { - break; - } - // If sql_internal_table_reader is preferred reader. if ($reader instanceof \core\log\sql_internal_table_reader) { $logtable = $reader->get_internal_log_table_name(); diff --git a/report/participation/tests/behat/filter_participation.feature b/report/participation/tests/behat/filter_participation.feature index ff36a51c749..e306dd8f756 100644 --- a/report/participation/tests/behat/filter_participation.feature +++ b/report/participation/tests/behat/filter_participation.feature @@ -26,25 +26,6 @@ Feature: In a participation report, admin can filter student actions | title | Test chapter | | content | Test chapter content | - @javascript - Scenario: Filter participation report when only legacy log reader is enabled - Given I log in as "admin" - And I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Disable" "link" in the "Standard log" "table_row" - And I click on "Enable" "link" in the "Legacy log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - - And I am on the "Test book name" "book activity" page logged in as student1 - - When I am on the "Course 1" course page logged in as admin - When I navigate to "Reports" in current page administration - And I click on "Course participation" "link" - And I set the field "instanceid" to "Test book name" - And I set the field "roleid" to "Student" - And I press "Go" - Then I should see "Yes (1)" - @javascript Scenario: Filter participation report when standard log reader is enabled later Given I log in as "admin" diff --git a/report/participation/tests/lib_test.php b/report/participation/tests/lib_test.php index acbecd89b66..fd4cc371e2d 100644 --- a/report/participation/tests/lib_test.php +++ b/report/participation/tests/lib_test.php @@ -42,7 +42,6 @@ class lib_test extends \advanced_testcase { $allstores = \core_component::get_plugin_list_with_class('logstore', 'log\store'); $supportedstores = array( - 'logstore_legacy' => '\logstore_legacy\log\store', 'logstore_standard' => '\logstore_standard\log\store' ); diff --git a/report/stats/lib.php b/report/stats/lib.php index aec2a9d6f04..8cc3f6c8b98 100644 --- a/report/stats/lib.php +++ b/report/stats/lib.php @@ -126,7 +126,7 @@ function report_stats_page_type_list($pagetype, $parentcontext, $currentcontext) * @return bool returns true if the store is supported by the report, false otherwise. */ function report_stats_supports_logstore($instance) { - if ($instance instanceof \core\log\sql_internal_table_reader || $instance instanceof \logstore_legacy\log\store) { + if ($instance instanceof \core\log\sql_internal_table_reader) { return true; } return false; diff --git a/report/stats/tests/lib_test.php b/report/stats/tests/lib_test.php index 77c0e86c5f1..0da9f424606 100644 --- a/report/stats/tests/lib_test.php +++ b/report/stats/tests/lib_test.php @@ -64,7 +64,6 @@ class lib_test extends \advanced_testcase { $allstores = \core_component::get_plugin_list_with_class('logstore', 'log\store'); $supportedstores = array( - 'logstore_legacy' => '\logstore_legacy\log\store', 'logstore_standard' => '\logstore_standard\log\store' ); From 00747e26419011f49aca6a64d37593d0a28ae16b Mon Sep 17 00:00:00 2001 From: Mathew May Date: Mon, 16 Jan 2023 10:09:17 +0800 Subject: [PATCH 5/5] MDL-52805 core: Remove references to old logging in behat --- report/log/tests/behat/filter_log.feature | 46 ------------------ .../tests/behat/loglive_report.feature | 47 ++----------------- report/outline/tests/behat/filter.feature | 2 - report/outline/tests/behat/outline.feature | 20 -------- report/outline/tests/behat/user.feature | 31 ------------ .../tests/behat/filter_participation.feature | 6 +-- 6 files changed, 6 insertions(+), 146 deletions(-) diff --git a/report/log/tests/behat/filter_log.feature b/report/log/tests/behat/filter_log.feature index b81bad70e1e..41ab52762e7 100644 --- a/report/log/tests/behat/filter_log.feature +++ b/report/log/tests/behat/filter_log.feature @@ -21,30 +21,6 @@ Feature: In a report, admin can filter log data | alternativefullnameformat | middlename, alternatename, firstname, lastname | And I log in as "admin" - Scenario: Filter log report for standard and legacy log reader - Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - And I am on homepage - And I am on "Course 1" course homepage - And I navigate to course participants - And I follow "Ann, Jill, Grainne, Beauchamp" - And I click on "Log in as" "link" - And I press "Continue" - And I log out - And I log in as "admin" - When I navigate to "Reports > Logs" in site administration - And I set the field "id" to "Acceptance test site (Site)" - And I set the field "user" to "All participants" - And I set the field "logreader" to "Standard log" - And I press "Get these logs" - Then I should see "User logged in as another user" - And I set the field "logreader" to "Legacy log" - And I press "Get these logs" - And I should see "user login" - And I should not see "Nothing to display" - Scenario: Filter log report for standard log reader Given I am on "Course 1" course homepage And I navigate to course participants @@ -58,25 +34,3 @@ Feature: In a report, admin can filter log data And I set the field "user" to "All participants" And I press "Get these logs" Then I should see "User logged in as another user" - - Scenario: Filter log report for legacy log reader - Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And I click on "Disable" "link" in the "Standard log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - And I am on homepage - And I am on "Course 1" course homepage - And I am on homepage - And I am on "Course 1" course homepage - And I navigate to course participants - And I follow "Ann, Jill, Grainne, Beauchamp" - And I click on "Log in as" "link" - And I press "Continue" - And I log out - And I log in as "admin" - When I navigate to "Reports > Logs" in site administration - And I set the field "id" to "Acceptance test site (Site)" - And I set the field "user" to "All participants" - And I press "Get these logs" - Then I should see "user login" diff --git a/report/loglive/tests/behat/loglive_report.feature b/report/loglive/tests/behat/loglive_report.feature index 1d10cb0ce65..9903d241855 100644 --- a/report/loglive/tests/behat/loglive_report.feature +++ b/report/loglive/tests/behat/loglive_report.feature @@ -18,31 +18,21 @@ Feature: In a report, admin can see loglive data | fullnamedisplay | firstname | | alternativefullnameformat | middlename, alternatename, firstname, lastname | And I log in as "admin" - And I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | And I am on "Course 1" course homepage with editing mode on And I add a "Database" to section "3" and I fill the form with: | Name | Test name | | Description | Test database description | @javascript - Scenario: Check loglive report entries and make sure the report works for standard and legacy reader + Scenario: Check loglive report entries and make sure the report works for standard reader Given I navigate to "Reports > Live logs" in site administration - When I set the field "reader" to "Standard log" - Then I should see "Course module created" - And I should see "Test name" - And I set the field "reader" to "Legacy log" - And I wait to be redirected - And I should see "course_add mod" + When I should see "Course module created" + Then I should see "Test name" @javascript @_switch_window Scenario: Check loglive report entries and make sure the pause/resume button works for standard reader along with ajax calls Given I am on site homepage When I navigate to "Reports > Live logs" in site administration - And I set the field "reader" to "Standard log" - And I wait to be redirected And I should not see "Test name2" And I press "Pause live updates" And I follow "Course module created" @@ -60,42 +50,13 @@ Feature: In a report, admin can see loglive data And I wait "8" seconds And I should see "Test name2" - @javascript @_switch_window - Scenario: Check loglive report entries and make sure the pause/resume button works for legacy reader along with ajax calls - Given I am on site homepage - When I navigate to "Reports > Live logs" in site administration - And I set the field "reader" to "Legacy log" - And I wait to be redirected - And I should not see "Test name2" - And I press "Pause live updates" - And I follow "course_add mod" - And I switch to "action" window - And I am on "Course 1" course homepage - And I change window size to "large" - And I reload the page - And I add a "Database" to section "3" and I fill the form with: - | Name | Test name2 | - | Description | Test database description | - And I switch to the main window - And I wait "8" seconds - Then I should not see "Test name2" - And I press "Resume live updates" - And I wait "8" seconds - And I should see "Test name2" - @javascript Scenario: Check course loglive report entries for a user Given I log out And I am on the "Test name" "data activity" page logged in as student1 And I log out And I am on the "Course 1" Course page logged in as admin - And I navigate to "Reports > Live logs" in site administration - When I set the field "reader" to "Standard log" + When I navigate to "Reports > Live logs" in site administration Then I should see "Course module viewed" And I should see "Test name" And I should see "Ann, Jill, Grainne, Beauchamp" - And I set the field "reader" to "Legacy log" - And I wait to be redirected - And I should see "course_add mod" - And I wait "8" seconds - And I should see "Test name" diff --git a/report/outline/tests/behat/filter.feature b/report/outline/tests/behat/filter.feature index b4c9071c02b..e5571df5111 100644 --- a/report/outline/tests/behat/filter.feature +++ b/report/outline/tests/behat/filter.feature @@ -26,7 +26,6 @@ Feature: Filter an outline report Scenario: Filter the outline report by start date Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And "Enable" "link" should exist in the "Legacy log" "table_row" And "Disable" "link" should exist in the "Standard log" "table_row" And I am on the "Course 1" course page logged in as student1 And I follow "Forum name" @@ -52,7 +51,6 @@ Feature: Filter an outline report Scenario: Filter the outline report by end date Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And "Enable" "link" should exist in the "Legacy log" "table_row" And "Disable" "link" should exist in the "Standard log" "table_row" And I am on the "Course 1" course page logged in as student1 And I follow "Forum name" diff --git a/report/outline/tests/behat/outline.feature b/report/outline/tests/behat/outline.feature index 775d1c00f9b..2e0e647de95 100644 --- a/report/outline/tests/behat/outline.feature +++ b/report/outline/tests/behat/outline.feature @@ -26,7 +26,6 @@ Feature: View an outline report Scenario: View the outline report when only the standard log reader is enabled Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And "Enable" "link" should exist in the "Legacy log" "table_row" And "Disable" "link" should exist in the "Standard log" "table_row" And I am on the "Course 1" course page logged in as student1 And I follow "Forum name" @@ -40,27 +39,8 @@ Feature: View an outline report Then I should see "2 views by 2 users" in the "Book name" "table_row" And I should see "1 views by 1 users" in the "Forum name" "table_row" - Scenario: View the outline report when both the standard and legacy log readers are enabled - Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And "Disable" "link" should exist in the "Standard log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - And I am on the "Course 1" course page logged in as student1 - And I follow "Forum name" - And I am on "Course 1" course homepage - And I follow "Book name" - And I am on the "Course 1" course page logged in as student2 - And I follow "Book name" - And I am on the "Course 1" course page logged in as teacher1 - When I navigate to "Reports" in current page administration - And I click on "Activity report" "link" - Then I should see "2 views by 2 users" in the "Book name" "table_row" - And I should see "1 views by 1 users" in the "Forum name" "table_row" - Scenario: View the outline report when no log reader is enabled Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And "Enable" "link" should exist in the "Legacy log" "table_row" And I click on "Disable" "link" in the "Standard log" "table_row" And I am on "Course 1" course homepage When I navigate to "Reports" in current page administration diff --git a/report/outline/tests/behat/user.feature b/report/outline/tests/behat/user.feature index 0f1631bc98c..20d1c4f76af 100644 --- a/report/outline/tests/behat/user.feature +++ b/report/outline/tests/behat/user.feature @@ -26,7 +26,6 @@ Feature: View the user page for the outline report Scenario: View the user page when only the standard log reader is enabled Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And "Enable" "link" should exist in the "Legacy log" "table_row" And "Disable" "link" should exist in the "Standard log" "table_row" And I log out And I log in as "student1" @@ -52,36 +51,6 @@ Feature: View the user page for the outline report And I should see "4 views" And I should see "3 views" - Scenario: View the user page when both the standard and legacy log readers are enabled - Given I navigate to "Plugins > Logging > Manage log stores" in site administration - And I click on "Enable" "link" in the "Legacy log" "table_row" - And "Disable" "link" should exist in the "Standard log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - # We want to view this multiple times, to make sure the count is working. - And I follow "Folder name" - And I reload the page - And I reload the page - And I reload the page - And I am on "Course 1" course homepage - # We want to view this multiple times, to make sure the count is working. - And I follow "URL name" - And I reload the page - And I reload the page - And I follow "Profile" in the user menu - And I click on "Course 1" "link" in the "region-main" "region" - When I follow "Outline report" - Then I should see "4 views" in the "Folder name" "table_row" - And I should see "3 views" in the "URL name" "table_row" - And I follow "Profile" in the user menu - And I click on "Course 1" "link" in the "region-main" "region" - When I follow "Complete report" - And I should see "4 views" - And I should see "3 views" - Scenario: View the user complete report page when there is a no-grade forum Given the following "activities" exist: | activity | name | description | course | idnumber | diff --git a/report/participation/tests/behat/filter_participation.feature b/report/participation/tests/behat/filter_participation.feature index e306dd8f756..3b485081e9a 100644 --- a/report/participation/tests/behat/filter_participation.feature +++ b/report/participation/tests/behat/filter_participation.feature @@ -31,9 +31,7 @@ Feature: In a participation report, admin can filter student actions Given I log in as "admin" And I navigate to "Plugins > Logging > Manage log stores" in site administration And I click on "Disable" "link" in the "Standard log" "table_row" - And I click on "Enable" "link" in the "Legacy log" "table_row" - And the following config values are set as admin: - | loglegacy | 1 | logstore_legacy | + And I log out And I am on the "Test book name" "book activity" page logged in as student1 And I log out @@ -50,7 +48,7 @@ Feature: In a participation report, admin can filter student actions And I set the field "instanceid" to "Test book name" And I set the field "roleid" to "Student" And I press "Go" - Then I should see "Yes (2)" + Then I should see "Yes (1)" @javascript Scenario: Filter participation report when only standard log reader is enabled by default