From 9d1e60325c6f478484ff8f70ff3cd13d9d7d4913 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 16 May 2013 14:53:04 +0200
Subject: allow admin to recover users files in case of password lost

---
 settings/js/users.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'settings/js/users.js')

diff --git a/settings/js/users.js b/settings/js/users.js
index 690c9ad0464..9bd7f31f0b2 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -351,9 +351,11 @@ $(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);
 					$.post(
 						OC.filePath('settings', 'ajax', 'changepassword.php'),
-						{username: uid, password: $(this).val()},
+						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
 						function (result) {
 						}
 					);
-- 
cgit v1.2.3


From 8ae30891b3cd5781741ce797b0ff99d68eab7c8d Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 16 May 2013 15:19:53 +0200
Subject: some error handling in case the recovery password is wrong

---
 settings/ajax/changepassword.php | 7 +++++--
 settings/js/users.js             | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'settings/js/users.js')

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index fe63f27a6e2..adb730e12c2 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -28,10 +28,13 @@ if(is_null($userstatus)) {
 	exit();
 }
 
-// Return Success story
-if(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
+$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." )));
+}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
 	OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
 }
+error_log("bliub");
diff --git a/settings/js/users.js b/settings/js/users.js
index 9bd7f31f0b2..423068e51f3 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -357,6 +357,10 @@ $(document).ready(function () {
 						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'));
+							}
 						}
 					);
 					input.blur();
-- 
cgit v1.2.3


From f1a5b8b524531567ba18c6e08a6f7110dcff18d7 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 16 May 2013 16:01:40 +0200
Subject: 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(-)

(limited to 'settings/js/users.js')

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index adb730e12c2..6b5bf9c66bd 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 423068e51f3..f3fab34b090 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();
 	});
-- 
cgit v1.2.3