From f1a5b8b524531567ba18c6e08a6f7110dcff18d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 16 May 2013 16:01:40 +0200
Subject: [PATCH] show nicer warning if the admin recovery password was wrong
---
settings/ajax/changepassword.php | 2 +-
settings/js/users.js | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index adb730e12c..6b5bf9c66b 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -30,7 +30,7 @@ if(is_null($userstatus)) {
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
if ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
- OC_JSON::error(array("data" => array( "message" => "Wrong recovery admin 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 )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
diff --git a/settings/js/users.js b/settings/js/users.js
index 423068e51f..f3fab34b09 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -351,15 +351,13 @@ $(document).ready(function () {
input.keypress(function (event) {
if (event.keyCode == 13) {
if ($(this).val().length > 0) {
- var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
- console.log("RECOVERY PASSWD: " + recoveryPasswordVal);
+ var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
$.post(
OC.filePath('settings', 'ajax', 'changepassword.php'),
{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
function (result) {
if (result.status != 'success') {
- OC.dialogs.alert(result.data.message,
- t('settings', 'Error changing password'));
+ OC.Notification.show(t('admin', result.data.message));
}
}
);
@@ -374,6 +372,10 @@ $(document).ready(function () {
img.css('display', '');
});
});
+ $('input:password[id="recoveryPassword"]').keyup(function(event) {
+ OC.Notification.hide();
+ });
+
$('table').on('click', 'td.password', function (event) {
$(this).children('img').click();
});
--
GitLab