diff options
| -rw-r--r-- | inbox_settings.php | 4 | ||||
| -rw-r--r-- | keys.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/inbox_settings.php b/inbox_settings.php index aa8e8a2..4e7b24f 100644 --- a/inbox_settings.php +++ b/inbox_settings.php @@ -198,7 +198,7 @@ class inbox_settings extends rcube_plugin { } private function import_keys() { - if (!isset($_POST['import'])) + if (!isset($_POST['import']) || empty($_POST['key_data'])) return false; try { @@ -227,7 +227,7 @@ class inbox_settings extends rcube_plugin { $this->rcmail->output->command( 'display_message', $this->gettext('keys_imported'), 'notice'); - return true; + return isset($_POST['refresh']) ? boolval($_POST['refresh']) : true; } function render_import_ui() { @@ -42,11 +42,11 @@ rcube_webmail.prototype.inbox_keys_generate = function() { this.addEventListener('responseafter', () => { location.href = 'data:application/pgp-keys;base64,' + btoa(generated.privateKey); - this.reload(2000); + this.reload(1500); }); this.http_post( 'plugin.inbox_keys_import', - {import: true, key_data: generated.publicKey, comment}, + {import: true, refresh: false, key_data: generated.publicKey, comment}, lock); }); }; @@ -65,7 +65,7 @@ rcube_webmail.prototype.inbox_keys_delete = function() { function(_evt, ref) { var lock = ref.display_message( ref.get_label('inbox_settings.deleting_key', 'loading')); - ref.addEventListener('responseafter', () => ref.reload(2000)); + ref.addEventListener('responseafter', () => ref.reload(1500)); ref.http_post('plugin.inbox_keys_delete', {keys}, lock); }); }; |