diff --git a/lib/classes/event/assessable_submitted.php b/lib/classes/event/assessable_submitted.php index a889e3e2d70..8f49ae19b23 100644 --- a/lib/classes/event/assessable_submitted.php +++ b/lib/classes/event/assessable_submitted.php @@ -49,7 +49,7 @@ abstract class assessable_submitted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/assessable_uploaded.php b/lib/classes/event/assessable_uploaded.php index 46aa825a1c5..efdc7ec65a4 100644 --- a/lib/classes/event/assessable_uploaded.php +++ b/lib/classes/event/assessable_uploaded.php @@ -56,7 +56,7 @@ abstract class assessable_uploaded extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/base.php b/lib/classes/event/base.php index 6cbcbe223b5..d1cbe32c9a1 100644 --- a/lib/classes/event/base.php +++ b/lib/classes/event/base.php @@ -40,7 +40,7 @@ defined('MOODLE_INTERNAL') || die(); * @property-read string $objecttable name of database table where is object record stored * @property-read int $objectid optional id of the object * @property-read string $crud letter indicating event type - * @property-read int $level log level (number between 1 and 100) + * @property-read int $edulevel log level (one of the constants LEVEL_) * @property-read int $contextid * @property-read int $contextlevel * @property-read int $contextinstanceid @@ -101,7 +101,7 @@ abstract class base implements \IteratorAggregate { /** @var array list of event properties */ private static $fields = array( - 'eventname', 'component', 'action', 'target', 'objecttable', 'objectid', 'crud', 'level', 'contextid', + 'eventname', 'component', 'action', 'target', 'objecttable', 'objectid', 'crud', 'edulevel', 'contextid', 'contextlevel', 'contextinstanceid', 'userid', 'courseid', 'relateduserid', 'other', 'timecreated'); @@ -148,7 +148,7 @@ abstract class base implements \IteratorAggregate { * @throws \coding_exception */ public static final function create(array $data = null) { - global $PAGE, $USER, $CFG; + global $USER, $CFG; $data = (array)$data; @@ -161,6 +161,14 @@ abstract class base implements \IteratorAggregate { // Set static event data specific for child class. $event->init(); + if (isset($event->data['level'])) { + if (!isset($event->data['edulevel'])) { + debugging('level property is deprecated, use edulevel property instead', DEBUG_DEVELOPER); + $event->data['edulevel'] = $event->data['level']; + } + unset($event->data['level']); + } + // Set automatic data. $event->data['timecreated'] = time(); @@ -205,7 +213,7 @@ abstract class base implements \IteratorAggregate { // Warn developers if they do something wrong. if ($CFG->debugdeveloper) { static $automatickeys = array('eventname', 'component', 'action', 'target', 'contextlevel', 'contextinstanceid', 'timecreated'); - static $initkeys = array('crud', 'level', 'objecttable'); + static $initkeys = array('crud', 'level', 'objecttable', 'edulevel'); foreach ($data as $key => $ignored) { if ($key === 'context') { @@ -234,7 +242,7 @@ abstract class base implements \IteratorAggregate { * * Set all required data properties: * 1/ crud - letter [crud] - * 2/ level - using a constant self::LEVEL_*. + * 2/ edulevel - using a constant self::LEVEL_*. * 3/ objecttable - name of database table if objectid specified * * Optionally it can set: @@ -362,7 +370,7 @@ abstract class base implements \IteratorAggregate { /** * Return standardised event data as array. * - * @return array + * @return array All elements are scalars except the 'other' field which is array. */ public function get_data() { return $this->data; @@ -371,7 +379,9 @@ abstract class base implements \IteratorAggregate { /** * Return auxiliary data that was stored in logs. * - * TODO MDL-41331: Properly define this method once logging is finalised. + * List of standard properties: + * - origin: IP number, cli,cron + * - realuserid: id of the user when logged-in-as * * @return array the format is standardised by logging API */ @@ -425,8 +435,8 @@ abstract class base implements \IteratorAggregate { if (empty($this->data['crud'])) { throw new \coding_exception('crud must be specified in init() method of each method'); } - if (!isset($this->data['level'])) { - throw new \coding_exception('level must be specified in init() method of each method'); + if (!isset($this->data['edulevel'])) { + throw new \coding_exception('edulevel must be specified in init() method of each method'); } if (!empty($this->data['objectid']) and empty($this->data['objecttable'])) { throw new \coding_exception('objecttable must be specified in init() method if objectid present'); @@ -439,9 +449,9 @@ abstract class base implements \IteratorAggregate { if (!in_array($this->data['crud'], array('c', 'r', 'u', 'd'), true)) { debugging("Invalid event crud value specified.", DEBUG_DEVELOPER); } - if (!in_array($this->data['level'], array(self::LEVEL_OTHER, self::LEVEL_TEACHING, self::LEVEL_PARTICIPATING))) { + if (!in_array($this->data['edulevel'], array(self::LEVEL_OTHER, self::LEVEL_TEACHING, self::LEVEL_PARTICIPATING))) { // Bitwise combination of levels is not allowed at this stage. - debugging('Event property level must a constant value, see event_base::LEVEL_*', DEBUG_DEVELOPER); + debugging('Event property edulevel must a constant value, see event_base::LEVEL_*', DEBUG_DEVELOPER); } if (self::$fields !== array_keys($this->data)) { debugging('Number of event data fields must not be changed in event classes', DEBUG_DEVELOPER); @@ -601,6 +611,10 @@ abstract class base implements \IteratorAggregate { * @return mixed */ public function __get($name) { + if ($name === 'level') { + debugging('level property is deprecated, use edulevel property instead', DEBUG_DEVELOPER); + return $this->data['edulevel']; + } if (array_key_exists($name, $this->data)) { return $this->data[$name]; } @@ -630,6 +644,10 @@ abstract class base implements \IteratorAggregate { * @return bool */ public function __isset($name) { + if ($name === 'level') { + debugging('level property is deprecated, use edulevel property instead', DEBUG_DEVELOPER); + return isset($this->data['edulevel']); + } return isset($this->data[$name]); } diff --git a/lib/classes/event/blog_association_created.php b/lib/classes/event/blog_association_created.php index 0e7da1c9e20..f09d4d7b07d 100644 --- a/lib/classes/event/blog_association_created.php +++ b/lib/classes/event/blog_association_created.php @@ -51,7 +51,7 @@ class blog_association_created extends \core\event\base { $this->context = \context_system::instance(); $this->data['objecttable'] = 'blog_association'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/blog_entries_viewed.php b/lib/classes/event/blog_entries_viewed.php index d0119faaf03..6da91bb9aa5 100644 --- a/lib/classes/event/blog_entries_viewed.php +++ b/lib/classes/event/blog_entries_viewed.php @@ -50,7 +50,7 @@ class blog_entries_viewed extends base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/blog_entry_created.php b/lib/classes/event/blog_entry_created.php index 4e1518a970f..149d8438af9 100644 --- a/lib/classes/event/blog_entry_created.php +++ b/lib/classes/event/blog_entry_created.php @@ -47,7 +47,7 @@ class blog_entry_created extends \core\event\base { $this->context = \context_system::instance(); $this->data['objecttable'] = 'post'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/blog_entry_deleted.php b/lib/classes/event/blog_entry_deleted.php index b7275d53963..f341739d510 100644 --- a/lib/classes/event/blog_entry_deleted.php +++ b/lib/classes/event/blog_entry_deleted.php @@ -46,7 +46,7 @@ class blog_entry_deleted extends \core\event\base { $this->context = \context_system::instance(); $this->data['objecttable'] = 'post'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/blog_entry_updated.php b/lib/classes/event/blog_entry_updated.php index 777ac2ecb8c..25305113a86 100644 --- a/lib/classes/event/blog_entry_updated.php +++ b/lib/classes/event/blog_entry_updated.php @@ -45,7 +45,7 @@ class blog_entry_updated extends base { $this->context = \context_system::instance(); $this->data['objecttable'] = 'post'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/cohort_created.php b/lib/classes/event/cohort_created.php index 0db4d7b6839..cfe435df392 100644 --- a/lib/classes/event/cohort_created.php +++ b/lib/classes/event/cohort_created.php @@ -41,7 +41,7 @@ class cohort_created extends base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'cohort'; } diff --git a/lib/classes/event/cohort_deleted.php b/lib/classes/event/cohort_deleted.php index b43b110032f..0844565f028 100644 --- a/lib/classes/event/cohort_deleted.php +++ b/lib/classes/event/cohort_deleted.php @@ -41,7 +41,7 @@ class cohort_deleted extends base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'cohort'; } diff --git a/lib/classes/event/cohort_member_added.php b/lib/classes/event/cohort_member_added.php index a7e52eb0c4d..8dc153d2d45 100644 --- a/lib/classes/event/cohort_member_added.php +++ b/lib/classes/event/cohort_member_added.php @@ -41,7 +41,7 @@ class cohort_member_added extends base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'cohort'; } diff --git a/lib/classes/event/cohort_member_removed.php b/lib/classes/event/cohort_member_removed.php index b3f47bd7d50..e42868a97f4 100644 --- a/lib/classes/event/cohort_member_removed.php +++ b/lib/classes/event/cohort_member_removed.php @@ -42,7 +42,7 @@ class cohort_member_removed extends base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'cohort'; } diff --git a/lib/classes/event/cohort_updated.php b/lib/classes/event/cohort_updated.php index f9b6a0756d8..7ee12269c39 100644 --- a/lib/classes/event/cohort_updated.php +++ b/lib/classes/event/cohort_updated.php @@ -41,7 +41,7 @@ class cohort_updated extends base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'cohort'; } diff --git a/lib/classes/event/comment_created.php b/lib/classes/event/comment_created.php index ffd88746c1f..09935b8b22f 100644 --- a/lib/classes/event/comment_created.php +++ b/lib/classes/event/comment_created.php @@ -50,7 +50,7 @@ abstract class comment_created extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'comments'; } diff --git a/lib/classes/event/comment_deleted.php b/lib/classes/event/comment_deleted.php index fca147248ea..2c20348caf0 100644 --- a/lib/classes/event/comment_deleted.php +++ b/lib/classes/event/comment_deleted.php @@ -50,7 +50,7 @@ abstract class comment_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'comments'; } diff --git a/lib/classes/event/comments_viewed.php b/lib/classes/event/comments_viewed.php index 05618f08c7d..a048d01dbfd 100644 --- a/lib/classes/event/comments_viewed.php +++ b/lib/classes/event/comments_viewed.php @@ -44,7 +44,7 @@ abstract class comments_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/content_viewed.php b/lib/classes/event/content_viewed.php index 17f032808b2..10c25942054 100644 --- a/lib/classes/event/content_viewed.php +++ b/lib/classes/event/content_viewed.php @@ -61,7 +61,7 @@ abstract class content_viewed extends base { global $PAGE; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->context = $PAGE->context; } diff --git a/lib/classes/event/course_category_created.php b/lib/classes/event/course_category_created.php index 33a4ea1a970..b049a8a6804 100644 --- a/lib/classes/event/course_category_created.php +++ b/lib/classes/event/course_category_created.php @@ -33,7 +33,7 @@ class course_category_created extends base { protected function init() { $this->data['objecttable'] = 'course_categories'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/course_category_deleted.php b/lib/classes/event/course_category_deleted.php index a856ef134e1..881d84bb563 100644 --- a/lib/classes/event/course_category_deleted.php +++ b/lib/classes/event/course_category_deleted.php @@ -44,7 +44,7 @@ class course_category_deleted extends base { protected function init() { $this->data['objecttable'] = 'course_categories'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/course_category_updated.php b/lib/classes/event/course_category_updated.php index 978c9e43dfc..1a0055f38e8 100644 --- a/lib/classes/event/course_category_updated.php +++ b/lib/classes/event/course_category_updated.php @@ -36,7 +36,7 @@ class course_category_updated extends base { protected function init() { $this->data['objecttable'] = 'course_categories'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/course_completed.php b/lib/classes/event/course_completed.php index 6e42b60bece..300bcdca4df 100644 --- a/lib/classes/event/course_completed.php +++ b/lib/classes/event/course_completed.php @@ -33,7 +33,7 @@ class course_completed extends base { protected function init() { $this->data['objecttable'] = 'course_completions'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/course_completion_updated.php b/lib/classes/event/course_completion_updated.php index 36a3d80bcf8..9ffa4f6af98 100644 --- a/lib/classes/event/course_completion_updated.php +++ b/lib/classes/event/course_completion_updated.php @@ -40,7 +40,7 @@ class course_completion_updated extends base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/course_content_deleted.php b/lib/classes/event/course_content_deleted.php index d5b6624a900..05a59d17277 100644 --- a/lib/classes/event/course_content_deleted.php +++ b/lib/classes/event/course_content_deleted.php @@ -39,7 +39,7 @@ class course_content_deleted extends base { protected function init() { $this->data['objecttable'] = 'course'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_created.php b/lib/classes/event/course_created.php index 57eb640570c..93e6bab3bfa 100644 --- a/lib/classes/event/course_created.php +++ b/lib/classes/event/course_created.php @@ -40,7 +40,7 @@ class course_created extends base { protected function init() { $this->data['objecttable'] = 'course'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_deleted.php b/lib/classes/event/course_deleted.php index 0580e7c5eed..357b9cde51e 100644 --- a/lib/classes/event/course_deleted.php +++ b/lib/classes/event/course_deleted.php @@ -41,7 +41,7 @@ class course_deleted extends base { protected function init() { $this->data['objecttable'] = 'course'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_module_completion_updated.php b/lib/classes/event/course_module_completion_updated.php index 7436e834738..86fe91f0ca0 100644 --- a/lib/classes/event/course_module_completion_updated.php +++ b/lib/classes/event/course_module_completion_updated.php @@ -33,7 +33,7 @@ class course_module_completion_updated extends base { protected function init() { $this->data['objecttable'] = 'course_modules_completion'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/course_module_created.php b/lib/classes/event/course_module_created.php index 2c481a8f64f..bc4d75fcc93 100644 --- a/lib/classes/event/course_module_created.php +++ b/lib/classes/event/course_module_created.php @@ -50,7 +50,7 @@ class course_module_created extends base { protected function init() { $this->data['objecttable'] = 'course_modules'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_module_deleted.php b/lib/classes/event/course_module_deleted.php index d00a43a140b..4c58a3db9b1 100644 --- a/lib/classes/event/course_module_deleted.php +++ b/lib/classes/event/course_module_deleted.php @@ -49,7 +49,7 @@ class course_module_deleted extends base { protected function init() { $this->data['objecttable'] = 'course_modules'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_module_instance_list_viewed.php b/lib/classes/event/course_module_instance_list_viewed.php index de0e5535894..cf94035cf06 100644 --- a/lib/classes/event/course_module_instance_list_viewed.php +++ b/lib/classes/event/course_module_instance_list_viewed.php @@ -52,7 +52,7 @@ abstract class course_module_instance_list_viewed extends base{ */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; if (strstr($this->component, 'mod_') === false) { throw new \coding_exception('The event name or namespace is invalid.'); } else { diff --git a/lib/classes/event/course_module_updated.php b/lib/classes/event/course_module_updated.php index 99e61f80a46..9c4e1cfb988 100644 --- a/lib/classes/event/course_module_updated.php +++ b/lib/classes/event/course_module_updated.php @@ -50,7 +50,7 @@ class course_module_updated extends base { protected function init() { $this->data['objecttable'] = 'course_modules'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_module_viewed.php b/lib/classes/event/course_module_viewed.php index 7b45a259f1a..43e1504dfe5 100644 --- a/lib/classes/event/course_module_viewed.php +++ b/lib/classes/event/course_module_viewed.php @@ -45,7 +45,7 @@ abstract class course_module_viewed extends base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/lib/classes/event/course_reset_ended.php b/lib/classes/event/course_reset_ended.php index 5c8f280b357..1b8fdb8a0cd 100644 --- a/lib/classes/event/course_reset_ended.php +++ b/lib/classes/event/course_reset_ended.php @@ -74,7 +74,7 @@ class course_reset_ended extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/course_reset_started.php b/lib/classes/event/course_reset_started.php index f28d6de39d4..8a2be3c8cb8 100644 --- a/lib/classes/event/course_reset_started.php +++ b/lib/classes/event/course_reset_started.php @@ -74,7 +74,7 @@ class course_reset_started extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/course_restored.php b/lib/classes/event/course_restored.php index 8e7af36651b..02a9dd2eaa6 100644 --- a/lib/classes/event/course_restored.php +++ b/lib/classes/event/course_restored.php @@ -43,7 +43,7 @@ class course_restored extends base { protected function init() { $this->data['objecttable'] = 'course'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_section_updated.php b/lib/classes/event/course_section_updated.php index 60760e596b1..bec63f3ba06 100644 --- a/lib/classes/event/course_section_updated.php +++ b/lib/classes/event/course_section_updated.php @@ -49,7 +49,7 @@ class course_section_updated extends base { protected function init() { $this->data['objecttable'] = 'course_sections'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/course_updated.php b/lib/classes/event/course_updated.php index 47ab3affda5..1ca540759f0 100644 --- a/lib/classes/event/course_updated.php +++ b/lib/classes/event/course_updated.php @@ -43,7 +43,7 @@ class course_updated extends base { protected function init() { $this->data['objecttable'] = 'course'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/lib/classes/event/email_failed.php b/lib/classes/event/email_failed.php index 1f561e98078..40affbd0e5a 100644 --- a/lib/classes/event/email_failed.php +++ b/lib/classes/event/email_failed.php @@ -32,7 +32,7 @@ class email_failed extends base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/group_created.php b/lib/classes/event/group_created.php index f6478cab3d7..ff92010ae8e 100644 --- a/lib/classes/event/group_created.php +++ b/lib/classes/event/group_created.php @@ -86,7 +86,7 @@ class group_created extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groups'; } diff --git a/lib/classes/event/group_deleted.php b/lib/classes/event/group_deleted.php index 6f0e4371f45..e1cfca4d82f 100644 --- a/lib/classes/event/group_deleted.php +++ b/lib/classes/event/group_deleted.php @@ -86,7 +86,7 @@ class group_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groups'; } diff --git a/lib/classes/event/group_member_added.php b/lib/classes/event/group_member_added.php index 6855e155712..2c1cf28a8bf 100644 --- a/lib/classes/event/group_member_added.php +++ b/lib/classes/event/group_member_added.php @@ -98,7 +98,7 @@ class group_member_added extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groups'; } diff --git a/lib/classes/event/group_member_removed.php b/lib/classes/event/group_member_removed.php index eac1ec221ec..cc5fd2660cd 100644 --- a/lib/classes/event/group_member_removed.php +++ b/lib/classes/event/group_member_removed.php @@ -89,7 +89,7 @@ class group_member_removed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groups'; } diff --git a/lib/classes/event/group_updated.php b/lib/classes/event/group_updated.php index 51c1a1245f8..8631ca4993d 100644 --- a/lib/classes/event/group_updated.php +++ b/lib/classes/event/group_updated.php @@ -86,7 +86,7 @@ class group_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groups'; } diff --git a/lib/classes/event/grouping_created.php b/lib/classes/event/grouping_created.php index 1d331cfa5b4..b5c815a7583 100644 --- a/lib/classes/event/grouping_created.php +++ b/lib/classes/event/grouping_created.php @@ -93,7 +93,7 @@ class grouping_created extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groupings'; } diff --git a/lib/classes/event/grouping_deleted.php b/lib/classes/event/grouping_deleted.php index 92ccb1edb99..0176cc9921a 100644 --- a/lib/classes/event/grouping_deleted.php +++ b/lib/classes/event/grouping_deleted.php @@ -93,7 +93,7 @@ class grouping_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groupings'; } diff --git a/lib/classes/event/grouping_updated.php b/lib/classes/event/grouping_updated.php index 8d35b492ded..23c8e85fe40 100644 --- a/lib/classes/event/grouping_updated.php +++ b/lib/classes/event/grouping_updated.php @@ -93,7 +93,7 @@ class grouping_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'groupings'; } diff --git a/lib/classes/event/mnet_access_control_created.php b/lib/classes/event/mnet_access_control_created.php index ce7ce3cf89d..7f5baf199c0 100644 --- a/lib/classes/event/mnet_access_control_created.php +++ b/lib/classes/event/mnet_access_control_created.php @@ -33,7 +33,7 @@ class mnet_access_control_created extends base { protected function init() { $this->data['objecttable'] = 'mnet_sso_access_control'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/mnet_access_control_updated.php b/lib/classes/event/mnet_access_control_updated.php index 0ca9af6a69a..3e4151e70a2 100644 --- a/lib/classes/event/mnet_access_control_updated.php +++ b/lib/classes/event/mnet_access_control_updated.php @@ -33,7 +33,7 @@ class mnet_access_control_updated extends base { protected function init() { $this->data['objecttable'] = 'mnet_sso_access_control'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/note_created.php b/lib/classes/event/note_created.php index e3ce2abafcb..bcfe424ca7c 100644 --- a/lib/classes/event/note_created.php +++ b/lib/classes/event/note_created.php @@ -49,7 +49,7 @@ class note_created extends \core\event\base { protected function init() { $this->data['objecttable'] = 'post'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/note_deleted.php b/lib/classes/event/note_deleted.php index 52f9182d9d7..bf158844b2e 100644 --- a/lib/classes/event/note_deleted.php +++ b/lib/classes/event/note_deleted.php @@ -49,7 +49,7 @@ class note_deleted extends \core\event\base { protected function init() { $this->data['objecttable'] = 'post'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/note_updated.php b/lib/classes/event/note_updated.php index fb94617c2d8..4df052640e8 100644 --- a/lib/classes/event/note_updated.php +++ b/lib/classes/event/note_updated.php @@ -49,7 +49,7 @@ class note_updated extends \core\event\base { protected function init() { $this->data['objecttable'] = 'post'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/notes_viewed.php b/lib/classes/event/notes_viewed.php index a2981061e4b..8b4d525842b 100644 --- a/lib/classes/event/notes_viewed.php +++ b/lib/classes/event/notes_viewed.php @@ -48,7 +48,7 @@ class notes_viewed extends \core\event\content_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_allow_assign_updated.php b/lib/classes/event/role_allow_assign_updated.php index abf1f10b333..b5f2dd11c95 100644 --- a/lib/classes/event/role_allow_assign_updated.php +++ b/lib/classes/event/role_allow_assign_updated.php @@ -32,7 +32,7 @@ class role_allow_assign_updated extends base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_allow_override_updated.php b/lib/classes/event/role_allow_override_updated.php index 0d165173268..9451cfa6416 100644 --- a/lib/classes/event/role_allow_override_updated.php +++ b/lib/classes/event/role_allow_override_updated.php @@ -32,7 +32,7 @@ class role_allow_override_updated extends base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_allow_switch_updated.php b/lib/classes/event/role_allow_switch_updated.php index 602f2afecb2..7b96dde35a1 100644 --- a/lib/classes/event/role_allow_switch_updated.php +++ b/lib/classes/event/role_allow_switch_updated.php @@ -32,7 +32,7 @@ class role_allow_switch_updated extends base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_assigned.php b/lib/classes/event/role_assigned.php index f22fd163152..cad0a1b1017 100644 --- a/lib/classes/event/role_assigned.php +++ b/lib/classes/event/role_assigned.php @@ -38,7 +38,7 @@ class role_assigned extends base { protected function init() { $this->data['objecttable'] = 'role'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_capabilities_updated.php b/lib/classes/event/role_capabilities_updated.php index d0f188b6914..9431cd37ec2 100644 --- a/lib/classes/event/role_capabilities_updated.php +++ b/lib/classes/event/role_capabilities_updated.php @@ -36,7 +36,7 @@ class role_capabilities_updated extends base { protected function init() { $this->data['objecttable'] = 'role'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_deleted.php b/lib/classes/event/role_deleted.php index ae150c8f6b6..de3e96361fc 100644 --- a/lib/classes/event/role_deleted.php +++ b/lib/classes/event/role_deleted.php @@ -41,7 +41,7 @@ class role_deleted extends base { protected function init() { $this->data['objecttable'] = 'role'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/role_unassigned.php b/lib/classes/event/role_unassigned.php index f3d0850a9e7..4521ab338ce 100644 --- a/lib/classes/event/role_unassigned.php +++ b/lib/classes/event/role_unassigned.php @@ -38,7 +38,7 @@ class role_unassigned extends base { protected function init() { $this->data['objecttable'] = 'role'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_created.php b/lib/classes/event/user_created.php index 892efd536a4..ec91dc322c0 100644 --- a/lib/classes/event/user_created.php +++ b/lib/classes/event/user_created.php @@ -40,7 +40,7 @@ class user_created extends base { protected function init() { $this->data['objecttable'] = 'user'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_deleted.php b/lib/classes/event/user_deleted.php index fdc68c8743d..1637822ffa0 100644 --- a/lib/classes/event/user_deleted.php +++ b/lib/classes/event/user_deleted.php @@ -50,7 +50,7 @@ class user_deleted extends base { protected function init() { $this->data['objecttable'] = 'user'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_enrolment_created.php b/lib/classes/event/user_enrolment_created.php index c5e0d0ee863..23539ca3123 100644 --- a/lib/classes/event/user_enrolment_created.php +++ b/lib/classes/event/user_enrolment_created.php @@ -46,7 +46,7 @@ class user_enrolment_created extends base { protected function init() { $this->data['objecttable'] = 'user_enrolments'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_enrolment_deleted.php b/lib/classes/event/user_enrolment_deleted.php index 4376a2b7efb..e178aab8c1d 100644 --- a/lib/classes/event/user_enrolment_deleted.php +++ b/lib/classes/event/user_enrolment_deleted.php @@ -47,7 +47,7 @@ class user_enrolment_deleted extends base { protected function init() { $this->data['objecttable'] = 'user_enrolments'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_enrolment_updated.php b/lib/classes/event/user_enrolment_updated.php index 69e71dea9b2..5ae4c039f15 100644 --- a/lib/classes/event/user_enrolment_updated.php +++ b/lib/classes/event/user_enrolment_updated.php @@ -46,7 +46,7 @@ class user_enrolment_updated extends base { protected function init() { $this->data['objecttable'] = 'user_enrolments'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_list_viewed.php b/lib/classes/event/user_list_viewed.php index fce1f0d8794..315b376a463 100644 --- a/lib/classes/event/user_list_viewed.php +++ b/lib/classes/event/user_list_viewed.php @@ -42,7 +42,7 @@ class user_list_viewed extends \core\event\base { protected function init() { $this->data['objecttable'] = 'course'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_loggedin.php b/lib/classes/event/user_loggedin.php index 0bb4e17f936..198a13733cd 100644 --- a/lib/classes/event/user_loggedin.php +++ b/lib/classes/event/user_loggedin.php @@ -95,7 +95,7 @@ class user_loggedin extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'user'; } diff --git a/lib/classes/event/user_loggedinas.php b/lib/classes/event/user_loggedinas.php index 136307dc3d5..bf88da99e31 100644 --- a/lib/classes/event/user_loggedinas.php +++ b/lib/classes/event/user_loggedinas.php @@ -49,7 +49,7 @@ class user_loggedinas extends base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'user'; } diff --git a/lib/classes/event/user_loggedout.php b/lib/classes/event/user_loggedout.php index d17f0bf1fe9..f332ae1399c 100644 --- a/lib/classes/event/user_loggedout.php +++ b/lib/classes/event/user_loggedout.php @@ -47,7 +47,7 @@ class user_loggedout extends base { $this->context = \context_system::instance(); $this->data['objecttable'] = 'user'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_profile_viewed.php b/lib/classes/event/user_profile_viewed.php index eefc9bf5e48..919ecc752ab 100644 --- a/lib/classes/event/user_profile_viewed.php +++ b/lib/classes/event/user_profile_viewed.php @@ -42,7 +42,7 @@ class user_profile_viewed extends base { protected function init() { $this->data['objecttable'] = 'user'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/user_updated.php b/lib/classes/event/user_updated.php index 005ee407936..af7c04fa43e 100644 --- a/lib/classes/event/user_updated.php +++ b/lib/classes/event/user_updated.php @@ -40,7 +40,7 @@ class user_updated extends base { protected function init() { $this->data['objecttable'] = 'user'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/lib/classes/event/webservice_function_called.php b/lib/classes/event/webservice_function_called.php index 1334784617b..7685abdf16d 100644 --- a/lib/classes/event/webservice_function_called.php +++ b/lib/classes/event/webservice_function_called.php @@ -79,7 +79,7 @@ class webservice_function_called extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->context = \context_system::instance(); } diff --git a/lib/classes/event/webservice_login_failed.php b/lib/classes/event/webservice_login_failed.php index 9ababb062ba..78560d33495 100644 --- a/lib/classes/event/webservice_login_failed.php +++ b/lib/classes/event/webservice_login_failed.php @@ -83,7 +83,7 @@ class webservice_login_failed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->context = \context_system::instance(); } diff --git a/lib/classes/event/webservice_service_created.php b/lib/classes/event/webservice_service_created.php index 22fd29c4010..9aa7e24fd15 100644 --- a/lib/classes/event/webservice_service_created.php +++ b/lib/classes/event/webservice_service_created.php @@ -87,7 +87,7 @@ class webservice_service_created extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_services'; } diff --git a/lib/classes/event/webservice_service_deleted.php b/lib/classes/event/webservice_service_deleted.php index 4c497d94e41..7832e0a92be 100644 --- a/lib/classes/event/webservice_service_deleted.php +++ b/lib/classes/event/webservice_service_deleted.php @@ -81,7 +81,7 @@ class webservice_service_deleted extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_services'; } diff --git a/lib/classes/event/webservice_service_updated.php b/lib/classes/event/webservice_service_updated.php index 0b82da75ad2..9740329718a 100644 --- a/lib/classes/event/webservice_service_updated.php +++ b/lib/classes/event/webservice_service_updated.php @@ -81,7 +81,7 @@ class webservice_service_updated extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_services'; } diff --git a/lib/classes/event/webservice_service_user_added.php b/lib/classes/event/webservice_service_user_added.php index 38309fb094a..c9c4d6d7ff5 100644 --- a/lib/classes/event/webservice_service_user_added.php +++ b/lib/classes/event/webservice_service_user_added.php @@ -80,7 +80,7 @@ class webservice_service_user_added extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_services'; } diff --git a/lib/classes/event/webservice_service_user_removed.php b/lib/classes/event/webservice_service_user_removed.php index a0f7eecabd1..c3770a86039 100644 --- a/lib/classes/event/webservice_service_user_removed.php +++ b/lib/classes/event/webservice_service_user_removed.php @@ -80,7 +80,7 @@ class webservice_service_user_removed extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_services'; } diff --git a/lib/classes/event/webservice_token_created.php b/lib/classes/event/webservice_token_created.php index d5799e0b1d9..cb0c653cbf2 100644 --- a/lib/classes/event/webservice_token_created.php +++ b/lib/classes/event/webservice_token_created.php @@ -87,7 +87,7 @@ class webservice_token_created extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_tokens'; } diff --git a/lib/classes/event/webservice_token_sent.php b/lib/classes/event/webservice_token_sent.php index 51775bd3804..e67492920ec 100644 --- a/lib/classes/event/webservice_token_sent.php +++ b/lib/classes/event/webservice_token_sent.php @@ -69,7 +69,7 @@ class webservice_token_sent extends \core\event\base { protected function init() { $this->context = \context_system::instance(); $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'external_tokens'; } diff --git a/lib/tests/event_test.php b/lib/tests/event_test.php index 84b2bcdc2d4..a85276d5e89 100644 --- a/lib/tests/event_test.php +++ b/lib/tests/event_test.php @@ -52,7 +52,7 @@ class core_event_testcase extends advanced_testcase { $this->assertSame('unittest', $event->target); $this->assertSame(5, $event->objectid); $this->assertSame('u', $event->crud); - $this->assertSame(\core\event\base::LEVEL_PARTICIPATING, $event->level); + $this->assertSame(\core\event\base::LEVEL_PARTICIPATING, $event->edulevel); $this->assertEquals($system, $event->get_context()); $this->assertSame($system->id, $event->contextid); @@ -451,6 +451,23 @@ class core_event_testcase extends advanced_testcase { \core_tests\event\unittest_observer::$info); } + public function test_deprecated() { + global $DB; + + $this->resetAfterTest(true); + + $event = \core_tests\event\deprecated_event1::create(); + $this->assertDebuggingCalled('level property is deprecated, use edulevel property instead'); + + $this->assertSame($event::LEVEL_TEACHING, $event->level); + $this->assertDebuggingCalled('level property is deprecated, use edulevel property instead'); + + $this->assertTrue(isset($event->level)); + $this->assertDebuggingCalled('level property is deprecated, use edulevel property instead'); + + $this->assertSame($event::LEVEL_TEACHING, $event->edulevel); + } + public function test_legacy() { global $DB; diff --git a/lib/tests/fixtures/event_fixtures.php b/lib/tests/fixtures/event_fixtures.php index 9cc8252d451..a516184ff04 100644 --- a/lib/tests/fixtures/event_fixtures.php +++ b/lib/tests/fixtures/event_fixtures.php @@ -41,7 +41,7 @@ class unittest_executed extends \core\event\base { protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } public function get_url() { @@ -116,14 +116,14 @@ class unittest_observer { class bad_event1 extends \core\event\base { protected function init() { //$this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } } class bad_event2 extends \core\event\base { protected function init() { $this->data['crud'] = 'u'; - //$this->data['level'] = 10; + //$this->data['edulevel'] = 10; } } @@ -131,14 +131,14 @@ class bad_event2b extends \core\event\base { protected function init() { $this->data['crud'] = 'u'; // Invalid level value. - $this->data['level'] = -1; + $this->data['edulevel'] = -1; } } class bad_event3 extends \core\event\base { protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; unset($this->data['courseid']); } } @@ -146,7 +146,7 @@ class bad_event3 extends \core\event\base { class bad_event4 extends \core\event\base { protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['xxx'] = 1; } } @@ -154,14 +154,14 @@ class bad_event4 extends \core\event\base { class bad_event5 extends \core\event\base { protected function init() { $this->data['crud'] = 'x'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } } class bad_event6 extends \core\event\base { protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'xxx_xxx_xx'; } } @@ -169,7 +169,7 @@ class bad_event6 extends \core\event\base { class bad_event7 extends \core\event\base { protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = null; } } @@ -177,7 +177,7 @@ class bad_event7 extends \core\event\base { class bad_event8 extends \core\event\base { protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'user'; } } @@ -185,14 +185,14 @@ class bad_event8 extends \core\event\base { class problematic_event1 extends \core\event\base { protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; } } class problematic_event2 extends \core\event\base { protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->context = \context_system::instance(); } } @@ -200,7 +200,7 @@ class problematic_event2 extends \core\event\base { class problematic_event3 extends \core\event\base { protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->context = \context_system::instance(); } @@ -211,11 +211,19 @@ class problematic_event3 extends \core\event\base { } } +class deprecated_event1 extends \core\event\base { + protected function init() { + $this->data['crud'] = 'c'; + $this->data['level'] = self::LEVEL_TEACHING; // Tests edulevel hint. + $this->context = \context_system::instance(); + } +} + class noname_event extends \core\event\base { protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->context = \context_system::instance(); } } @@ -237,7 +245,7 @@ class content_viewed extends \core\event\content_viewed { class course_module_viewed extends \core\event\course_module_viewed { protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'feedback'; } } diff --git a/lib/upgrade.txt b/lib/upgrade.txt index 15a06cabafa..bd1a65200c6 100644 --- a/lib/upgrade.txt +++ b/lib/upgrade.txt @@ -6,6 +6,7 @@ information provided here is intended especially for developers. * $core_renderer->block_move_target() changed to support more verbose move-block-here descriptions. DEPRECATIONS: +* Update init methods in all event classes - "level" property was renamed to "edulevel", the level property is now deprecated. * Abstract class \core\event\course_module_instances_list_viewed is deprecated now, use \core\event\instances_list_viewed instead. * mod_book\event\instances_list_viewed has been deprecated. Please use mod_book\event\course_module_instance_list_viewed instead. * mod_chat\event\instances_list_viewed has been deprecated. Please use mod_chat\event\course_module_instance_list_viewed instead. diff --git a/mod/assign/classes/event/all_submissions_downloaded.php b/mod/assign/classes/event/all_submissions_downloaded.php index 6fa46d40634..b33f6899ee7 100644 --- a/mod/assign/classes/event/all_submissions_downloaded.php +++ b/mod/assign/classes/event/all_submissions_downloaded.php @@ -95,7 +95,7 @@ class all_submissions_downloaded extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/assign/classes/event/extension_granted.php b/mod/assign/classes/event/extension_granted.php index 5a59f114313..287f847af03 100644 --- a/mod/assign/classes/event/extension_granted.php +++ b/mod/assign/classes/event/extension_granted.php @@ -85,7 +85,7 @@ class extension_granted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/assign/classes/event/identities_revealed.php b/mod/assign/classes/event/identities_revealed.php index ca4a0338bdd..3dc67b1aebd 100644 --- a/mod/assign/classes/event/identities_revealed.php +++ b/mod/assign/classes/event/identities_revealed.php @@ -85,7 +85,7 @@ class identities_revealed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/assign/classes/event/marker_updated.php b/mod/assign/classes/event/marker_updated.php index 616005d83d9..b59ecd1eff8 100644 --- a/mod/assign/classes/event/marker_updated.php +++ b/mod/assign/classes/event/marker_updated.php @@ -91,7 +91,7 @@ class marker_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/assign/classes/event/statement_accepted.php b/mod/assign/classes/event/statement_accepted.php index 8465c1424ae..63816820296 100644 --- a/mod/assign/classes/event/statement_accepted.php +++ b/mod/assign/classes/event/statement_accepted.php @@ -85,7 +85,7 @@ class statement_accepted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'assign_submission'; } diff --git a/mod/assign/classes/event/submission_duplicated.php b/mod/assign/classes/event/submission_duplicated.php index ebccc0f1aae..a5bf9c00c3d 100644 --- a/mod/assign/classes/event/submission_duplicated.php +++ b/mod/assign/classes/event/submission_duplicated.php @@ -85,7 +85,7 @@ class submission_duplicated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'assign_submission'; } diff --git a/mod/assign/classes/event/submission_graded.php b/mod/assign/classes/event/submission_graded.php index bd9e1387a84..cac5fac23ae 100644 --- a/mod/assign/classes/event/submission_graded.php +++ b/mod/assign/classes/event/submission_graded.php @@ -85,7 +85,7 @@ class submission_graded extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign_grades'; } diff --git a/mod/assign/classes/event/submission_locked.php b/mod/assign/classes/event/submission_locked.php index 09e86c0641f..082a1a4c0e0 100644 --- a/mod/assign/classes/event/submission_locked.php +++ b/mod/assign/classes/event/submission_locked.php @@ -85,7 +85,7 @@ class submission_locked extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/assign/classes/event/submission_status_updated.php b/mod/assign/classes/event/submission_status_updated.php index 32be18b196d..e0d21c90816 100644 --- a/mod/assign/classes/event/submission_status_updated.php +++ b/mod/assign/classes/event/submission_status_updated.php @@ -91,7 +91,7 @@ class submission_status_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign_submission'; } diff --git a/mod/assign/classes/event/submission_unlocked.php b/mod/assign/classes/event/submission_unlocked.php index fe3feae13f6..b50bd36d2a5 100644 --- a/mod/assign/classes/event/submission_unlocked.php +++ b/mod/assign/classes/event/submission_unlocked.php @@ -85,7 +85,7 @@ class submission_unlocked extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/assign/classes/event/submission_updated.php b/mod/assign/classes/event/submission_updated.php index 1d053c715db..f9e6e47217d 100644 --- a/mod/assign/classes/event/submission_updated.php +++ b/mod/assign/classes/event/submission_updated.php @@ -85,7 +85,7 @@ class submission_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'assign_submission'; } diff --git a/mod/assign/classes/event/workflow_state_updated.php b/mod/assign/classes/event/workflow_state_updated.php index 6ccdf0d4fd7..a52b93ac37c 100644 --- a/mod/assign/classes/event/workflow_state_updated.php +++ b/mod/assign/classes/event/workflow_state_updated.php @@ -91,7 +91,7 @@ class workflow_state_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'assign'; } diff --git a/mod/book/classes/event/chapter_created.php b/mod/book/classes/event/chapter_created.php index a107bd8b90b..c89e479bea1 100644 --- a/mod/book/classes/event/chapter_created.php +++ b/mod/book/classes/event/chapter_created.php @@ -81,7 +81,7 @@ class chapter_created extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'book_chapters'; } diff --git a/mod/book/classes/event/chapter_deleted.php b/mod/book/classes/event/chapter_deleted.php index 43595e12dcf..ff9d9af8e9f 100644 --- a/mod/book/classes/event/chapter_deleted.php +++ b/mod/book/classes/event/chapter_deleted.php @@ -84,7 +84,7 @@ class chapter_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'book_chapters'; } diff --git a/mod/book/classes/event/chapter_updated.php b/mod/book/classes/event/chapter_updated.php index 559da1f4ac0..c889de0fc12 100644 --- a/mod/book/classes/event/chapter_updated.php +++ b/mod/book/classes/event/chapter_updated.php @@ -81,7 +81,7 @@ class chapter_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'book_chapters'; } diff --git a/mod/book/classes/event/chapter_viewed.php b/mod/book/classes/event/chapter_viewed.php index 35010b8601d..a1f87032ad1 100644 --- a/mod/book/classes/event/chapter_viewed.php +++ b/mod/book/classes/event/chapter_viewed.php @@ -78,7 +78,7 @@ class chapter_viewed extends \core\event\content_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'book_chapters'; } diff --git a/mod/book/classes/event/course_module_viewed.php b/mod/book/classes/event/course_module_viewed.php index 20848d8b12a..daa2e372bd4 100644 --- a/mod/book/classes/event/course_module_viewed.php +++ b/mod/book/classes/event/course_module_viewed.php @@ -41,7 +41,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'book'; } } diff --git a/mod/book/tool/exportimscp/classes/event/book_exported.php b/mod/book/tool/exportimscp/classes/event/book_exported.php index 556ca970fad..2d094dee9b0 100644 --- a/mod/book/tool/exportimscp/classes/event/book_exported.php +++ b/mod/book/tool/exportimscp/classes/event/book_exported.php @@ -78,7 +78,7 @@ class book_exported extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'book'; } diff --git a/mod/book/tool/print/classes/event/book_printed.php b/mod/book/tool/print/classes/event/book_printed.php index 642881f398f..0917406707b 100644 --- a/mod/book/tool/print/classes/event/book_printed.php +++ b/mod/book/tool/print/classes/event/book_printed.php @@ -78,7 +78,7 @@ class book_printed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'book'; } diff --git a/mod/book/tool/print/classes/event/chapter_printed.php b/mod/book/tool/print/classes/event/chapter_printed.php index 83104242261..ea4d2ecabd9 100644 --- a/mod/book/tool/print/classes/event/chapter_printed.php +++ b/mod/book/tool/print/classes/event/chapter_printed.php @@ -78,7 +78,7 @@ class chapter_printed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'book'; } diff --git a/mod/chat/classes/event/message_sent.php b/mod/chat/classes/event/message_sent.php index b8812038109..fdb1d5e23e5 100644 --- a/mod/chat/classes/event/message_sent.php +++ b/mod/chat/classes/event/message_sent.php @@ -79,7 +79,7 @@ class message_sent extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'chat_messages'; } diff --git a/mod/chat/classes/event/sessions_viewed.php b/mod/chat/classes/event/sessions_viewed.php index 766ac9a6659..71be7c09378 100644 --- a/mod/chat/classes/event/sessions_viewed.php +++ b/mod/chat/classes/event/sessions_viewed.php @@ -85,7 +85,7 @@ class sessions_viewed extends \core\event\content_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'chat'; } diff --git a/mod/choice/classes/event/answer_submitted.php b/mod/choice/classes/event/answer_submitted.php index 999a96998e4..bc7256fee41 100644 --- a/mod/choice/classes/event/answer_submitted.php +++ b/mod/choice/classes/event/answer_submitted.php @@ -92,7 +92,7 @@ class answer_submitted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'choice_answers'; } diff --git a/mod/choice/classes/event/answer_updated.php b/mod/choice/classes/event/answer_updated.php index eb0a276dac1..2df2afb15d2 100644 --- a/mod/choice/classes/event/answer_updated.php +++ b/mod/choice/classes/event/answer_updated.php @@ -92,7 +92,7 @@ class answer_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'choice_answers'; } diff --git a/mod/choice/classes/event/course_module_viewed.php b/mod/choice/classes/event/course_module_viewed.php index 7aab11fbfab..db30241b489 100644 --- a/mod/choice/classes/event/course_module_viewed.php +++ b/mod/choice/classes/event/course_module_viewed.php @@ -39,7 +39,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'choice'; } } diff --git a/mod/choice/classes/event/report_viewed.php b/mod/choice/classes/event/report_viewed.php index acf1394e994..c7b62257407 100644 --- a/mod/choice/classes/event/report_viewed.php +++ b/mod/choice/classes/event/report_viewed.php @@ -45,7 +45,7 @@ class report_viewed extends \core\event\content_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'choice'; } diff --git a/mod/feedback/classes/event/course_module_viewed.php b/mod/feedback/classes/event/course_module_viewed.php index bbe47c03517..9e21da0549e 100644 --- a/mod/feedback/classes/event/course_module_viewed.php +++ b/mod/feedback/classes/event/course_module_viewed.php @@ -46,7 +46,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'feedback'; } diff --git a/mod/feedback/classes/event/response_deleted.php b/mod/feedback/classes/event/response_deleted.php index be00b5e80f8..cbd086fcbcd 100644 --- a/mod/feedback/classes/event/response_deleted.php +++ b/mod/feedback/classes/event/response_deleted.php @@ -50,7 +50,7 @@ class response_deleted extends \core\event\base { protected function init() { $this->data['objecttable'] = 'feedback_completed'; $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/feedback/classes/event/response_submitted.php b/mod/feedback/classes/event/response_submitted.php index 600fd2759f7..52253880451 100644 --- a/mod/feedback/classes/event/response_submitted.php +++ b/mod/feedback/classes/event/response_submitted.php @@ -53,7 +53,7 @@ class response_submitted extends \core\event\base { require_once($CFG->dirroot.'/mod/feedback/lib.php'); $this->data['objecttable'] = 'feedback_completed'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/folder/classes/event/course_module_viewed.php b/mod/folder/classes/event/course_module_viewed.php index 6c502a56c76..39a0e59c819 100644 --- a/mod/folder/classes/event/course_module_viewed.php +++ b/mod/folder/classes/event/course_module_viewed.php @@ -33,7 +33,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'folder'; } } diff --git a/mod/folder/classes/event/folder_updated.php b/mod/folder/classes/event/folder_updated.php index f813d0610ff..e972d861dcd 100644 --- a/mod/folder/classes/event/folder_updated.php +++ b/mod/folder/classes/event/folder_updated.php @@ -33,7 +33,7 @@ class folder_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'folder'; } diff --git a/mod/lesson/classes/event/course_module_viewed.php b/mod/lesson/classes/event/course_module_viewed.php index 36255331827..6920dfa38fd 100644 --- a/mod/lesson/classes/event/course_module_viewed.php +++ b/mod/lesson/classes/event/course_module_viewed.php @@ -34,6 +34,6 @@ class course_module_viewed extends \core\event\course_module_viewed { protected function init() { $this->data['objecttable'] = 'lesson'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } } diff --git a/mod/lesson/classes/event/essay_assessed.php b/mod/lesson/classes/event/essay_assessed.php index 19d56dbc83a..ce488e0a9be 100644 --- a/mod/lesson/classes/event/essay_assessed.php +++ b/mod/lesson/classes/event/essay_assessed.php @@ -49,7 +49,7 @@ class essay_assessed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'lesson_grades'; } diff --git a/mod/lesson/classes/event/essay_attempt_viewed.php b/mod/lesson/classes/event/essay_attempt_viewed.php index 7e066c79b5a..eec32b3d6f0 100644 --- a/mod/lesson/classes/event/essay_attempt_viewed.php +++ b/mod/lesson/classes/event/essay_attempt_viewed.php @@ -34,7 +34,7 @@ class essay_attempt_viewed extends \core\event\base { protected function init() { $this->data['objecttable'] = 'lesson_attempts'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/mod/lesson/classes/event/highscore_added.php b/mod/lesson/classes/event/highscore_added.php index b2204dbe191..645d113fb8f 100644 --- a/mod/lesson/classes/event/highscore_added.php +++ b/mod/lesson/classes/event/highscore_added.php @@ -34,7 +34,7 @@ class highscore_added extends \core\event\base { protected function init() { $this->data['objecttable'] = 'lesson_high_scores'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/lesson/classes/event/highscores_viewed.php b/mod/lesson/classes/event/highscores_viewed.php index 549e451d361..cd0aff219cf 100644 --- a/mod/lesson/classes/event/highscores_viewed.php +++ b/mod/lesson/classes/event/highscores_viewed.php @@ -34,7 +34,7 @@ class highscores_viewed extends \core\event\base { protected function init() { $this->data['objecttable'] = 'lesson'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/lesson/classes/event/lesson_ended.php b/mod/lesson/classes/event/lesson_ended.php index 76963d284f9..a3cef8ccd88 100644 --- a/mod/lesson/classes/event/lesson_ended.php +++ b/mod/lesson/classes/event/lesson_ended.php @@ -34,7 +34,7 @@ class lesson_ended extends \core\event\base { protected function init() { $this->data['objecttable'] = 'lesson'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/lesson/classes/event/lesson_started.php b/mod/lesson/classes/event/lesson_started.php index de377275feb..afd3b05d4d4 100644 --- a/mod/lesson/classes/event/lesson_started.php +++ b/mod/lesson/classes/event/lesson_started.php @@ -34,7 +34,7 @@ class lesson_started extends \core\event\base { protected function init() { $this->data['objecttable'] = 'lesson'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/lti/classes/event/course_module_viewed.php b/mod/lti/classes/event/course_module_viewed.php index 8d8ed19ee95..a1b0b7b8426 100644 --- a/mod/lti/classes/event/course_module_viewed.php +++ b/mod/lti/classes/event/course_module_viewed.php @@ -34,6 +34,6 @@ class course_module_viewed extends \core\event\course_module_viewed { protected function init() { $this->data['objecttable'] = 'lti'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } } diff --git a/mod/lti/classes/event/unknown_service_api_called.php b/mod/lti/classes/event/unknown_service_api_called.php index 9e6dff770f8..7510f5dfff1 100644 --- a/mod/lti/classes/event/unknown_service_api_called.php +++ b/mod/lti/classes/event/unknown_service_api_called.php @@ -62,7 +62,7 @@ class unknown_service_api_called extends \core\event\base { protected function init() { $this->data['objecttable'] = 'lti'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['context'] = \context_system::instance(); } diff --git a/mod/page/classes/event/course_module_viewed.php b/mod/page/classes/event/course_module_viewed.php index 60bf95c7d6d..52740a5d292 100644 --- a/mod/page/classes/event/course_module_viewed.php +++ b/mod/page/classes/event/course_module_viewed.php @@ -39,7 +39,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'page'; } } diff --git a/mod/quiz/classes/event/attempt_abandoned.php b/mod/quiz/classes/event/attempt_abandoned.php index eacdd70af7d..f277af41020 100644 --- a/mod/quiz/classes/event/attempt_abandoned.php +++ b/mod/quiz/classes/event/attempt_abandoned.php @@ -45,7 +45,7 @@ class attempt_abandoned extends \core\event\base { protected function init() { $this->data['objecttable'] = 'quiz_attempts'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/quiz/classes/event/attempt_becameoverdue.php b/mod/quiz/classes/event/attempt_becameoverdue.php index ad8a0870a84..552905d9eed 100644 --- a/mod/quiz/classes/event/attempt_becameoverdue.php +++ b/mod/quiz/classes/event/attempt_becameoverdue.php @@ -48,7 +48,7 @@ class attempt_becameoverdue extends \core\event\base { protected function init() { $this->data['objecttable'] = 'quiz_attempts'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/quiz/classes/event/attempt_started.php b/mod/quiz/classes/event/attempt_started.php index abab65e14ce..8b97404285c 100644 --- a/mod/quiz/classes/event/attempt_started.php +++ b/mod/quiz/classes/event/attempt_started.php @@ -39,7 +39,7 @@ class attempt_started extends \core\event\base { protected function init() { $this->data['objecttable'] = 'quiz_attempts'; $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/quiz/classes/event/attempt_submitted.php b/mod/quiz/classes/event/attempt_submitted.php index 476ca3c3ef1..3190edff5ab 100644 --- a/mod/quiz/classes/event/attempt_submitted.php +++ b/mod/quiz/classes/event/attempt_submitted.php @@ -45,7 +45,7 @@ class attempt_submitted extends \core\event\base { protected function init() { $this->data['objecttable'] = 'quiz_attempts'; $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } /** diff --git a/mod/resource/classes/event/course_module_viewed.php b/mod/resource/classes/event/course_module_viewed.php index 8647cd53845..a7ae7b76f4a 100644 --- a/mod/resource/classes/event/course_module_viewed.php +++ b/mod/resource/classes/event/course_module_viewed.php @@ -43,6 +43,6 @@ class course_module_viewed extends \core\event\course_module_viewed { protected function init() { $this->data['objecttable'] = 'resource'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } } diff --git a/mod/scorm/classes/event/attempt_deleted.php b/mod/scorm/classes/event/attempt_deleted.php index 8c872fbd78f..825be7deb86 100644 --- a/mod/scorm/classes/event/attempt_deleted.php +++ b/mod/scorm/classes/event/attempt_deleted.php @@ -44,7 +44,7 @@ class attempt_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/mod/scorm/classes/event/course_module_viewed.php b/mod/scorm/classes/event/course_module_viewed.php index 3905ee88068..9471348345e 100644 --- a/mod/scorm/classes/event/course_module_viewed.php +++ b/mod/scorm/classes/event/course_module_viewed.php @@ -39,7 +39,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'scorm'; } diff --git a/mod/scorm/classes/event/interactions_viewed.php b/mod/scorm/classes/event/interactions_viewed.php index 6b617f6a0ba..0323c0e3cb6 100644 --- a/mod/scorm/classes/event/interactions_viewed.php +++ b/mod/scorm/classes/event/interactions_viewed.php @@ -45,7 +45,7 @@ class interactions_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/mod/scorm/classes/event/report_viewed.php b/mod/scorm/classes/event/report_viewed.php index d55b69ab8b4..53e936c0c2c 100644 --- a/mod/scorm/classes/event/report_viewed.php +++ b/mod/scorm/classes/event/report_viewed.php @@ -44,7 +44,7 @@ class report_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; $this->data['objecttable'] = 'scorm'; } diff --git a/mod/scorm/classes/event/sco_launched.php b/mod/scorm/classes/event/sco_launched.php index 72f0fce2286..5aa3a95050e 100644 --- a/mod/scorm/classes/event/sco_launched.php +++ b/mod/scorm/classes/event/sco_launched.php @@ -46,7 +46,7 @@ class sco_launched extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'scorm_scoes'; } diff --git a/mod/scorm/classes/event/tracks_viewed.php b/mod/scorm/classes/event/tracks_viewed.php index 03ecaa1b3cd..a1ca2570ffe 100644 --- a/mod/scorm/classes/event/tracks_viewed.php +++ b/mod/scorm/classes/event/tracks_viewed.php @@ -46,7 +46,7 @@ class tracks_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/mod/scorm/classes/event/user_report_viewed.php b/mod/scorm/classes/event/user_report_viewed.php index 20b490359b6..7ebf2394935 100644 --- a/mod/scorm/classes/event/user_report_viewed.php +++ b/mod/scorm/classes/event/user_report_viewed.php @@ -45,7 +45,7 @@ class user_report_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** diff --git a/mod/url/classes/event/course_module_viewed.php b/mod/url/classes/event/course_module_viewed.php index 189170ff0c6..0c2e1fcfedd 100644 --- a/mod/url/classes/event/course_module_viewed.php +++ b/mod/url/classes/event/course_module_viewed.php @@ -36,6 +36,6 @@ class course_module_viewed extends \core\event\course_module_viewed { protected function init() { $this->data['objecttable'] = 'url'; $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; } } diff --git a/mod/wiki/classes/event/course_module_viewed.php b/mod/wiki/classes/event/course_module_viewed.php index 05db710c737..aba6d9e5255 100644 --- a/mod/wiki/classes/event/course_module_viewed.php +++ b/mod/wiki/classes/event/course_module_viewed.php @@ -41,7 +41,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki'; } } diff --git a/mod/wiki/classes/event/page_created.php b/mod/wiki/classes/event/page_created.php index 268a8caee98..6381ee82c7d 100644 --- a/mod/wiki/classes/event/page_created.php +++ b/mod/wiki/classes/event/page_created.php @@ -40,7 +40,7 @@ class page_created extends \core\event\base { */ protected function init() { $this->data['crud'] = 'c'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_deleted.php b/mod/wiki/classes/event/page_deleted.php index b129f3718a5..30ca84b5029 100644 --- a/mod/wiki/classes/event/page_deleted.php +++ b/mod/wiki/classes/event/page_deleted.php @@ -46,7 +46,7 @@ class page_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_diff_viewed.php b/mod/wiki/classes/event/page_diff_viewed.php index a1d69a84a23..2dd39dd5f74 100644 --- a/mod/wiki/classes/event/page_diff_viewed.php +++ b/mod/wiki/classes/event/page_diff_viewed.php @@ -47,7 +47,7 @@ class page_diff_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_history_viewed.php b/mod/wiki/classes/event/page_history_viewed.php index fa0ddc9c18b..6e59e975601 100644 --- a/mod/wiki/classes/event/page_history_viewed.php +++ b/mod/wiki/classes/event/page_history_viewed.php @@ -40,7 +40,7 @@ class page_history_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_locks_deleted.php b/mod/wiki/classes/event/page_locks_deleted.php index 5aee13b82e9..8971936b2c8 100644 --- a/mod/wiki/classes/event/page_locks_deleted.php +++ b/mod/wiki/classes/event/page_locks_deleted.php @@ -46,7 +46,7 @@ class page_locks_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_OTHER; + $this->data['edulevel'] = self::LEVEL_OTHER; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_map_viewed.php b/mod/wiki/classes/event/page_map_viewed.php index 8b94fd496b4..abc7e903b60 100644 --- a/mod/wiki/classes/event/page_map_viewed.php +++ b/mod/wiki/classes/event/page_map_viewed.php @@ -46,7 +46,7 @@ class page_map_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_updated.php b/mod/wiki/classes/event/page_updated.php index e39aa3438d8..a0c60df4e0b 100644 --- a/mod/wiki/classes/event/page_updated.php +++ b/mod/wiki/classes/event/page_updated.php @@ -46,7 +46,7 @@ class page_updated extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_version_deleted.php b/mod/wiki/classes/event/page_version_deleted.php index 622d8e15a45..3ece834d903 100644 --- a/mod/wiki/classes/event/page_version_deleted.php +++ b/mod/wiki/classes/event/page_version_deleted.php @@ -46,7 +46,7 @@ class page_version_deleted extends \core\event\base { */ protected function init() { $this->data['crud'] = 'd'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_versions'; } diff --git a/mod/wiki/classes/event/page_version_restored.php b/mod/wiki/classes/event/page_version_restored.php index 601c6353f1f..99e038906c5 100644 --- a/mod/wiki/classes/event/page_version_restored.php +++ b/mod/wiki/classes/event/page_version_restored.php @@ -46,7 +46,7 @@ class page_version_restored extends \core\event\base { */ protected function init() { $this->data['crud'] = 'u'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_versions'; } diff --git a/mod/wiki/classes/event/page_version_viewed.php b/mod/wiki/classes/event/page_version_viewed.php index c641933db80..5304ed8e5c2 100644 --- a/mod/wiki/classes/event/page_version_viewed.php +++ b/mod/wiki/classes/event/page_version_viewed.php @@ -46,7 +46,7 @@ class page_version_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/wiki/classes/event/page_viewed.php b/mod/wiki/classes/event/page_viewed.php index 2e19ec3b15b..c1153c923b2 100644 --- a/mod/wiki/classes/event/page_viewed.php +++ b/mod/wiki/classes/event/page_viewed.php @@ -40,7 +40,7 @@ class page_viewed extends \core\event\base { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'wiki_pages'; } diff --git a/mod/workshop/classes/event/course_module_viewed.php b/mod/workshop/classes/event/course_module_viewed.php index aca94a75fa4..b1870d07ccb 100644 --- a/mod/workshop/classes/event/course_module_viewed.php +++ b/mod/workshop/classes/event/course_module_viewed.php @@ -39,7 +39,7 @@ class course_module_viewed extends \core\event\course_module_viewed { */ protected function init() { $this->data['crud'] = 'r'; - $this->data['level'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; $this->data['objecttable'] = 'workshop'; }