From 6d19cd8d9b75c3e34d2eb0b48c2182467b8c818e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Tue, 13 Jul 2021 11:39:50 +0200
Subject: [PATCH] Remove PROFILE_MAIL_USE_CAPTCHA

see 67e204a044077c2ad96685386aabaf6803a61d21
see #3032
see #3151
---
 com.woltlab.wcf/option.xml                      | 8 ++------
 constants.php                                   | 1 -
 wcfsetup/install/files/lib/system/WCF.class.php | 3 +++
 wcfsetup/install/lang/de.xml                    | 2 +-
 wcfsetup/install/lang/en.xml                    | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 56815390ce..e947515daa 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -711,7 +711,7 @@ block:wcf.acp.option.blacklist_sfs_action.block]]></selectoptions>
 				<categoryname>security.antispam.captcha</categoryname>
 				<optiontype>captchaSelect</optiontype>
 				<defaultvalue>com.woltlab.wcf.recaptcha</defaultvalue>
-				<enableoptions>:!register_use_captcha,!lost_password_use_captcha,!profile_mail_use_captcha,!search_use_captcha</enableoptions>
+				<enableoptions>:!register_use_captcha,!lost_password_use_captcha,!search_use_captcha</enableoptions>
 				<allowemptyvalue>1</allowemptyvalue>
 			</option>
 			<option name="register_use_captcha">
@@ -724,11 +724,6 @@ block:wcf.acp.option.blacklist_sfs_action.block]]></selectoptions>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			<option name="profile_mail_use_captcha">
-				<categoryname>security.antispam.captcha</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-			</option>
 			<option name="search_use_captcha">
 				<categoryname>security.antispam.captcha</categoryname>
 				<optiontype>boolean</optiontype>
@@ -1687,5 +1682,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 		<option name="blacklist_ip_addresses"/>
 		<option name="blacklist_user_agents"/>
 		<option name="module_system_recaptcha"/>
+		<option name="profile_mail_use_captcha"/>
 	</delete>
 </data>
diff --git a/constants.php b/constants.php
index 245557667e..2728c285d3 100644
--- a/constants.php
+++ b/constants.php
@@ -79,7 +79,6 @@
 \define('CAPTCHA_TYPE', 'com.woltlab.wcf.recaptcha');
 \define('REGISTER_USE_CAPTCHA', 1);
 \define('LOST_PASSWORD_USE_CAPTCHA', 1);
-\define('PROFILE_MAIL_USE_CAPTCHA', 1);
 \define('SEARCH_USE_CAPTCHA', 1);
 \define('RECAPTCHA_PUBLICKEY', '');
 \define('RECAPTCHA_PRIVATEKEY', '');
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index eb856ce77f..0e67e539e0 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -478,6 +478,9 @@ class WCF
         // https://github.com/WoltLab/WCF/issues/3914
         \define('BLACKLIST_IP_ADDRESSES', '');
         \define('BLACKLIST_USER_AGENTS', '');
+
+        // The captcha option related to the removed MailForm was removed in 5.5.
+        \define('PROFILE_MAIL_USE_CAPTCHA', 1);
     }
 
     /**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b355187756..72eebf4483 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1587,7 +1587,6 @@ Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}befolge{else}befolgen Sie{/if} die Anlei
 		<item name="wcf.acp.option.captcha_type"><![CDATA[Captcha-Art]]></item>
 		<item name="wcf.acp.option.register_use_captcha"><![CDATA[Captcha in Registrierung aktivieren]]></item>
 		<item name="wcf.acp.option.lost_password_use_captcha"><![CDATA[Captcha in „Kennwort vergessen“ aktivieren]]></item>
-		<item name="wcf.acp.option.profile_mail_use_captcha"><![CDATA[Captcha in „E-Mail an Benutzer schicken“ aktivieren]]></item>
 		<item name="wcf.acp.option.search_use_captcha"><![CDATA[Captcha in Suchfunktion aktivieren]]></item>
 		<item name="wcf.acp.option.category.security.antispam.captcha"><![CDATA[Captchas]]></item>
 		<item name="wcf.acp.option.category.security.general.authentication"><![CDATA[Benutzer-Authentifikation]]></item>
@@ -5558,5 +5557,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|lang
 	<item name="wcf.acp.devtools.project.apiVersions.description"/>
 	<item name="wcf.acp.style.globals.pageLogo.description"/>
 	<item name="wcf.acp.style.globals.pageLogoMobile.description"/>
+	<item name="wcf.acp.option.profile_mail_use_captcha"/>
 </delete>
 </language>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 14ee578d11..39801347d7 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1572,7 +1572,6 @@ Please follow the instructions described in <a href="https://www.woltlab.com/art
 		<item name="wcf.acp.option.captcha_type"><![CDATA[Captcha Type]]></item>
 		<item name="wcf.acp.option.register_use_captcha"><![CDATA[Enable Captcha protection during registration]]></item>
 		<item name="wcf.acp.option.lost_password_use_captcha"><![CDATA[Enable Captcha protection for lost password]]></item>
-		<item name="wcf.acp.option.profile_mail_use_captcha"><![CDATA[Enable Captcha protection for send email to user]]></item>
 		<item name="wcf.acp.option.search_use_captcha"><![CDATA[Enable Captcha protection for search]]></item>
 		<item name="wcf.acp.option.category.security.antispam.captcha"><![CDATA[Captchas]]></item>
 		<item name="wcf.acp.option.category.security.general.authentication"><![CDATA[User Authentication]]></item>
@@ -5559,5 +5558,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|langu
 	<item name="wcf.acp.devtools.project.apiVersions.description"/>
 	<item name="wcf.acp.style.globals.pageLogo.description"/>
 	<item name="wcf.acp.style.globals.pageLogoMobile.description"/>
+	<item name="wcf.acp.option.profile_mail_use_captcha"/>
 </delete>
 </language>
-- 
2.20.1