From 94a9ff1cd8b18577e16bde90146b0be84223d725 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 7 Oct 2014 12:02:58 +0200 Subject: make sure that the notification gets shown again after a second try --- core/js/js.js | 69 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/core/js/js.js b/core/js/js.js index dde8ffa3211..566a3d4d8cd 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -198,7 +198,7 @@ var OC={ linkTo:function(app,file){ return OC.filePath(app,'',file); }, - + /** * Creates a relative url for remote use * @param {string} service id @@ -300,7 +300,7 @@ var OC={ } return link; }, - + /** * Redirect to the target URL, can also be used for downloads. * @param {string} targetURL URL to redirect to @@ -308,10 +308,10 @@ var OC={ redirect: function(targetURL) { window.location = targetURL; }, - + /** * get the absolute path to an image file - * if no extension is given for the image, it will automatically decide + * if no extension is given for the image, it will automatically decide * between .png and .svg based on what the browser supports * @param {string} app the app id to which the image belongs * @param {string} file the name of the image file @@ -323,9 +323,9 @@ var OC={ } return OC.filePath(app,'img',file); }, - + /** - * Load a script for the server and load it. If the script is already loaded, + * Load a script for the server and load it. If the script is already loaded, * the event handler will be called directly * @param {string} app the app id to which the script belongs * @param {string} script the filename of the script @@ -364,21 +364,21 @@ var OC={ } } }, - + /** * @todo Write the documentation */ basename: function(path) { return path.replace(/\\/g,'/').replace( /.*\//, '' ); }, - + /** * @todo Write the documentation */ dirname: function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); }, - + /** * Do a search query and display the results * @param {string} query the search query @@ -393,7 +393,7 @@ var OC={ } }, 500), dialogs:OCdialogs, - + /** * Parses a URL query string into a JS map * @param {string} queryString query string in the format param1=1234¶m2=abcde¶m3=xyz @@ -604,7 +604,7 @@ OC.msg={ startSaving:function(selector){ OC.msg.startAction(selector, t('core', 'Saving...')); }, - + /** * @param selector * @param data @@ -613,7 +613,7 @@ OC.msg={ finishedSaving:function(selector, data){ OC.msg.finishedAction(selector, data); }, - + /** * @param selector * @param {string} message Message to display @@ -627,7 +627,7 @@ OC.msg={ .stop(true, true) .show(); }, - + /** * @param selector * @param data @@ -636,12 +636,17 @@ OC.msg={ finishedAction:function(selector, data){ if( data.status === "success" ){ $(selector).html( data.data.message ) - .addClass('success') - .stop(true, true) - .delay(3000) - .fadeOut(900); + .addClass('success') + .removeClass('error') + .stop(true, true) + .delay(3000) + .fadeOut(900) + .show(); }else{ - $(selector).html( data.data.message ).addClass('error'); + $(selector).html( data.data.message ) + .addClass('error') + .removeClass('success') + .show(); } } }; @@ -652,7 +657,7 @@ OC.msg={ OC.Notification={ queuedNotifications: [], getDefaultNotificationFunction: null, - + /** * @param callback * @todo Write documentation @@ -660,7 +665,7 @@ OC.Notification={ setDefault: function(callback) { OC.Notification.getDefaultNotificationFunction = callback; }, - + /** * Hides a notification * @param callback @@ -683,7 +688,7 @@ OC.Notification={ } }); }, - + /** * Shows a notification as HTML without being sanitized before. * If you pass unsanitized user input this may lead to a XSS vulnerability. @@ -699,7 +704,7 @@ OC.Notification={ OC.Notification.queuedNotifications.push(html); } }, - + /** * Shows a sanitized notification * @param {string} text Message to display @@ -713,9 +718,9 @@ OC.Notification={ OC.Notification.queuedNotifications.push($('
').text(text).html()); } }, - + /** - * Returns whether a notification is hidden. + * Returns whether a notification is hidden. * @return {boolean} */ isHidden: function() { @@ -779,7 +784,7 @@ OC.Breadcrumb={ this._push(container, leafname, leaflink); } }, - + /** * @todo Write documentation * @param {string} name @@ -809,7 +814,7 @@ OC.Breadcrumb={ } return crumb; }, - + /** * @todo Write documentation */ @@ -820,7 +825,7 @@ OC.Breadcrumb={ this.container.find('div.crumb').last().remove(); this.container.find('div.crumb').last().addClass('last'); }, - + /** * @todo Write documentation */ @@ -841,7 +846,7 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ */ OC.localStorage={ namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_', - + /** * Whether the storage contains items * @param {string} name @@ -850,7 +855,7 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ hasItem:function(name){ return OC.localStorage.getItem(name)!==null; }, - + /** * Add an item to the storage * @param {string} name @@ -859,7 +864,7 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ setItem:function(name,item){ return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item)); }, - + /** * Removes an item from the storage * @param {string} name @@ -868,7 +873,7 @@ if(typeof localStorage !=='undefined' && localStorage !== null){ removeItem:function(name,item){ return localStorage.removeItem(OC.localStorage.namespace+name); }, - + /** * Get an item from the storage * @param {string} name @@ -1248,7 +1253,7 @@ function formatDate(timestamp){ return OC.Util.formatDate(timestamp); } -// +// /** * Get the value of a URL parameter * @link http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery -- cgit v1.2.3 From 5fa1cbc4e5aa0c0127713859291a0b14a8b8e348 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 7 Oct 2014 12:06:46 +0200 Subject: improved visual feedback if recovery key gets enabled/disabled --- apps/files_encryption/ajax/adminrecovery.php | 48 ++++++++++++++-------- apps/files_encryption/js/settings-admin.js | 32 ++------------- apps/files_encryption/templates/settings-admin.php | 11 ++--- 3 files changed, 41 insertions(+), 50 deletions(-) diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php index 070ca6f667e..684fd51ae13 100644 --- a/apps/files_encryption/ajax/adminrecovery.php +++ b/apps/files_encryption/ajax/adminrecovery.php @@ -16,8 +16,28 @@ use OCA\Encryption; $l = \OC::$server->getL10N('files_encryption'); $return = false; -// Enable recoveryAdmin +$errorMessage = $l->t("Unknown error"); + +//check if both passwords are the same +if (empty($_POST['recoveryPassword'])) { + $errorMessage = $l->t('Missing recovery key password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} +if (empty($_POST['confirmPassword'])) { + $errorMessage = $l->t('Please repeat the recovery key password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} + +if ($_POST['recoveryPassword'] !== $_POST['confirmPassword']) { + $errorMessage = $l->t('Repeated recovery key password does not match the provided recovery key password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} + +// Enable recoveryAdmin $recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId'); if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') { @@ -26,14 +46,9 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1 // Return success or failure if ($return) { - \OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully enabled')))); + $successMessage = $l->t('Recovery key successfully enabled'); } else { - \OCP\JSON::error(array( - 'data' => array( - 'message' => $l->t( - 'Could not enable recovery key. Please check your recovery key password!') - ) - )); + $errorMessage = $l->t('Could not disable recovery key. Please check your recovery key password!'); } // Disable recoveryAdmin @@ -43,17 +58,16 @@ if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1 ) { $return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']); - // Return success or failure if ($return) { - \OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully disabled')))); + $successMessage = $l->t('Recovery key successfully disabled'); } else { - \OCP\JSON::error(array( - 'data' => array( - 'message' => $l->t( - 'Could not disable recovery key. Please check your recovery key password!') - ) - )); + $errorMessage = $l->t('Could not disable recovery key. Please check your recovery key password!'); } } - +// Return success or failure +if ($return) { + \OCP\JSON::success(array('data' => array('message' => $successMessage))); +} else { + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); +} diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js index 4c6b1bac2f7..38a5cd1b556 100644 --- a/apps/files_encryption/js/settings-admin.js +++ b/apps/files_encryption/js/settings-admin.js @@ -9,32 +9,21 @@ $(document).ready(function(){ - $('input:password[name="encryptionRecoveryPassword"]').keyup(function(event) { - var recoveryPassword = $( '#encryptionRecoveryPassword' ).val(); - var recoveryPasswordRepeated = $( '#repeatEncryptionRecoveryPassword' ).val(); - var checkedButton = $('input:radio[name="adminEnableRecovery"]:checked').val(); - var uncheckedValue = (1+parseInt(checkedButton)) % 2; - if (recoveryPassword !== '' && recoveryPassword === recoveryPasswordRepeated) { - $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').removeAttr("disabled"); - } else { - $('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').attr("disabled", "true"); - } - }); - $( 'input:radio[name="adminEnableRecovery"]' ).change( function() { var recoveryStatus = $( this ).val(); var oldStatus = (1+parseInt(recoveryStatus)) % 2; var recoveryPassword = $( '#encryptionRecoveryPassword' ).val(); + var confirmPassword = $( '#repeatEncryptionRecoveryPassword' ).val(); + OC.msg.startSaving('#encryptionSetRecoveryKey .msg'); $.post( OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' ) - , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword } + , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword, confirmPassword: confirmPassword } , function( result ) { + OC.msg.finishedSaving('#encryptionSetRecoveryKey .msg', result); if (result.status === "error") { - OC.Notification.show(t('admin', result.data.message)); $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true"); } else { - OC.Notification.hide(); if (recoveryStatus === "0") { $('p[name="changeRecoveryPasswordBlock"]').addClass("hidden"); } else { @@ -49,19 +38,6 @@ $(document).ready(function(){ // change recovery password - $('input:password[name="changeRecoveryPassword"]').keyup(function(event) { - var oldRecoveryPassword = $('#oldEncryptionRecoveryPassword').val(); - var newRecoveryPassword = $('#newEncryptionRecoveryPassword').val(); - var newRecoveryPasswordRepeated = $('#repeatedNewEncryptionRecoveryPassword').val(); - - if (newRecoveryPassword !== '' && oldRecoveryPassword !== '' && newRecoveryPassword === newRecoveryPasswordRepeated) { - $('button:button[name="submitChangeRecoveryKey"]').removeAttr("disabled"); - } else { - $('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true"); - } - }); - - $('button:button[name="submitChangeRecoveryKey"]').click(function() { var oldRecoveryPassword = $('#oldEncryptionRecoveryPassword').val(); var newRecoveryPassword = $('#newEncryptionRecoveryPassword').val(); diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php index 2d5f7084c96..e97f64b6482 100644 --- a/apps/files_encryption/templates/settings-admin.php +++ b/apps/files_encryption/templates/settings-admin.php @@ -4,8 +4,9 @@ t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?> -

+

t("Enable recovery key (allow to recover users files in case of password loss):")); ?> +

@@ -19,7 +20,7 @@ id='adminEnableRecovery' name='adminEnableRecovery' value='1' - /> + />
@@ -28,7 +29,7 @@ id='adminDisableRecovery' name='adminEnableRecovery' value='0' - /> + />



@@ -57,8 +58,8 @@

-- cgit v1.2.3 From 794d3ef949b487011805d50e851e5a07ad7776d4 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 7 Oct 2014 12:30:50 +0200 Subject: improved visual feedback if recovery key password gets changed --- .../ajax/changeRecoveryPassword.php | 26 ++++++++++++++++++++++ apps/files_encryption/js/settings-admin.js | 11 ++++----- apps/files_encryption/templates/settings-admin.php | 4 ++-- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php index 71fbe333fe0..bf647f2c8fa 100644 --- a/apps/files_encryption/ajax/changeRecoveryPassword.php +++ b/apps/files_encryption/ajax/changeRecoveryPassword.php @@ -21,6 +21,32 @@ $return = false; $oldPassword = $_POST['oldPassword']; $newPassword = $_POST['newPassword']; +$confirmPassword = $_POST['confirmPassword']; + +//check if both passwords are the same +if (empty($_POST['oldPassword'])) { + $errorMessage = $l->t('Please provide the old recovery password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} + +if (empty($_POST['newPassword'])) { + $errorMessage = $l->t('Please provide a new recovery password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} + +if (empty($_POST['confirmPassword'])) { + $errorMessage = $l->t('Please repeat the new recovery password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} + +if ($_POST['newPassword'] !== $_POST['confirmPassword']) { + $errorMessage = $l->t('Repeated recovery key password does not match the provided recovery key password'); + \OCP\JSON::error(array('data' => array('message' => $errorMessage))); + exit(); +} $view = new \OC\Files\View('/'); $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser()); diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js index 38a5cd1b556..2242c1f7124 100644 --- a/apps/files_encryption/js/settings-admin.js +++ b/apps/files_encryption/js/settings-admin.js @@ -41,17 +41,14 @@ $(document).ready(function(){ $('button:button[name="submitChangeRecoveryKey"]').click(function() { var oldRecoveryPassword = $('#oldEncryptionRecoveryPassword').val(); var newRecoveryPassword = $('#newEncryptionRecoveryPassword').val(); - OC.msg.startSaving('#encryption .msg'); + var confirmNewPassword = $('#repeatedNewEncryptionRecoveryPassword').val(); + OC.msg.startSaving('#encryptionChangeRecoveryKey .msg'); $.post( OC.filePath( 'files_encryption', 'ajax', 'changeRecoveryPassword.php' ) - , { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword } + , { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword, confirmPassword: confirmNewPassword } , function( data ) { - if (data.status == "error") { - OC.msg.finishedSaving('#encryption .msg', data); - } else { - OC.msg.finishedSaving('#encryption .msg', data); + OC.msg.finishedSaving('#encryptionChangeRecoveryKey .msg', data); } - } ); }); diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php index e97f64b6482..d003f245bb3 100644 --- a/apps/files_encryption/templates/settings-admin.php +++ b/apps/files_encryption/templates/settings-admin.php @@ -34,8 +34,9 @@



-

> +

> t("Change recovery key password:")); ?> +

t("Change Password")); ?> -

-- cgit v1.2.3 From b060123155d82d59c981b89600a3a1b2c9f37bc9 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 7 Oct 2014 12:52:01 +0200 Subject: improved visual feedback if user enabled recovery key --- apps/files_encryption/ajax/userrecovery.php | 8 +++++++- apps/files_encryption/js/settings-personal.js | 21 ++++++--------------- .../templates/settings-personal.php | 5 ++--- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php index 0f3b973d69a..a5b89fa7233 100644 --- a/apps/files_encryption/ajax/userrecovery.php +++ b/apps/files_encryption/ajax/userrecovery.php @@ -13,6 +13,8 @@ use OCA\Encryption; \OCP\JSON::checkAppEnabled('files_encryption'); \OCP\JSON::callCheck(); +$l = \OC::$server->getL10N('files_encryption'); + if ( isset($_POST['userEnableRecovery']) && (0 == $_POST['userEnableRecovery'] || '1' === $_POST['userEnableRecovery']) @@ -38,4 +40,8 @@ if ( } // Return success or failure -($return) ? \OCP\JSON::success() : \OCP\JSON::error(); +if ($return) { + \OCP\JSON::success(array('data' => array('message' => $l->t('File recovery settings updated')))); +} else { + \OCP\JSON::error(array('data' => array('message' => $l->t('Could not update file recovery')))); +} diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js index f857c2c9f05..b798ba7e4e1 100644 --- a/apps/files_encryption/js/settings-personal.js +++ b/apps/files_encryption/js/settings-personal.js @@ -26,36 +26,27 @@ $(document).ready(function(){ // Trigger ajax on recoveryAdmin status change $( 'input:radio[name="userEnableRecovery"]' ).change( function() { - - // Hide feedback messages in case they're already visible - $('#recoveryEnabledSuccess').hide(); - $('#recoveryEnabledError').hide(); - var recoveryStatus = $( this ).val(); - + OC.msg.startAction('#userEnableRecovery .msg', 'Updating recovery keys. This can take some time...'); $.post( OC.filePath( 'files_encryption', 'ajax', 'userrecovery.php' ) , { userEnableRecovery: recoveryStatus } , function( data ) { - if ( data.status == "success" ) { - $('#recoveryEnabledSuccess').show(); - } else { - $('#recoveryEnabledError').show(); - } + OC.msg.finishedAction('#userEnableRecovery .msg', data); } ); // Ensure page is not reloaded on form submit return false; } ); - + $("#encryptAll").click( function(){ - + // Hide feedback messages in case they're already visible $('#encryptAllSuccess').hide(); $('#encryptAllError').hide(); - + var userPassword = $( '#userPassword' ).val(); var encryptAll = $( '#encryptAll' ).val(); @@ -73,7 +64,7 @@ $(document).ready(function(){ // Ensure page is not reloaded on form submit return false; } - + ); // update private key password diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php index a1221240422..ce8cf6aec28 100644 --- a/apps/files_encryption/templates/settings-personal.php +++ b/apps/files_encryption/templates/settings-personal.php @@ -39,8 +39,9 @@
-

+

+
t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?>
@@ -60,8 +61,6 @@ value='0' /> -

t( 'File recovery settings updated' ) ); ?>
-
t( 'Could not update file recovery' ) ); ?>

-- cgit v1.2.3