Permalink
Browse files

Merge branch 'MDL-30878-MOODLE_22_STABLE' of git://github.com/mouneyr…

…ac/moodle into MOODLE_22_STABLE
  • Loading branch information...
2 parents 9a7310e + 15dd454 commit 01c7382881a65f7891502c3bddd9b4342ee3264a @nebgor nebgor committed Feb 28, 2012
Showing with 29 additions and 12 deletions.
  1. +29 −12 user/lib.php
View
@@ -27,61 +27,78 @@
/**
* Creates a user
+ *
* @param object $user user to create
* @return int id of the newly created user
*/
function user_create_user($user) {
global $DB;
-/// set the timecreate field to the current time
+ // set the timecreate field to the current time
if (!is_object($user)) {
$user = (object)$user;
}
- /// hash the password
- $user->password = hash_internal_user_password($user->password);
+ // save the password in a temp value for later
+ if (isset($user->password)) {
+ $userpassword = $user->password;
+ unset($user->password);
+ }
$user->timecreated = time();
$user->timemodified = $user->timecreated;
-/// insert the user into the database
+ // insert the user into the database
$newuserid = $DB->insert_record('user', $user);
-/// trigger user_created event on the full database user row
+ // trigger user_created event on the full database user row
$newuser = $DB->get_record('user', array('id' => $newuserid));
events_trigger('user_created', $newuser);
-/// create USER context for this user
+ // create USER context for this user
get_context_instance(CONTEXT_USER, $newuserid);
+ // update user password if necessary
+ if (isset($userpassword)) {
+ update_internal_user_password($newuser, $userpassword);
+ }
+
return $newuserid;
}
/**
* Update a user with a user object (will compare against the ID)
- * @param object $user - the user to update
+ *
+ * @param object $user the user to update
*/
function user_update_user($user) {
global $DB;
- /// set the timecreate field to the current time
+ // set the timecreate field to the current time
if (!is_object($user)) {
$user = (object)$user;
}
- /// hash the password
- $user->password = hash_internal_user_password($user->password);
+ // unset password here, for updating later
+ if (isset($user->password)) {
+ $passwd = $user->password;
+ unset($user->password);
+ }
$user->timemodified = time();
$DB->update_record('user', $user);
- /// trigger user_updated event on the full database user row
+ // trigger user_updated event on the full database user row
$updateduser = $DB->get_record('user', array('id' => $user->id));
events_trigger('user_updated', $updateduser);
-}
+ // if password was set, then update its hash
+ if (isset($passwd)) {
+ update_internal_user_password($updateduser, $passwd);
+ }
+}
/**
* Marks user deleted in internal user database and notifies the auth plugin.

0 comments on commit 01c7382

Please sign in to comment.