sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove $recoveryPassword from changepersonalpassword & fix indent

remotes/origin/stable6
kondou 2013-09-06 17:05:10 +07:00
parent a21376480d
commit 4aa84047fe
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
settings/ajax/changepassword.php
Unescape Escape View File

@ -45,14 +45,18 @@ if (\OC_App::isEnabled('files_encryption')) {
} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
$result = OC_User::setPassword($username, $password, $recoveryPassword);
if (!$result && $recoveryPasswordSupported) {
OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." )));
} elseif (!$result && !$recoveryPasswordSupported) {
OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
} else {
OC_JSON::success(array("data" => array( "username" => $username )));
}
$result = OC_User::setPassword($username, $password, $recoveryPassword);
if (!$result && $recoveryPasswordSupported) {
OC_JSON::error(array(
"data" => array(
"message" => "Back-end doesn't support password change, but the users encryption key was successfully updated."
)
));
} elseif (!$result && !$recoveryPasswordSupported) {
OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
} else {
OC_JSON::success(array("data" => array( "username" => $username )));
}
}
} else { // if encryption is disabled, proceed

1
settings/ajax/changepersonalpassword.php
Unescape Escape View File

@ -10,7 +10,6 @@ OC_App::loadApps();
$username = OC_User::getUser();
$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
if (!OC_User::checkPassword($username, $oldPassword)) {
$l = new \OC_L10n('settings');