From 4aa84047fe5c499c56b723006c8acaf5891c5df4 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Fri, 6 Sep 2013 17:05:10 +0200
Subject: [PATCH] Remove $recoveryPassword from changepersonalpassword & fix
indent
---
settings/ajax/changepassword.php | 20 ++++++++++++--------
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 41f0fa2f2f..67b23d2a19 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 6c3f5d599a..44ede3f9cc 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');
--
GitLab