From 950fe89b03d552b1f1f8c0c7abb80fe9e1ccc5b0 Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Thu, 12 Feb 2026 13:27:31 +0100
Subject: [PATCH 1/2] contactform: hide subject select when only one contact

---
 .../views/templates/widget/contactform.tpl    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index 1273c0d4..f882ea3e 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -43,16 +43,21 @@
           </div>
         </div>
 
-        <div class="form-group row">
-          <label class="col-md-3 form-control-label" for="id_contact">{l s='Subject' d='Shop.Forms.Labels'}</label>
-          <div class="col-md-6">
-            <select name="id_contact" id="id_contact" class="form-control form-control-select">
-              {foreach from=$contact.contacts item=contact_elt}
-                <option value="{$contact_elt.id_contact}">{$contact_elt.name}</option>
-              {/foreach}
-            </select>
+        {if $contact.contacts|count === 1}
+          {assign var=firstContact value=current($contact.contacts)}
+          <input type="hidden" name="id_contact" value="{$firstContact.id_contact|escape:'htmlall':'UTF-8'}"/>
+        {else}
+          <div class="form-group row">
+            <label class="col-md-3 form-control-label" for="id_contact">{l s='Subject' d='Shop.Forms.Labels'}</label>
+            <div class="col-md-6">
+              <select name="id_contact" id="id_contact" class="form-control form-control-select">
+                {foreach from=$contact.contacts item=contact_elt}
+                  <option value="{$contact_elt.id_contact}">{$contact_elt.name}</option>
+                {/foreach}
+              </select>
+            </div>
           </div>
-        </div>
+        {/if}
 
         <div class="form-group row">
           <label class="col-md-3 form-control-label" for="email">{l s='Email address' d='Shop.Forms.Labels'}</label>

From 5ba3b06b91e13b7ee1c9a896cb0c2e73622e3016 Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Thu, 12 Feb 2026 16:28:57 +0100
Subject: [PATCH 2/2] Fix: Escape contact name in select option

---
 modules/contactform/views/templates/widget/contactform.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index f882ea3e..0e04336e 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -52,7 +52,7 @@
             <div class="col-md-6">
               <select name="id_contact" id="id_contact" class="form-control form-control-select">
                 {foreach from=$contact.contacts item=contact_elt}
-                  <option value="{$contact_elt.id_contact}">{$contact_elt.name}</option>
+                  <option value="{$contact_elt.id_contact|escape:'htmlall':'UTF-8'}">{$contact_elt.name|escape:'htmlall':'UTF-8'}</option>
                 {/foreach}
               </select>
             </div>