fix #4137: display receiver in attachment/virus quarantine

[pmg-gui.git] / js / Utils.js

diff --git a/js/Utils.js b/js/Utils.js
index 8c0dc8c9cd35003db6a60e1ed74c20596640bbcf..695967d83e273abee74922a9b013100dee2121e8 100644 (file)
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -161,14 +161,12 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'textfield',
                    name: 'regex',
-                   labelWidth: 150,
                    reference: 'regex',
-                   fieldLabel: gettext("Regular Expression"),
+                   fieldLabel: gettext("Regex"),
                },
                {
                    xtype: 'pmgRegexTester',
                    fieldLabel: gettext('Test String'),
-                   labelWidth: 150,
                    wholeMatch: true,
                    regexFieldReference: 'regex',
                },
@@ -200,8 +198,7 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'textfield',
                    name: 'regex',
-                   labelWidth: 150,
-                   fieldLabel: gettext("Regular Expression"),
+                   fieldLabel: gettext("Regex"),
                },
            ],
        },
@@ -359,22 +356,19 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'textfield',
                    name: 'field',
-                   labelWidth: 150,
                    allowBlank: false,
                    fieldLabel: gettext('Field'),
                },
                {
                    xtype: 'textfield',
-                   reference: 'value',
                    name: 'value',
-                   labelWidth: 150,
+                   reference: 'value',
                    allowBlank: false,
                    fieldLabel: gettext('Value'),
                },
                {
-                   labelWidth: 150,
-                   fieldLabel: gettext('Test String'),
                    xtype: 'pmgRegexTester',
+                   fieldLabel: gettext('Test String'),
                    regexFieldReference: 'value',
                },
            ],
@@ -390,7 +384,6 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'combobox',
                    displayField: 'text',
-                   labelWidth: 150,
                    valueField: 'mimetype',
                    name: 'contenttype',
                    editable: true,
@@ -415,7 +408,6 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'displayfield',
                    fieldLabel: gettext('Value'),
-                   labelWidth: 150,
                    allowBlank: false,
                    reset: Ext.emptyFn,
                },
@@ -434,14 +426,12 @@ Ext.define('PMG.Utils', {
                    name: 'filename',
                    reference: 'filename',
                    fieldLabel: gettext('Filename'),
-                   labelWidth: 150,
                    allowBlank: false,
                },
                {
-                   labelWidth: 150,
+                   xtype: 'pmgRegexTester',
                    fieldLabel: gettext('Test String'),
                    wholeMatch: true,
-                   xtype: 'pmgRegexTester',
                    regexFieldReference: 'filename',
                },
            ],
@@ -457,7 +447,6 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'combobox',
                    displayField: 'text',
-                   labelWidth: 150,
                    valueField: 'mimetype',
                    name: 'contenttype',
                    editable: true,
@@ -482,7 +471,6 @@ Ext.define('PMG.Utils', {
                {
                    xtype: 'displayfield',
                    fieldLabel: gettext('Value'),
-                   labelWidth: 150,
                    allowBlank: false,
                    reset: Ext.emptyFn,
                },
@@ -501,14 +489,12 @@ Ext.define('PMG.Utils', {
                    name: 'filename',
                    reference: 'filename',
                    fieldLabel: gettext('Filename'),
-                   labelWidth: 150,
                    allowBlank: false,
                },
                {
-                   labelWidth: 150,
+                   xtype: 'pmgRegexTester',
                    fieldLabel: gettext('Test String'),
                    wholeMatch: true,
-                   xtype: 'pmgRegexTester',
                    regexFieldReference: 'filename',
                },
            ],
@@ -631,7 +617,7 @@ Ext.define('PMG.Utils', {
                    xtype: 'proxmoxcheckbox',
                    checked: true,
                    name: 'original',
-                   fieldLabel: gettext("send orig. Mail"),
+                   boxLabel: gettext("Send Original Mail"),
                },
            ],
 
@@ -642,9 +628,6 @@ Ext.define('PMG.Utils', {
            subdir: 'removeattachments',
            subject: gettext('Remove Attachments'),
            width: 500,
-           fieldDefaults: {
-               labelWidth: 150,
-           },
            items: [
                {
                    xtype: 'textfield',
@@ -668,13 +651,13 @@ Ext.define('PMG.Utils', {
                    xtype: 'proxmoxcheckbox',
                    checked: true,
                    name: 'all',
-                   fieldLabel: gettext("Remove all attachments"),
+                   boxLabel: gettext("Remove all Attachments"),
                },
                {
                    xtype: 'proxmoxcheckbox',
                    checked: false,
                    name: 'quarantine',
-                   fieldLabel: gettext("Copy original mail to Attachment Quarantine"),
+                   boxLabel: gettext("Copy original mail to Attachment Quarantine"),
                },
            ],
        },
@@ -830,15 +813,28 @@ Ext.define('PMG.Utils', {
        return `<i class='fa ${iconCls}'></i> ${text}`;
     },
 
-    sender_renderer: function(value, metaData, rec) {
-       var subject = Ext.htmlEncode(value);
-       var from = Ext.htmlEncode(rec.data.from);
-       var sender = Ext.htmlEncode(rec.data.sender);
+    addresses_subject_renderer: function(value, metaData, rec, render_receiver) {
+       let subject = Ext.htmlEncode(value);
+       let from = Ext.htmlEncode(rec.data.from);
+       let sender = Ext.htmlEncode(rec.data.sender);
        if (sender) {
            from = Ext.String.format(gettext("{0} on behalf of {1}"),
                                     sender, from);
        }
-       return '<small>' + from + '</small><br>' + subject;
+       let ret = '<small>' + from;
+       if (render_receiver) {
+           ret += '<br>To: ' + Ext.htmlEncode(rec.data.receiver);
+       }
+       ret += '</small><br>' + subject;
+       return ret;
+    },
+
+    sender_renderer: function(value, metaData, rec) {
+       return PMG.Utils.addresses_subject_renderer(value, metaData, rec, false);
+    },
+
+    sender_receiver_renderer: function(value, metaData, rec) {
+       return PMG.Utils.addresses_subject_renderer(value, metaData, rec, true);
     },
 
     constructor: function() {