diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-06 17:05:10 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-06 17:05:10 +0200 |
| commit | 4aa84047fe5c499c56b723006c8acaf5891c5df4 (patch) | |
| tree | a0aca095a5995ff85344a764ec5698e70dee8d84 /settings/ajax | |
| parent | a21376480df10fdb96685d0eb2e663d494aed16f (diff) | |
| download | nextcloud-server-4aa84047fe5c499c56b723006c8acaf5891c5df4.tar.gz nextcloud-server-4aa84047fe5c499c56b723006c8acaf5891c5df4.zip | |
Remove $recoveryPassword from changepersonalpassword & fix indent
Diffstat (limited to 'settings/ajax')
| -rw-r--r-- | settings/ajax/changepassword.php | 20 | ||||
| -rw-r--r-- | settings/ajax/changepersonalpassword.php | 1 |
2 files changed, 12 insertions, 9 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 41f0fa2f2fd..67b23d2a19c 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -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 diff --git a/settings/ajax/changepersonalpassword.php b/settings/ajax/changepersonalpassword.php index 6c3f5d599ac..44ede3f9cc6 100644 --- a/settings/ajax/changepersonalpassword.php +++ b/settings/ajax/changepersonalpassword.php @@ -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'); |