wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improved error messages

Browse source
This commit is contained in:
Björn Schießle 2013-05-22 18:01:18 +02:00
parent ee53bd1aa3
commit 15a3ae6db1
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files_encryption/ajax/adminrecovery.php
View file

@ -22,6 +22,7 @@ $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
$return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']); $return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
$action = "enable";
// Disable recoveryAdmin // Disable recoveryAdmin
} elseif ( } elseif (
@ -29,7 +30,12 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] == 1){
&& 0 == $_POST['adminEnableRecovery'] && 0 == $_POST['adminEnableRecovery']
) { ) {
$return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']); $return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
$action = "disable";
} }
// Return success or failure // Return success or failure
( $return ) ? \OCP\JSON::success() : \OCP\JSON::error(); if ($return) {
\OCP\JSON::success(array("data" => array( "message" => 'Recovery key successfully ' . $action.'d')));
} else {
\OCP\JSON::error(array("data" => array( "message" => 'Could not '.$action.' recovery key. Please check your recovery key password!')));
}

10
apps/files_encryption/js/settings-admin.js
View file

@ -44,19 +44,19 @@ $(document).ready(function(){
$( 'input:radio[name="adminEnableRecovery"]' ).change( $( 'input:radio[name="adminEnableRecovery"]' ).change(
function() { function() {
var recoveryStatus = $( this ).val(); var recoveryStatus = $( this ).val();
var oldStatus = (1+parseInt(recoveryStatus)) % 2; var oldStatus = (1+parseInt(recoveryStatus)) % 2;
var recoveryPassword = $( '#recoveryPassword' ).val(); var recoveryPassword = $( '#recoveryPassword' ).val();
$.post( $.post(
OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' ) OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
, { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword } , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
, function( data ) { , function( result ) {
if (data.status == "error") { if (result.status === "error") {
alert("Couldn't switch recovery key mode, please check your recovery key password!"); OC.Notification.show(t('admin', result.data.message));
$('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true"); $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
} else { } else {
if (recoveryStatus == "0") { OC.Notification.hide();
if (recoveryStatus === "0") {
$('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true"); $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
$('input:password[name="changeRecoveryPassword"]').attr("disabled", "true"); $('input:password[name="changeRecoveryPassword"]').attr("disabled", "true");
$('input:password[name="changeRecoveryPassword"]').val(""); $('input:password[name="changeRecoveryPassword"]').val("");