From 9bd651a46181169de8d3a608066ba7c7d5b5145f Mon Sep 17 00:00:00 2001
From: Penny Leach <penny@mjollnir.org>
Date: Tue, 12 Jan 2010 04:48:18 +0100
Subject: [PATCH] mnet: MDL-10642 & MDL-17782 send over extra fields with
the user information
---
auth/mnet/auth.php | 20 ++------------------
enrol/mnet/enrol.php | 8 ++------
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index ab077213b4..46d296b7ba 100644
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -94,26 +94,10 @@ class auth_plugin_mnet extends auth_plugin_base {
exit;
}
- $userdata = array();
- $userdata['username'] = $user->username;
- $userdata['email'] = $user->email;
+ $userdata = (array)$user;
$userdata['auth'] = 'mnet';
- $userdata['confirmed'] = $user->confirmed;
- $userdata['deleted'] = $user->deleted;
- $userdata['firstname'] = $user->firstname;
- $userdata['lastname'] = $user->lastname;
- $userdata['city'] = $user->city;
- $userdata['country'] = $user->country;
- $userdata['lang'] = $user->lang;
- $userdata['timezone'] = $user->timezone;
- $userdata['description'] = $user->description;
- $userdata['mailformat'] = $user->mailformat;
- $userdata['maildigest'] = $user->maildigest;
- $userdata['maildisplay'] = $user->maildisplay;
- $userdata['htmleditor'] = $user->htmleditor;
- $userdata['wwwroot'] = $MNET->wwwroot;
$userdata['session.gc_maxlifetime'] = ini_get('session.gc_maxlifetime');
- $userdata['picture'] = $user->picture;
+ unset($userdata['id']);
if (!empty($user->picture)) {
$imagefile = make_user_directory($user->id, true) . "/f1.jpg";
if (file_exists($imagefile)) {
diff --git a/enrol/mnet/enrol.php b/enrol/mnet/enrol.php
index 58c57eda68..62c8bc011a 100644
--- a/enrol/mnet/enrol.php
+++ b/enrol/mnet/enrol.php
@@ -303,11 +303,7 @@ class enrolment_plugin_mnet {
// We should at least be checking that we allow the remote
// site to create users
// TODO: more rigour here thanks!
- $userrecord = new stdClass();
- $userrecord->username = $user['username'];
- $userrecord->email = $user['email'];
- $userrecord->firstname = $user['firstname'];
- $userrecord->lastname = $user['lastname'];
+ $userrecord = (object)$user;
$userrecord->mnethostid = $MNET_REMOTE_CLIENT->id;
if ($userrecord->id = $DB->insert_record('user', $userrecord)) {
@@ -514,7 +510,7 @@ class enrolment_plugin_mnet {
// Prepare a basic user record
// in case the remote host doesn't have it
- $user = $DB->get_record('user', array('id'=>$userid), 'username, email, firstname, lastname');
+ $user = $DB->get_record('user', array('id'=>$userid));
$user = (array)$user;
$course = $DB->get_record('mnet_enrol_course', array('id'=>$courseid));
--
2.39.5