diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-24 20:54:13 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-24 20:54:13 +0200 |
| commit | 946e9ccc0ade60bb9ff34ace9e94e85cce6af96c (patch) | |
| tree | 4770fb73b25d6eb50caa2149df8fb06dd8928a45 /lib/user.php | |
| parent | 5076c0d392f6eb17e368a9382cf5b0abe7408889 (diff) | |
| parent | ae9adcaf8cc1f2b279494cfdd30a1d62d41f5060 (diff) | |
| download | nextcloud-server-946e9ccc0ade60bb9ff34ace9e94e85cce6af96c.tar.gz nextcloud-server-946e9ccc0ade60bb9ff34ace9e94e85cce6af96c.zip | |
Merge branch 'master' into fix_for_2377
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/user.php b/lib/user.php index 32b91c35efc..26fe73f8bfe 100644 --- a/lib/user.php +++ b/lib/user.php @@ -393,13 +393,14 @@ class OC_User { * @brief Set password * @param $uid The username * @param $password The new password + * @param $recoveryPassword for the encryption app to reset encryption keys * @returns true/false * * Change the password of a user */ - public static function setPassword( $uid, $password ) { + public static function setPassword( $uid, $password, $recoveryPassword = null ) { $run = true; - OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password )); + OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword )); if( $run ) { $success = false; @@ -412,7 +413,7 @@ class OC_User { } // invalidate all login cookies OC_Preferences::deleteApp($uid, 'login_token'); - OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password )); + OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword )); return $success; } else{ |