From cc15913b3f34f1ec0aa60519e34e0ce8b3a8029e Mon Sep 17 00:00:00 2001
From: Fabian Blechschmidt <blechschmidt@fabian-blechschmidt.de>
Date: Fri, 19 Feb 2021 15:32:13 +0100
Subject: [PATCH] Update honeyspam.xml

Fixes #69
Fix adding the input field to the form
Reorganize layout.xml by appending blocks instead of inserting them into the block
---
 .../base/default/layout/honeyspam.xml         | 111 ++++++++++--------
 1 file changed, 63 insertions(+), 48 deletions(-)

diff --git a/app/design/frontend/base/default/layout/honeyspam.xml b/app/design/frontend/base/default/layout/honeyspam.xml
index cf8310b..3ac31c7 100644
--- a/app/design/frontend/base/default/layout/honeyspam.xml
+++ b/app/design/frontend/base/default/layout/honeyspam.xml
@@ -27,69 +27,97 @@
 <layout>
     <default>
         <reference name="head">
-            <action method="addJs">
+            <action method="addJs" ifconfig="hackathon/honeyspam/enableHoneypotName">
                 <script>hackathon/HoneySpam/honeyspam.js</script>
             </action>
         </reference>
         <!-- base/default theme -->
+        <block type="hackathon_honeyspam/honeypot"
+                     name="honeyspam.honeypot"
+                     template="hackathon/honeyspam/honeypot.phtml"/>
         <reference name="left.newsletter">
-            <block type="core/text_list"
-                   name="newsletter.form.fields.before"
-                   as="form_fields_before"
-                   translate="label">
-                <block type="hackathon_honeyspam/honeypot"
-                       name="honeyspam.honeypot"
-                       template="hackathon/honeyspam/honeypot.phtml"/>
-            </block>
+          <block type="core/text_list"
+                       name="newsletter.form.fields.before"
+                       as="form_fields_before"
+                       translate="label">
+            <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+              <block>honeyspam.honeypot</block>
+            </action>
+          </block>
         </reference>
         <!-- rwd/default theme -->
         <reference name="footer.newsletter">
-            <block type="core/text_list"
-                   name="newsletter.form.fields.before"
-                   as="form_fields_before"
-                   translate="label">
-                <block type="hackathon_honeyspam/honeypot"
-                       name="honeyspam.honeypot"
-                       template="hackathon/honeyspam/honeypot.phtml"/>
-            </block>
+          <block type="core/text_list"
+                       name="newsletter.form.fields.before"
+                       as="form_fields_before"
+                       translate="label">
+            <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+              <block>honeyspam.honeypot</block>
+            </action>
+          </block>
         </reference>
         <!-- default/modern theme -->
         <reference name="newsletter">
-            <block type="core/text_list"
-                   name="newsletter.form.fields.before"
-                   as="form_fields_before"
-                   translate="label">
-                <block type="hackathon_honeyspam/honeypot"
-                       name="honeyspam.honeypot"
-                       template="hackathon/honeyspam/honeypot.phtml"/>
-            </block>
-        </reference>
+          <block type="core/text_list"
+                       name="newsletter.form.fields.before"
+                       as="form_fields_before"
+                       translate="label">
+            <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+              <block>honeyspam.honeypot</block>
+            </action>
+          </block>
+        </reference>  
     </default>
 
     <customer_account_create>
-        <reference name="form.additional.info">
-            <block type="hackathon_honeyspam/honeypot"
+      <block type="hackathon_honeyspam/honeypot"
                    name="honeyspam.honeypot"
                    template="hackathon/honeyspam/honeypot.phtml"/>
-        </reference>
+      <reference name="form.additional.info">
+        <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+          <block>honeyspam.honeypot</block>
+        </action>
+      </reference>
     </customer_account_create>
 
     <customer_account_forgotpassword>
-        <reference name="form.additional.info">
-            <block type="hackathon_honeyspam/honeypot"
+      <block type="hackathon_honeyspam/honeypot"
                    name="honeyspam.honeypot"
                    template="hackathon/honeyspam/honeypot.phtml"/>
-        </reference>
+      <reference name="form.additional.info">
+        <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+          <block>honeyspam.honeypot</block>
+        </action>
+      </reference>
     </customer_account_forgotpassword>
 
     <review_product_list>
-        <reference name="product.review.form.fields.before">
-            <block type="hackathon_honeyspam/honeypot"
+      <block type="hackathon_honeyspam/honeypot"
                    name="honeyspam.honeypot"
                    template="hackathon/honeyspam/honeypot.phtml"/>
-        </reference>
+      <reference name="product.review.form.fields.before">
+        <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+          <block>honeyspam.honeypot</block>
+        </action>
+      </reference>
     </review_product_list>
 
+    <contacts_index_index>
+      <block type="hackathon_honeyspam/honeypot"
+                   name="honeyspam.honeypot"
+                   template="hackathon/honeyspam/honeypot.phtml"/>
+      <reference name="contactForm">
+        <block type="core/text_list"
+                     name="contacts.form.fields.before"
+                     as="form_fields_before"
+                     translate="label">
+          <action method="append" ifconfig="hackathon/honeyspam/enableHoneypotName">
+            <block>honeyspam.honeypot</block>
+          </action>
+        </block>
+      </reference>
+    </contacts_index_index>
+
     <hackathon_honeyspam_error_index>
         <reference name="content">
             <block type="core/template"
@@ -97,17 +125,4 @@
                    template="hackathon/honeyspam/error.phtml"/>
         </reference>
     </hackathon_honeyspam_error_index>
-
-    <contacts_index_index>
-        <reference name="contactForm">
-            <block type="core/text_list"
-                   name="contacts.form.fields.before"
-                   as="form_fields_before"
-                   translate="label">
-                <block type="hackathon_honeyspam/honeypot"
-                       name="honeyspam.honeypot"
-                       template="hackathon/honeyspam/honeypot.phtml"/>
-            </block>
-        </reference>
-    </contacts_index_index>
 </layout>