Remove $recoveryPassword from changepersonalpassword & fix indent

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 41f0fa2f2fd5f6185ae03b6df9b82a97bdc66e17..67b23d2a19ccd9c2bf538701cd269d3b75e3d60c 100644 (file)
--- 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 6c3f5d599aca633df05847551640c910fb0f51de..44ede3f9cc64a042f2eb40ef129e4137f5eb8945 100644 (file)
--- 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');