configuration: options: adapt to new advanced statistic filter default

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

diff --git a/js/MailProxyRelaying.js b/js/MailProxyRelaying.js
index 1bff1ced2c33b4d2c8d0c251d7c92c1f0bd55670..ace95752fc0f3737a99f4e13deb4e93d31e905cc 100644 (file)
--- a/js/MailProxyRelaying.js
+++ b/js/MailProxyRelaying.js
@@ -3,21 +3,83 @@ Ext.define('PMG.MailProxyRelaying', {
     alias: ['widget.pmgMailProxyRelaying'],
 
     monStoreErrors: true,
-    
-    initComponent : function() {
+
+    initComponent: function() {
        var me = this;
 
        me.add_text_row('relay', gettext('Default Relay'),
                        { deleteEmpty: true, defaultValue: Proxmox.Utils.noneText });
 
-       me.add_integer_row('relayport', gettext('SMTP Port'),
-                          { defaultValue: 25, deleteEmpty: true,
-                            minValue: 1, maxValue: 65535 });
+       me.add_integer_row('relayport', gettext('Relay Port'), {
+           defaultValue: 25,
+           deleteEmpty: true,
+           minValue: 1,
+           maxValue: 65535,
+       });
 
-       me.add_boolean_row('relaynomx', gettext('Disable MX lookup'));
+       me.add_combobox_row('relayprotocol', gettext('Relay Protocol'), {
+           defaultValue: 'smtp',
+           comboItems: [
+           ['smtp', 'SMTP'],
+           ['lmtp', 'LMTP']],
+       });
 
-       me.add_text_row('smarthost', gettext('Smarthost'),
-                       { deleteEmpty: true, defaultValue: Proxmox.Utils.noneText });
+
+       me.add_boolean_row('relaynomx', gettext('Disable MX lookup (SMTP)'));
+
+       me.rows.smarthost = {
+           required: true,
+           multiKey: ['smarthost', 'smarthostport'],
+           header: gettext('Smarthost'),
+           renderer: function() {
+               var host = me.getObjectValue('smarthost', undefined);
+               var port = me.getObjectValue('smarthostport', undefined);
+               var result = '';
+               if (host) {
+                   if (port) {
+                       if (host.match(Proxmox.Utils.IP6_match)) {
+                           result = "[" + host + "]:" + port;
+                       } else {
+                           result = host + ':' + port;
+                       }
+                   } else {
+                       result = host;
+                   }
+               }
+               if (result === '') {
+                   result = Proxmox.Utils.noneText;
+               }
+               return result;
+           },
+           editor: {
+               xtype: 'proxmoxWindowEdit',
+               onlineHelp: 'pmgconfig_mailproxy_relaying',
+               subject: gettext('Smarthost'),
+               fieldDefaults: {
+                   labelWidth: 100,
+               },
+               items: [
+                   {
+                       xtype: 'proxmoxtextfield',
+                       name: 'smarthost',
+                       deleteEmpty: true,
+                       emptyText: Proxmox.Utils.noneText,
+                       fieldLabel: gettext('Smarthost'),
+                   },
+                   {
+                       xtype: 'proxmoxintegerfield',
+                       name: 'smarthostport',
+                       deleteEmpty: true,
+                       minValue: 1,
+                       maxValue: 65535,
+                       emptyText: Proxmox.Utils.defaultText,
+                       fieldLabel: gettext('Port'),
+                   },
+               ],
+           },
+       };
+
+       me.rows.smarthostport = { visible: false };
 
        var baseurl = '/config/mail';
 
@@ -28,18 +90,19 @@ Ext.define('PMG.MailProxyRelaying', {
                text: gettext('Edit'),
                xtype: 'proxmoxButton',
                disabled: true,
-               handler: function() { me.run_editor() },
-               selModel: me.selModel
+               handler: function() { me.run_editor(); },
+               selModel: me.selModel,
            }],
            url: '/api2/json' + baseurl,
            editorConfig: {
                url: '/api2/extjs' + baseurl,
+               onlineHelp: 'pmgconfig_mailproxy_relaying',
            },
            interval: 5000,
            cwidth1: 200,
            listeners: {
-               itemdblclick: me.run_editor
-           }
+               itemdblclick: me.run_editor,
+           },
        });
 
        me.callParent();
@@ -47,5 +110,5 @@ Ext.define('PMG.MailProxyRelaying', {
        me.on('activate', me.rstore.startUpdate);
        me.on('destroy', me.rstore.stopUpdate);
        me.on('deactivate', me.rstore.stopUpdate);
-    }
+    },
 });