MDL-25674 detection of invalid $user parameter when synchronising use…

…r enrolments
yousuftafhim · Dec 20, 2010 · 07cd46d · 07cd46d
1 parent c35ae13
commit 07cd46d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/enrol/database/lib.php b/enrol/database/lib.php
@@ -81,6 +81,15 @@ public function sync_user_enrolments($user) {
 
         $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])) {

diff --git a/enrol/ldap/lib.php b/enrol/ldap/lib.php
@@ -136,6 +136,15 @@ public function sync_user_enrolments($user) {
             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);