From c5dc3024ca38f05c52459e52c310c9fa3546b8d6 Mon Sep 17 00:00:00 2001 From: Daren Chandisingh Date: Thu, 12 Nov 2009 11:35:09 +0000 Subject: [PATCH 1/2] MDL-19445 Fixed infinite loops and removed superfluous objects and casts. --- enrol/database/enrol.php | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/enrol/database/enrol.php b/enrol/database/enrol.php index 4df2185..781ce64 100644 --- a/enrol/database/enrol.php +++ b/enrol/database/enrol.php @@ -83,9 +83,9 @@ function setup_enrolments(&$user) { //$count = 0; $courselist = array(); - while ($fields_obj = (object)$rs->FetchRow()) { // Make a nice little array of courses to process - $fields_obj = (object)array_change_key_case((array)$fields_obj , CASE_LOWER); - $courselist[] = $fields_obj->enrolremotecoursefield; + while ($fields = $rs->FetchRow()) { // Make a nice little array of courses to process + $fields = array_change_key_case($fields, CASE_LOWER); + $courselist[] = $fields['enrolremotecoursefield']; //$count++; } $rs->close(); @@ -222,9 +222,9 @@ function sync_enrolments($role = null) { $transaction = $DB->start_delegated_transaction(); $extcourses = array(); - while ($extcourse_obj = (object)$rs->FetchRow()) { // there are more course records - $extcourse_obj = (object)array_change_key_case((array)$extcourse_obj , CASE_LOWER); - $extcourse = $extcourse_obj->{strtolower($CFG->enrol_remotecoursefield)}; + while ($rsextcourse = $rs->FetchRow()) { // there are more course records + $rsextcourse = array_change_key_case($rsextcourse, CASE_LOWER); + $extcourse = $rsextcourse[strtolower($CFG->enrol_remotecoursefield)]; array_push($extcourses, $extcourse); // does the course exist in moodle already? @@ -278,9 +278,9 @@ function sync_enrolments($role = null) { } // slurp results into an array - while ($crs_obj = (object)$crs->FetchRow()) { - $crs_obj = (object)array_change_key_case((array)$crs_obj , CASE_LOWER); - array_push($extenrolments, $crs_obj->{strtolower($CFG->enrol_remoteuserfield)}); + while ($rscrs = $crs->FetchRow()) { + $rscrs = array_change_key_case($rscrs, CASE_LOWER); + array_push($extenrolments, $rscrs[strtolower($CFG->enrol_remoteuserfield)]); } $crs->close(); // release the handle -- 1.6.3.3