handle recovery password

diff --git a/lib/user.php b/lib/user.php
index 6144f0f6bf9851a0ae7daeb3576a77a0b90032c8..311e9af866a77107e2d1c0c7a609afa66d419010 100644 (file)
--- 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{