From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <m.sandoval@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id 916F694E24
 for <pmg-devel@lists.proxmox.com>; Fri, 23 Feb 2024 13:52:02 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 7473718882
 for <pmg-devel@lists.proxmox.com>; Fri, 23 Feb 2024 13:52:02 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [94.136.29.106])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits))
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS
 for <pmg-devel@lists.proxmox.com>; Fri, 23 Feb 2024 13:52:01 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B2BC844F2F
 for <pmg-devel@lists.proxmox.com>; Fri, 23 Feb 2024 13:52:01 +0100 (CET)
From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pmg-devel@lists.proxmox.com
Date: Fri, 23 Feb 2024 13:52:00 +0100
Message-Id: <20240223125200.429723-1-m.sandoval@proxmox.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.019 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 DMARC_MISSING             0.1 Missing DMARC policy
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 T_SCC_BODY_TEXT_LINE    -0.01 -
Subject: [pmg-devel] [PATCH pmg-gui] fix #2971: DKIM: add gui setting to use
 From header when signing
X-BeenThere: pmg-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Mail Gateway development discussion
 <pmg-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, 
 <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/>
List-Post: <mailto:pmg-devel@lists.proxmox.com>
List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, 
 <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 23 Feb 2024 12:52:02 -0000

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 js/DKIMSettings.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/js/DKIMSettings.js b/js/DKIMSettings.js
index 9cebfeb..21f572d 100644
--- a/js/DKIMSettings.js
+++ b/js/DKIMSettings.js
@@ -120,6 +120,11 @@ Ext.define('PMG.DKIMSettings', {
 
     monStoreErrors: true,
 
+    dkimdomainTextHash: {
+	envelope: gettext('Envelope'),
+	header: gettext('Header'),
+    },
+
     initComponent: function() {
 	var me = this;
 
@@ -183,6 +188,17 @@ Ext.define('PMG.DKIMSettings', {
 	    },
 	};
 
+	var render_dkimdomain = function(value) {
+	    return me.dkimdomainTextHash[value] || value;
+	};
+	me.add_combobox_row('dkim-use-domain', gettext('Get Signing Domain From'), {
+	    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';
-- 
2.39.2