From 64fe044def5fd6c890fbe3a08d40cc98dd938e13 Mon Sep 17 00:00:00 2001
From: Sascha Greuel <github@1-2.dev>
Date: Fri, 19 Apr 2024 11:21:13 +0200
Subject: [PATCH] Replace privacy policy (required) confirmation

See https://www.it-recht-kanzlei.de/edsa-zustimmung-in-datenschutzerklaerung-versto%C3%9F-gegen-treu-und-glauben.html
---
 com.woltlab.wcf/templates/contact.tpl              | 14 +-------------
 .../install/files/lib/form/ContactForm.class.php   | 14 --------------
 wcfsetup/install/lang/de.xml                       |  2 +-
 wcfsetup/install/lang/en.xml                       |  2 +-
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/com.woltlab.wcf/templates/contact.tpl b/com.woltlab.wcf/templates/contact.tpl
index 9dd22d8b151..509c4279e5d 100644
--- a/com.woltlab.wcf/templates/contact.tpl
+++ b/com.woltlab.wcf/templates/contact.tpl
@@ -77,19 +77,7 @@
 			</div>
 		{/if}
 		
-		<dl{if $errorField == 'privacyPolicyConfirmed'} class="formError"{/if}>
-			<dt></dt>
-			<dd>
-				<label><input type="checkbox" name="privacyPolicyConfirmed" value="1" {if $privacyPolicyConfirmed}checked="checked" {/if}/> {lang}wcf.contact.confirmPrivacyPolicy{/lang}</label>
-				{if $errorField == 'privacyPolicyConfirmed'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-		</dl>
+		<p class="info">{lang}wcf.contact.confirmPrivacyPolicy{/lang}</p>
 	</section>
 	
 	{event name='sections'}
diff --git a/wcfsetup/install/files/lib/form/ContactForm.class.php b/wcfsetup/install/files/lib/form/ContactForm.class.php
index e9959889ea0..c41a1c16350 100644
--- a/wcfsetup/install/files/lib/form/ContactForm.class.php
+++ b/wcfsetup/install/files/lib/form/ContactForm.class.php
@@ -67,12 +67,6 @@ class ContactForm extends AbstractCaptchaForm
      */
     public $recipientList;
 
-    /**
-     * user has confirmed the privacy policy
-     * @var bool
-     */
-    public $privacyPolicyConfirmed = 0;
-
     /**
      * @var string
      */
@@ -122,9 +116,6 @@ public function readFormParameters()
         if (isset($_POST['recipientID'])) {
             $this->recipientID = \intval($_POST['recipientID']);
         }
-        if (!empty($_POST['privacyPolicyConfirmed'])) {
-            $this->privacyPolicyConfirmed = 1;
-        }
     }
 
     /**
@@ -175,10 +166,6 @@ public function validate()
                 throw new UserInputException('recipientID', 'invalid');
             }
         }
-
-        if (!$this->privacyPolicyConfirmed) {
-            throw new UserInputException('privacyPolicyConfirmed');
-        }
     }
 
     /**
@@ -242,7 +229,6 @@ public function assignVariables()
             'options' => $this->optionHandler->getOptions(),
             'recipientList' => $this->recipientList,
             'recipientID' => $this->recipientID,
-            'privacyPolicyConfirmed' => $this->privacyPolicyConfirmed,
             'attachmentHandler' => $this->attachmentHandler,
             'attachmentObjectID' => 0,
             'attachmentObjectType' => $this->attachmentObjectType,
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a93eaaf620a..8c504b1f1b6 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3577,7 +3577,7 @@ Dateianhänge:
 		<item name="wcf.contact.sender"><![CDATA[Absender]]></item>
 		<item name="wcf.contact.sender.information"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Angaben]]></item>
 		<item name="wcf.contact.success"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Nachricht wurde erfolgreich versandt.]]></item>
-		<item name="wcf.contact.confirmPrivacyPolicy"><![CDATA[Ich habe die <a href="{page}com.woltlab.wcf.PrivacyPolicy{/page}">Datenschutzerklärung</a> gelesen und stimme dieser zu. <span class="customOptionRequired">*</span>]]></item>
+		<item name="wcf.contact.confirmPrivacyPolicy"><![CDATA[Bitte beachte{if !LANGUAGE_USE_INFORMAL_VARIANT}n Sie{/if} unsere <a href="{page}com.woltlab.wcf.PrivacyPolicy{/page}">Datenschutzerklärung</a>.]]></item>
 	</category>
 	<category name="wcf.date">
 		<item name="wcf.date.dateFormat"><![CDATA[j. F Y]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c7cd4624ca5..e63b7b0b473 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3503,7 +3503,7 @@ Attachments:
 		<item name="wcf.contact.sender"><![CDATA[Sender]]></item>
 		<item name="wcf.contact.sender.information"><![CDATA[Your Data]]></item>
 		<item name="wcf.contact.success"><![CDATA[Message has been sent.]]></item>
-		<item name="wcf.contact.confirmPrivacyPolicy"><![CDATA[I have read the <a href="{page}com.woltlab.wcf.PrivacyPolicy{/page}">privacy policy</a> and expressly accept it. <span class="customOptionRequired">*</span>]]></item>
+		<item name="wcf.contact.confirmPrivacyPolicy"><![CDATA[Please note our <a href="{page}com.woltlab.wcf.PrivacyPolicy{/page}">Privacy Policy</a>.]]></item>
 	</category>
 	<category name="wcf.acp.contact">
 		<item name="wcf.acp.contact.options"><![CDATA[Input Fields]]></item>