extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-16 11:41:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: fix preview and display no longer can decrypt an encrypted pgp message

Browse Source
This commit is contained in:
hadi 2023-05-15 14:49:10 +02:00
parent da8819e955
commit b700cd60e0
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mail/js/app.js
View File

@ -5257,26 +5257,24 @@ app.classes.mail = AppJS.extend(
*/ */
mailvelopeDisplay: function(_keyring) mailvelopeDisplay: function(_keyring)
{ {
var self = this; let self = this;
var mailvelope = window.mailvelope; let iframe = jQuery('iframe#mail-display_mailDisplayBodySrc,iframe#mail-index_messageIFRAME');
var iframe = jQuery('iframe#mail-display_mailDisplayBodySrc,iframe#mail-index_messageIFRAME'); let armored = iframe.contents().find('td.td_display > pre').text().trim();
var armored = iframe.contents().find('td.td_display > pre').text().trim();
if (armored == "" || armored.indexOf(this.begin_pgp_message) === -1) return; if (armored == "" || armored.indexOf(this.begin_pgp_message) === -1) return;
var container = iframe.parent()[0]; let container = iframe.parent()[0];
var container_selector = container.id ? '#'+container.id : 'div.mailDisplayContainer'; let container_selector = this.et2._inst.name == 'mail.display' ? '.mailDisplayContainer' : `#${container.dom_id}`;
let options = {
var options = {
showExternalContent: this.egw.preference('allowExternalIMGs') == 1 // "1", or "0", undefined --> true or false showExternalContent: this.egw.preference('allowExternalIMGs') == 1 // "1", or "0", undefined --> true or false
}; };
// get sender address, so Mailvelope can check signature // get sender address, so Mailvelope can check signature
var from_widget = this.et2.getWidgetById('FROM_0') || this.et2.getWidgetById('previewFromAddress'); let from = this.et2._inst.name == 'mail.display' ? this.et2.getArrayMgr('content').data.from : this.et2.getWidgetById('additionalfromaddress').value;
if (from_widget && from_widget.value) if (from)
{ {
options.senderAddress = from_widget.value.replace(/^.*<([^<>]+)>$/, '$1'); options.senderAddress = from[0].replace(/^.*<([^<>]+)>$/, '$1');
} }
mailvelope.createDisplayContainer(container_selector, armored, _keyring, options).then(function() window.mailvelope.createDisplayContainer(container_selector, armored, _keyring, options).then(function()
{ {
// hide our iframe to give space for mailvelope iframe with encrypted content // hide our iframe to give space for mailvelope iframe with encrypted content
iframe.hide(); iframe.hide();