Skip to content

Commit

Permalink
MDL-40909 core_enrol: removed 'enrol' add_to_log calls
Browse files Browse the repository at this point in the history
Before each of these calls a call to enrol_user() is made, which
triggers the event 'user_enrolment_created'. Nothing more is needed.
  • Loading branch information
mdjnelson committed Jan 28, 2014
1 parent 6324517 commit f1f4f4f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
1 change: 0 additions & 1 deletion enrol/manual/manage.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
$timeend = $timestart + $extendperiod;
}
$enrol_manual->enrol_user($instance, $adduser->id, $roleid, $timestart, $timeend);
add_to_log($course->id, 'course', 'enrol', '../enrol/users.php?id='.$course->id, $course->id); //there should be userid somewhere!
}

$potentialuserselector->invalidate_selected_users();
Expand Down
1 change: 0 additions & 1 deletion enrol/self/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ public function enrol_self(stdClass $instance, $data = null) {
}

$this->enrol_user($instance, $USER->id, $instance->roleid, $timestart, $timeend);
add_to_log($instance->courseid, 'course', 'enrol', '../enrol/users.php?id='.$instance->courseid, $instance->courseid); //TODO: There should be userid somewhere!

if ($instance->password and $instance->customint1 and $data->enrolpassword !== $instance->password) {
// It must be a group enrolment, let's assign group too.
Expand Down
3 changes: 3 additions & 0 deletions enrol/tests/enrollib_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,14 @@ public function test_user_enrolment_created_event() {
$dbuserenrolled = $DB->get_record('user_enrolments', array('userid' => $admin->id));
$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);
}

/**
Expand Down
9 changes: 9 additions & 0 deletions lib/classes/event/user_enrolment_created.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ protected function get_legacy_eventdata() {
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.
*
Expand Down

0 comments on commit f1f4f4f

Please sign in to comment.