diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-24 19:57:39 +0400 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-24 19:57:39 +0400 |
| commit | a4018ad4d7bd768672b1a08a5783f3c87a613999 (patch) | |
| tree | 23c9d9e56a66107acd8f9cb042f6b54959fe7317 /lib/user.php | |
| parent | c6dc7993b6a8e9d128ec6196a1b6297b402b690f (diff) | |
handle recovery password
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 6144f0f6bf9..311e9af866a 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{ |