[pmg-devel] [PATCH pmg-gui 0/2] fix small glitch in attachment quarantine

[pmg-devel] [PATCH pmg-gui 0/2] fix small glitch in attachment quarantine

[Stoiko Ivanov]

as reported in our community-forum [0], the raw view for the
attachment-quarantine was broken.

The first patch adds the missing parameter-separator to the url.
The second patch unifies the url-generation for all three quarantine views
(because I was confused why it only broke for the attachementquarantine)

very quickly tested on my testsetup

Stoiko Ivanov (2):
  attachmentquarantine: fix missing '&' for raw-param addition
  quarantineview: unify url generation

 js/AttachmentQuarantine.js | 2 +-
 js/SpamQuarantine.js       | 5 ++++-
 js/VirusQuarantine.js      | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.20.1

[pmg-devel] [PATCH pmg-gui 1/2] attachmentquarantine: fix missing '&' for raw-param addition

[Stoiko Ivanov]

small glitch introduced in the code cleanup in:
0e26e20aa5522b3f7d05e68c96104b051419b901

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 js/AttachmentQuarantine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/AttachmentQuarantine.js b/js/AttachmentQuarantine.js
index ed443d7..f1a9a54 100644
--- a/js/AttachmentQuarantine.js
+++ b/js/AttachmentQuarantine.js
@@ -42,7 +42,7 @@ Ext.define('PMG.AttachmentQuarantine', {
 
 	    let url = `/api2/htmlmail/quarantine/content?id=${rec.data.id}`;
 	    if (raw) {
-		url += 'raw=1';
+		url += '&raw=1';
 	    }
 	    preview.setDisabled(false);
 	    preview.update("<iframe frameborder=0 width=100% height=100% sandbox='allow-same-origin' src='" + url +"'></iframe>");
-- 
2.20.1

[pmg-devel] [PATCH pmg-gui 2/2] quarantineview: unify url generation

[Stoiko Ivanov]

this patch adds the cleanup for the attachment quarantine from
0e26e20aa5522b3f7d05e68c96104b051419b901 to the virus- and
spamquarantine.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 js/SpamQuarantine.js  | 5 ++++-
 js/VirusQuarantine.js | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/js/SpamQuarantine.js b/js/SpamQuarantine.js
index f580ab3..daa3a69 100644
--- a/js/SpamQuarantine.js
+++ b/js/SpamQuarantine.js
@@ -67,7 +67,10 @@ Ext.define('PMG.SpamQuarantine', {
 		return;
 	    }
 
-	    var url = '/api2/htmlmail/quarantine/content?id=' + rec.data.id + (raw?'&raw=1':'');
+	    let url = `/api2/htmlmail/quarantine/content?id=${rec.data.id}`;
+	    if (raw) {
+		url += '&raw=1';
+	    }
 	    preview.setDisabled(false);
 	    this.lookupReference('raw').setDisabled(false);
 	    this.lookupReference('spam').setDisabled(false);
diff --git a/js/VirusQuarantine.js b/js/VirusQuarantine.js
index 105a438..d5753dd 100644
--- a/js/VirusQuarantine.js
+++ b/js/VirusQuarantine.js
@@ -43,7 +43,10 @@ Ext.define('PMG.VirusQuarantine', {
 		return;
 	    }
 
-	    var url = '/api2/htmlmail/quarantine/content?id=' + rec.data.id + (raw?'&raw=1':'');
+	    let url = `/api2/htmlmail/quarantine/content?id=${rec.data.id}`;
+	    if (raw) {
+		url += '&raw=1';
+	    }
 	    preview.setDisabled(false);
 	    preview.update("<iframe frameborder=0 width=100% height=100% sandbox='allow-same-origin' src='" + url +"'></iframe>");
 	},
-- 
2.20.1

[pmg-devel] applied: [PATCH pmg-gui 0/2] fix small glitch in attachment quarantine

[Thomas Lamprecht]

On 05.05.21 11:33, Stoiko Ivanov wrote:
> as reported in our community-forum [0], the raw view for the
> attachment-quarantine was broken.
> 
> The first patch adds the missing parameter-separator to the url.
> The second patch unifies the url-generation for all three quarantine views
> (because I was confused why it only broke for the attachementquarantine)
> 
> very quickly tested on my testsetup
> 
> Stoiko Ivanov (2):
>   attachmentquarantine: fix missing '&' for raw-param addition
>   quarantineview: unify url generation
> 
>  js/AttachmentQuarantine.js | 2 +-
>  js/SpamQuarantine.js       | 5 ++++-
>  js/VirusQuarantine.js      | 5 ++++-
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 



applied both patches, thanks!