moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-25674 detection of invalid $user parameter when synchronising user enrolments

Browse source
This commit is contained in:
Petr Skoda 2010-12-16 09:33:50 +01:00 • committed by Eloy Lafuente (stronk7)
parent c35ae13691
commit 07cd46d84d
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
enrol/database/lib.php
View file

@ -81,6 +81,15 @@ class enrol_database_plugin extends enrol_plugin {
$ignorehidden = $this->get_config('ignorehiddencourses');
if (!is_object($user) or !property_exists($user, 'id')) {
throw new coding_exception('Invalid $user parameter in sync_user_enrolments()');
}
if (!property_exists($user, $localuserfield)) {
debugging('Invalid $user parameter in sync_user_enrolments(), missing '.$localuserfield);
$user = $DB->get_record('user', array('id'=>$user->id));
}
// create roles mapping
$allroles = get_all_roles();
if (!isset($allroles[$defaultrole])) {

9
enrol/ldap/lib.php
View file

@ -136,6 +136,15 @@ class enrol_ldap_plugin extends enrol_plugin {
return;
}
if (!is_object($user) or !property_exists($user, 'id')) {
throw new coding_exception('Invalid $user parameter in sync_user_enrolments()');
}
if (!property_exists($user, 'idnumbner')) {
debugging('Invalid $user parameter in sync_user_enrolments(), missing idnumber');
$user = $DB->get_record('user', array('id'=>$user->id));
}
// We may need a lot of memory here
@set_time_limit(0);
raise_memory_limit(MEMORY_HUGE);