fix #5251: login: set autocomplete on password and user

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

diff --git a/js/DKIMSettings.js b/js/DKIMSettings.js
index 590f7597b790fea9ee414c7666e8eb50fb9d6362..e5f6c76f7228de9ce8d5e1753f93b6400e513516 100644 (file)
--- a/js/DKIMSettings.js
+++ b/js/DKIMSettings.js
@@ -7,7 +7,7 @@ Ext.define('PMG.DKIMEnableEdit', {
            xtype: 'displayfield',
            userCls: 'pmx-hint',
            value: gettext('You need to create a Selector before enabling DKIM Signing'),
-           hidden: true
+           hidden: true,
        },
        {
            xtype: 'proxmoxcheckbox',
@@ -17,12 +17,12 @@ Ext.define('PMG.DKIMEnableEdit', {
            checked: false,
            deleteDefaultValue: false,
            fieldLabel: gettext('Sign Outgoing Mails'),
-       }
+       },
     ],
     listeners: {
        'show': function() {
            var me = this;
-           var disablefn = function(errormsg){
+           var disablefn = function(errormsg) {
                Ext.Msg.alert(gettext('Error'), errormsg);
                me.down('displayfield').setVisible(true);
                me.down('proxmoxcheckbox').setDisabled(true);
@@ -30,19 +30,19 @@ Ext.define('PMG.DKIMEnableEdit', {
            };
 
            Proxmox.Utils.API2Request({
-               url : '/config/dkim/selector',
-               method : 'GET',
-               failure : function(response, opts) {
-                   disablefn(response.htmlStatus)
+               url: '/config/dkim/selector',
+               method: 'GET',
+               failure: function(response, opts) {
+                   disablefn(response.htmlStatus);
                },
-               success : function(response, opts) {
+               success: function(response, opts) {
                    if (!Ext.isDefined(response.result.data.record)) {
-                       disablefn('Could not read private key - please create a selector first!');
+                       disablefn(gettext('Could not read private key - please create a selector first!'));
                    }
-               }
+               },
            });
-       }
-    }
+       },
+    },
 });
 
 Ext.define('PMG.SelectorViewer', {
@@ -59,12 +59,12 @@ Ext.define('PMG.SelectorViewer', {
        {
            xtype: 'displayfield',
            fieldLabel: gettext('Selector'),
-           name: 'selector'
+           name: 'selector',
        },
        {
            xtype: 'displayfield',
            fieldLabel: gettext('Key Size'),
-           name: 'keysize'
+           name: 'keysize',
        },
        {
            xtype: 'textarea',
@@ -74,8 +74,8 @@ Ext.define('PMG.SelectorViewer', {
            growMax: 400,
            fieldLabel: gettext('DNS TXT Record'),
            name: 'record',
-           value: 'Could not read private key!'
-       }
+           value: 'Could not read private key!',
+       },
     ],
 
     initComponent: function() {
@@ -85,7 +85,33 @@ Ext.define('PMG.SelectorViewer', {
 
        // hide OK/Reset button, because we just want to show data
        me.down('toolbar[dock=bottom]').setVisible(false);
-    }
+    },
+});
+
+Ext.define('PMG.SelectorList', {
+    extend: 'Ext.form.ComboBox',
+    xtype: 'pmgDKIMSelectorList',
+
+    queryMode: 'local',
+    store: {
+       fields: ['selector'],
+       filterOnLoad: true,
+       proxy: {
+           type: 'proxmox',
+           url: '/api2/json/config/dkim/selectors',
+       },
+       autoLoad: true,
+       sorters: [
+           {
+               property: 'selector',
+               direction: 'ASC',
+           },
+       ],
+    },
+
+    valueField: 'selector',
+    displayField: 'selector',
+    allowBlank: false,
 });
 
 Ext.define('PMG.DKIMSettings', {
@@ -94,7 +120,12 @@ Ext.define('PMG.DKIMSettings', {
 
     monStoreErrors: true,
 
-    initComponent : function() {
+    dkimdomainTextHash: {
+       envelope: gettext('Envelope'),
+       header: gettext('Header'),
+    },
+
+    initComponent: function() {
        var me = this;
 
        me.rows = {};
@@ -107,7 +138,7 @@ Ext.define('PMG.DKIMSettings', {
            editor: {
                xtype: 'pmgDKIMEnableEdit',
                subject: enable_sign_text,
-           }
+           },
        };
 
        var selector_text = gettext('Selector');
@@ -120,6 +151,7 @@ Ext.define('PMG.DKIMSettings', {
                isCreate: true,
                method: 'POST',
                url: '/config/dkim/selector',
+               submitText: gettext('Update'),
                items: [
                    {
                        xtype: 'displayfield',
@@ -128,12 +160,9 @@ Ext.define('PMG.DKIMSettings', {
                        value: gettext('Warning: You need to update the _domainkey DNS records of all signed domains!'),
                    },
                    {
-                       xtype: 'proxmoxtextfield',
+                       xtype: 'pmgDKIMSelectorList',
                        fieldLabel: selector_text,
                        name: 'selector',
-                       allowBlank: false,
-                       required: true,
-                       defaultValue: 'pmg'
                    },
                    {
                        xtype: 'proxmoxKVComboBox',
@@ -147,18 +176,27 @@ Ext.define('PMG.DKIMSettings', {
                            ['1024', '1024'],
                            ['2048', '2048'],
                            ['4096', '4096'],
-                           ['8192', '8192']
-                       ]
+                           ['8192', '8192'],
+                       ],
                    },
                    {
                        xtype: 'proxmoxcheckbox',
                        name: 'force',
                        fieldLabel: gettext('Overwrite existing file'),
-                   }
-               ]
-           }
+                   },
+               ],
+           },
        };
 
+       let render_dkimdomain = value => me.dkimdomainTextHash[value] || value;
+       me.add_combobox_row('dkim-use-domain', gettext('Signing Domain Source'), {
+           renderer: render_dkimdomain,
+           defaultValue: 'envelope',
+           comboItems: [
+               ['envelope', render_dkimdomain('envelope')],
+               ['header', render_dkimdomain('header')]],
+       });
+
        me.add_boolean_row('dkim_sign_all_mail', gettext('Sign all Outgoing Mail'));
 
        var baseurl = '/config/admin';
@@ -182,18 +220,18 @@ Ext.define('PMG.DKIMSettings', {
                xtype: 'proxmoxButton',
                disabled: true,
                handler: function() { me.run_editor(); },
-               selModel: me.selModel
+               selModel: me.selModel,
            }],
            url: '/api2/json' + baseurl,
            editorConfig: {
                url: '/api2/extjs' + baseurl,
-               onlineHelp: 'pmgconfig_mailproxy_dkim'
+               onlineHelp: 'pmgconfig_mailproxy_dkim',
            },
            interval: 5000,
            cwidth1: 200,
            listeners: {
-               itemdblclick: me.run_editor
-           }
+               itemdblclick: me.run_editor,
+           },
        });
 
        me.callParent();
@@ -201,6 +239,6 @@ Ext.define('PMG.DKIMSettings', {
        me.on('activate', me.rstore.startUpdate);
        me.on('destroy', me.rstore.stopUpdate);
        me.on('deactivate', me.rstore.stopUpdate);
-    }
+    },
 });