L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w38_MDL-35331_m24_verboseenroldb' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-09-18 19:20:05 +02:00
parent 5fe658fca9 085bf0c9fb
commit 58e4214b95
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/database/lib.php
+20 -8
View File
@@ -368,6 +368,7 @@ class enrol_database_plugin extends enrol_plugin {
continue;
}
$existing[$course->mapping] = $course;
unset($externalcourses[$course->mapping]);
}
$rs->close();
@@ -388,18 +389,22 @@ class enrol_database_plugin extends enrol_plugin {
continue;
}
if (!isset($externalcourses[$course->mapping])) {
// course not synced
continue;
}
if (isset($existing[$course->mapping])) {
// some duplicate, sorry
// Course not synced or duplicate.
continue;
}
$course->enrolid = $this->add_instance($course);
$existing[$course->mapping] = $course;
unset($externalcourses[$course->mapping]);
}
$rs->close();
// Print list of missing courses.
if ($verbose and $externalcourses) {
$list = implode(', ', array_keys($externalcourses));
mtrace(" error: following courses do not exist - $list");
unset($list);
}
// free memory
unset($externalcourses);
@@ -452,13 +457,18 @@ class enrol_database_plugin extends enrol_plugin {
while ($fields = $rs->FetchRow()) {
$fields = array_change_key_case($fields, CASE_LOWER);
if (empty($fields[$userfield])) {
//user identification is mandatory!
if ($verbose) {
mtrace(" error: skipping user without mandatory $localuserfield in course '$course->mapping'");
}
continue;
}
$mapping = $fields[$userfield];
if (!isset($user_mapping[$mapping])) {
$usersearch[$localuserfield] = $mapping;
if (!$user = $DB->get_record('user', $usersearch, 'id', IGNORE_MULTIPLE)) {
// user does not exist or was deleted
if ($verbose) {
mtrace(" error: skipping unknown user $localuserfield '$mapping' in course '$course->mapping'");
}
continue;
}
$user_mapping[$mapping] = $user->id;
@@ -468,7 +478,9 @@ class enrol_database_plugin extends enrol_plugin {
}
if (empty($fields[$rolefield]) or !isset($roles[$fields[$rolefield]])) {
if (!$defaultrole) {
// role is mandatory
if ($verbose) {
mtrace(" error: skipping user '$userid' in course '$course->mapping' - missing course and default role");
}
continue;
}
$roleid = $defaultrole;