From 1abefeed3fb9c1f3c9b34f763c24e1e3c9ce80f0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Mon, 2 Nov 2020 10:21:05 +0100
Subject: [PATCH] Remove REGISTER_ADMIN_NOTIFICATION

Resolves #3674
---
 com.woltlab.wcf/option.xml                           |  7 ++-----
 constants.php                                        |  1 -
 .../install/files/lib/form/RegisterForm.class.php    | 12 ------------
 wcfsetup/install/files/lib/system/WCF.class.php      |  4 ++++
 wcfsetup/install/lang/de.xml                         |  1 -
 wcfsetup/install/lang/en.xml                         |  1 -
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index a9730c1870..5b8cd62f3f 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1160,17 +1160,13 @@ XING</selectoptions>
 			<option name="register_disabled">
 				<categoryname>user.register</categoryname>
 				<optiontype>boolean</optiontype>
-				<enableoptions>!register_enable_disclaimer,!register_admin_notification,!register_activation_method</enableoptions>
+				<enableoptions>!register_enable_disclaimer,!register_activation_method</enableoptions>
 			</option>
 			<option name="register_enable_disclaimer">
 				<categoryname>user.register</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
-			<option name="register_admin_notification">
-				<categoryname>user.register</categoryname>
-				<optiontype>boolean</optiontype>
-			</option>
 			<option name="register_activation_method">
 				<categoryname>user.register</categoryname>
 				<optiontype>radioButton</optiontype>
@@ -1703,5 +1699,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 	<delete>
 		<option name="http_enable_gzip" />
 		<option name="meta_keywords" />
+		<option name="register_admin_notification" />
 	</delete>
 </data>
diff --git a/constants.php b/constants.php
index 2b118d379a..5748d676da 100644
--- a/constants.php
+++ b/constants.php
@@ -142,7 +142,6 @@ define('REGISTER_FORBIDDEN_EMAILS', '');
 define('REGISTER_ALLOWED_EMAILS', '');
 define('REGISTER_DISABLED', 0);
 define('REGISTER_ENABLE_DISCLAIMER', 1);
-define('REGISTER_ADMIN_NOTIFICATION', 0);
 define('REGISTER_ACTIVATION_METHOD', '1');
 define('REGISTER_USERNAME_MIN_LENGTH', 3);
 define('REGISTER_USERNAME_MAX_LENGTH', 25);
diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php
index 1bffc5af22..1c02be1c0b 100644
--- a/wcfsetup/install/files/lib/form/RegisterForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php
@@ -524,18 +524,6 @@ class RegisterForm extends UserAddForm {
 			$this->message = 'wcf.user.register.success.awaitActivation';
 		}
 		
-		// notify admin
-		if (REGISTER_ADMIN_NOTIFICATION) {
-			// get default language
-			$language = LanguageFactory::getInstance()->getDefaultLanguage();
-			
-			$email = new Email();
-			$email->addRecipient(new Mailbox(MAIL_ADMIN_ADDRESS, null, $language));
-			$email->setSubject($language->getDynamicVariable('wcf.user.register.notification.mail.subject'));
-			$email->setBody(new PlainTextMimePart($language->getDynamicVariable('wcf.user.register.notification.mail', ['user' => $user])));
-			$email->send();
-		}
-		
 		$this->fireNotificationEvent($user);
 		
 		if ($this->captchaObjectType) {
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 699b7d0adc..90cc4acb40 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -381,6 +381,10 @@ class WCF {
 		// https://github.com/WoltLab/WCF/issues/3561
 		define('META_KEYWORDS', '');
 		
+		// The admin notification is redundant and removed in 5.4.
+		// https://github.com/WoltLab/WCF/issues/3674
+		define('REGISTER_ADMIN_NOTIFICATION', 0);
+		
 		$filename = WCF_DIR.'options.inc.php';
 		
 		// create options file if doesn't exist
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a0ebe1cc23..487c6c1b1d 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1478,7 +1478,6 @@ ACHTUNG: Die oben genannten Meldungen sind stark gekürzt. Sie können Details z
 		<item name="wcf.acp.option.register_disabled.description"><![CDATA[Schaltet die Registrierung für neue Benutzer gänzlich ab. Neue Benutzer können nur noch manuell durch den Administrator angelegt werden.]]></item>
 		<item name="wcf.acp.option.register_enable_disclaimer"><![CDATA[Nutzungsbedingungen aktivieren]]></item>
 		<item name="wcf.acp.option.register_enable_disclaimer.description"><![CDATA[Die Nutzungsbedingungen müssen durch den Benutzer vor der Registrierung akzeptiert werden.]]></item>
-		<item name="wcf.acp.option.register_admin_notification"><![CDATA[Administrator über neue Registrierungen per E-Mail benachrichtigen]]></item>
 		<item name="wcf.acp.option.register_activation_method"><![CDATA[Aktivierungsmethode]]></item>
 		<item name="wcf.acp.option.register_activation_method.byAdmin"><![CDATA[Aktivierung erfolgt durch Administrator]]></item>
 		<item name="wcf.acp.option.register_activation_method.byUser"><![CDATA[Benutzer aktiviert sich durch E-Mail-Bestätigung]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 0863d05e37..6859a184e7 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1457,7 +1457,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
 		<item name="wcf.acp.option.register_disabled.description"><![CDATA[Disables registration for all users, new users can be created through an administrator.]]></item>
 		<item name="wcf.acp.option.register_enable_disclaimer"><![CDATA[Enable disclaimer]]></item>
 		<item name="wcf.acp.option.register_enable_disclaimer.description"><![CDATA[Disclaimer must be accepted during registration.]]></item>
-		<item name="wcf.acp.option.register_admin_notification"><![CDATA[Notify administrator of new registrations]]></item>
 		<item name="wcf.acp.option.register_activation_method"><![CDATA[Registration Approval Method]]></item>
 		<item name="wcf.acp.option.register_activation_method.byAdmin"><![CDATA[Only administrators can approve registrations]]></item>
 		<item name="wcf.acp.option.register_activation_method.byUser"><![CDATA[Registrations are approved through an email confirmation]]></item>
-- 
2.20.1