mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password

This commit is contained in:
Björn Schießle 2013-05-18 10:33:33 +02:00
parent e7d1fe82aa
commit f70240f430
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings/ajax/changepassword.php
View File

@ -28,8 +28,13 @@ if(is_null($userstatus)) {
exit(); exit();
} }
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser()); $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) { $recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') {
OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" )));
}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." ))); OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) { }elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
OC_JSON::success(array("data" => array( "username" => $username ))); OC_JSON::success(array("data" => array( "username" => $username )));
@ -37,4 +42,3 @@ if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
else{ else{
OC_JSON::error(array("data" => array( "message" => "Unable to change password" ))); OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
} }
error_log("bliub");