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

MDL-14679 towards /user conversion

Browse Source
This commit is contained in:
skodak
2008-05-30 22:11:31 +00:00
parent 1d8bf5f0ab
commit 5d910388bb
19 changed files with 132 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/editadvanced.php
+7 -7
View File
@@ -12,7 +12,7 @@
$id = optional_param('id', $USER->id, PARAM_INT); // user id; -1 if creating new user
$course = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site)
if (!$course = get_record('course', 'id', $course)) {
if (!$course = $DB->get_record('course', array('id'=>$course))) {
print_error('Course ID was incorrect');
}
require_login($course->id);
@@ -34,7 +34,7 @@
} else {
// editing existing user
require_capability('moodle/user:update', $systemcontext);
if (!$user = get_record('user', 'id', $id)) {
if (!$user = $DB->get_record('user', array('id'=>$id))) {
print_error('User ID was incorrect');
}
}
@@ -68,7 +68,7 @@
$userform = new user_editadvanced_form();
$userform->set_data($user);
if ($usernew = $userform->get_data()) {
if ($usernew = $userform->get_data(false)) {
add_to_log($course->id, 'user', 'update', "view.php?id=$user->id&course=$course->id", '');
if (empty($usernew->auth)) {
@@ -88,17 +88,17 @@
$usernew->mnethostid = $CFG->mnet_localhost_id; // always local user
$usernew->confirmed = 1;
$usernew->password = hash_internal_user_password($usernew->newpassword);
if (!$usernew->id = insert_record('user', $usernew)) {
if (!$usernew->id = $DB->insert_record('user', $usernew)) {
print_error('Error creating user record');
}
} else {
if (!update_record('user', $usernew)) {
if (!$DB->update_record('user', $usernew)) {
print_error('Error updating user record');
}
// pass a true $userold here
if (! $authplugin->user_update($user, $userform->get_data(false))) {
// auth update failed, rollback for moodle
update_record('user', addslashes_object($user));
$DB->update_record('user', $user);
print_error('Failed to update user data on external auth: '.$user->auth.
'. See the server logs for more details.');
}
@@ -141,7 +141,7 @@
if ($user->id == $USER->id) {
// Override old $USER session variable
$usernew = (array)get_record('user', 'id', $usernew->id); // reload from db
$usernew = $DB->get_record('user', array('id'=>$usernew->id)); // reload from db
foreach ($usernew as $variable => $value) {
$USER->$variable = $value;
}