Enigma: Add button to send mail unencrypted if no key was found (#5913)

pull/5934/head
Aleksander Machniak 7 years ago
parent 9672642479
commit 999cfe9f82

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Enigma: Add button to send mail unencrypted if no key was found (#5913)
- Add --get and --extract arguments and CACHEDIR env-variable support to install-jsdeps.sh (#5882)
- Update to jquery-minicolors 2.2.6
- Support _filter and _scope as GET arguments for opening mail UI (#5825)

@ -593,18 +593,37 @@ rcube_webmail.prototype.enigma_password_compose_submit = function(data)
// Display no-key error with key search button
rcube_webmail.prototype.enigma_key_not_found = function(data)
{
return this.show_popup_dialog(
data.text,
data.title,
[{
var params = {width: 400, dialogClass: 'error'},
buttons = [{
'class': 'mainaction search',
text: data.button,
click: function(e) {
click: function() {
$(this).remove();
rcmail.enigma_find_publickey(data.email);
}
}],
{width: 400, dialogClass: 'error'}
);
}];
if (data.mode == 'encrypt') {
buttons.push({
'class': 'send',
text: rcmail.get_label('enigma.sendunencrypted'),
click: function(e) {
$(this).remove();
$('#enigmaencryptopt').prop('checked', false);
rcmail.command('send', {nocheck: true}, e.target, e.originalEvent);
}
});
}
buttons.push({
'class': 'cancel',
text: this.get_label('cancel'),
click: function() {
$(this).remove();
}
});
return this.show_popup_dialog(data.text, data.title, buttons, params);
};
// Search for a public key on the key server

@ -835,6 +835,7 @@ class enigma_ui
// Options menu contents
$this->rc->output->add_footer($menu);
$this->rc->output->add_label('enigma.sendunencrypted');
}
/**
@ -1111,6 +1112,7 @@ class enigma_ui
'text' => $this->rc->gettext(array('name' => $msg, 'vars' => $vars)),
'title' => $this->enigma->gettext('keynotfound'),
'button' => $this->enigma->gettext('findkey'),
'mode' => $mode,
));
}
else {

@ -79,6 +79,7 @@ $labels['keygenerating'] = 'Generating keys...';
$labels['encryptionoptions'] = 'Encryption options...';
$labels['encryptmsg'] = 'Encrypt this message';
$labels['signmsg'] = 'Digitally sign this message';
$labels['sendunencrypted'] = 'Send unencrypted';
$labels['enterkeypasstitle'] = 'Enter key passphrase';
$labels['enterkeypass'] = 'A passphrase is needed to unlock the secret key ($keyid) for user: $user.';

Loading…
Cancel
Save