From 298ac5e866c44213671d11bf11223a80d8b00935 Mon Sep 17 00:00:00 2001
From: Tobias Krais <tk@design-to-use.de>
Date: Fri, 24 Mar 2023 13:36:27 +0100
Subject: [PATCH] add form names

---
 install.php              |  2 +-
 lib/module_manager.php   |  2 +-
 modules/80/4/output.php  |  1 +
 modules/80/5/output.php  |  3 ++-
 pages/help.changelog.php |  3 ++-
 pages/import.php         | 12 ++++++------
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/install.php b/install.php
index 279e45f..8c50816 100644
--- a/install.php
+++ b/install.php
@@ -94,7 +94,7 @@
         6);
     $d2u_multinewsletter_modules[] = new D2UModule('80-4',
         'MultiNewsletter YForm Anmeldung',
-        5);
+        6);
     $d2u_multinewsletter_modules[] = new D2UModule('80-5',
         'MultiNewsletter YForm Abmeldung',
         3);
diff --git a/lib/module_manager.php b/lib/module_manager.php
index 5a9b703..270ff08 100644
--- a/lib/module_manager.php
+++ b/lib/module_manager.php
@@ -24,7 +24,7 @@ public static function getD2UMultiNewsletterModules()
             6);
         $d2u_multinewsletter_modules[] = new D2UModule('80-4',
             'MultiNewsletter YForm Anmeldung',
-            5);
+            6);
         $d2u_multinewsletter_modules[] = new D2UModule('80-5',
             'MultiNewsletter YForm Abmeldung',
             3);
diff --git a/modules/80/4/output.php b/modules/80/4/output.php
index 5c36cac..7e2d86d 100644
--- a/modules/80/4/output.php
+++ b/modules/80/4/output.php
@@ -120,6 +120,7 @@ function sendActivationMail($yform)
     $yform->setObjectparams('form_action', rex_getUrl(rex_article::getCurrentId(), rex_clang::getCurrentId()));
     $yform->setObjectparams('Error-occured', $addon->getConfig('lang_'. rex_clang::getCurrentId() .'_no_userdata', ''));
     $yform->setObjectparams('real_field_names', true);
+    $yform->setObjectparams('form_name', 'multinewsletter_module_80_4_'. random_int(1, 100));
 
     // action - showtext
     $yform->setActionField('showtext', [$addon->getConfig('lang_'. rex_clang::getCurrentId() .'_confirmation_sent', '')]);
diff --git a/modules/80/5/output.php b/modules/80/5/output.php
index c5880fe..0f0e187 100644
--- a/modules/80/5/output.php
+++ b/modules/80/5/output.php
@@ -58,7 +58,7 @@ function unsubscribe($email)
     $cols_md = 0 === (int) 'REX_VALUE[19]' ? 12 : (int) 'REX_VALUE[19]'; /** @phpstan-ignore-line */
     $cols_lg = 0 === (int) 'REX_VALUE[18]' ? 12 : (int) 'REX_VALUE[18]'; /** @phpstan-ignore-line */
     $offset_lg = (int) 'REX_VALUE[17]' > 0 ? ' mr-lg-auto ml-lg-auto ' : ''; /** @phpstan-ignore-line */
-    
+
     echo '<div class="col-12 col-sm-'. $cols_sm .' col-md-'. $cols_md .' col-lg-'. $cols_lg . $offset_lg .' yform">';
     echo '<h2>'. $addon->getConfig('lang_'. rex_clang::getCurrentId() .'_unsubscribe', '') .'</h2>';
     echo '<br>';
@@ -83,6 +83,7 @@ function unsubscribe($email)
         $yform->setObjectparams('form_action', rex_getUrl(rex_article::getCurrentId(), rex_clang::getCurrentId()));
         $yform->setObjectparams('Error-occured', $addon->getConfig('lang_'. rex_clang::getCurrentId() .'_no_userdata', ''));
         $yform->setObjectparams('real_field_names', true);
+        $yform->setObjectparams('form_name', 'multinewsletter_module_80_5_'. random_int(1, 100));
 
         echo $yform->getForm();
     }
diff --git a/pages/help.changelog.php b/pages/help.changelog.php
index 48eaea1..268ede6 100644
--- a/pages/help.changelog.php
+++ b/pages/help.changelog.php
@@ -3,7 +3,8 @@
 
 	<p>3.4.1</p>
 	<ul>
-		<li>Modul 80-5 "MultiNewsletter YForm Abmeldung": Einstellung der Breite des Blocks funktioniert jetzt korrekt.</li>
+		<li>Modul 80-4 "MultiNewsletter YForm Anmeldung": Formular mit Formularnamen versehen um bessere YForm Spamprotection Kompatibilität bei mehreren Formularen auf einer Seite herzustellen.</li>
+		<li>Modul 80-5 "MultiNewsletter YForm Abmeldung": Einstellung der Breite des Blocks funktioniert jetzt korrekt. Außerdem FOrmular mit Formularnamen versehen um bessere YForm Spamprotection Kompatibilität bei mehreren Formularen auf einer Seite herzustellen.</li>
 	</ul>
 	<p>3.4.0</p>
 	<ul>
diff --git a/pages/import.php b/pages/import.php
index 0b35e3b..1199c74 100644
--- a/pages/import.php
+++ b/pages/import.php
@@ -193,8 +193,8 @@
 							<dt><label for="import_action"></label></dt>
 							<dd><input type="radio" value="overwrite" name="import_action"
 									<?php if ('' == filter_input(INPUT_POST, 'import_action') || 'overwrite' == filter_input(INPUT_POST, 'import_action')) {
-									echo 'checked="checked"';
-									} ?> />
+                                    echo 'checked="checked"';
+                                    } ?> />
 								<?= rex_i18n::msg('multinewsletter_import_overwrite')?>
 							</dd>
 						</dl>
@@ -202,8 +202,8 @@
 							<dt><label for="import_action"></label></dt>
 							<dd><input type="radio" value="delete" name="import_action"
 									<?php if ('delete' == filter_input(INPUT_POST, 'import_action')) {
-									echo 'checked="checked"';
-									} ?> />
+                                    echo 'checked="checked"';
+                                    } ?> />
 								<?= rex_i18n::msg('multinewsletter_import_delete')?>
 							</dd>
 						</dl>
@@ -211,8 +211,8 @@
 							<dt><label for="import_action"></label></dt>
 							<dd><input  type="radio" value="add_new" name="import_action"
 									<?php if ('add_new' == filter_input(INPUT_POST, 'import_action')) {
-									echo 'checked="checked"';
-									} ?> />
+                                    echo 'checked="checked"';
+                                    } ?> />
 								<?= rex_i18n::msg('multinewsletter_import_add_new')?>
 							</dd>
 						</dl>