mnet/enrolment MDL-21459 fixed a few small issues in admin/mnet/enrolment

This commit is contained in:
Penny Leach 2010-01-28 05:01:05 +00:00
parent 30ec3eef51
commit 72bb7e3236
3 changed files with 12 additions and 3 deletions

View file

@ -100,7 +100,6 @@
} }
} }
$all_enrolled_usernames = '';
$timemodified = array(); $timemodified = array();
/// List all the users (homed on this server) who are enrolled on the course /// List all the users (homed on this server) who are enrolled on the course
/// This will include mnet-enrolled users, and those who have enrolled /// This will include mnet-enrolled users, and those who have enrolled
@ -150,6 +149,16 @@
foreach($enrolledusers as $user) { foreach($enrolledusers as $user) {
// if this user is not remotely enrolled....
if (!array_key_exists($user->username, $all_enrolled_users)) {
// check to see if we have a record of enrolment and delete it if it's there
if ( $user->wehaverecord) {
$DB->delete_record('mnet_enrol_assignments', array('id'=>$user->enrolid));
}
// and keep going
continue;
}
$dataobj = new stdClass(); $dataobj = new stdClass();
$dataobj->userid = $user->id; $dataobj->userid = $user->id;
$dataobj->hostid = $mnet_peer->id; $dataobj->hostid = $mnet_peer->id;
@ -163,8 +172,6 @@
} elseif (array_key_exists($user->username, $all_enrolled_users)) { } elseif (array_key_exists($user->username, $all_enrolled_users)) {
$dataobj->id = $user->enrolid; $dataobj->id = $user->enrolid;
$DB->update_record('mnet_enrol_assignments', $dataobj); $DB->update_record('mnet_enrol_assignments', $dataobj);
} elseif (is_array($all_enrolled_users) && count($all_enrolled_users)) {
$DB->delete_record('mnet_enrol_assignments', array('id'=>$user->enrolid));
} }
} }
unset($enrolledusers); unset($enrolledusers);

View file

@ -4,6 +4,7 @@
require_once(dirname(__FILE__) . "/../../config.php"); require_once(dirname(__FILE__) . "/../../config.php");
require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot.'/mnet/lib.php');
if (!confirm_sesskey()) { if (!confirm_sesskey()) {
print_error('confirmsesskeybad', 'error'); print_error('confirmsesskeybad', 'error');

View file

@ -4,6 +4,7 @@
require_once(dirname(__FILE__) . "/../../config.php"); require_once(dirname(__FILE__) . "/../../config.php");
require_once($CFG->libdir.'/adminlib.php'); require_once($CFG->libdir.'/adminlib.php');
require_once($CFG->dirroot.'/mnet/lib.php');
admin_externalpage_setup('mnetenrol'); admin_externalpage_setup('mnetenrol');