From 7646123d626bf1134b19b0b717f2ffddddb2a78f Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 9 Mar 2019 19:43:05 +0100
Subject: [PATCH] User friendly error message when rejecting registration
 attempts

---
 wcfsetup/install/files/lib/form/RegisterForm.class.php | 2 +-
 wcfsetup/install/lang/de.xml                           | 1 +
 wcfsetup/install/lang/en.xml                           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php
index 8a9cdc5afa..92e9183ade 100644
--- a/wcfsetup/install/files/lib/form/RegisterForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php
@@ -178,7 +178,7 @@ class RegisterForm extends UserAddForm {
 		if (BLACKLIST_SFS_ENABLE) {
 			$this->blacklistMatches = BlacklistEntry::getMatches($this->username, $this->email, UserUtil::getIpAddress());
 			if (BLACKLIST_SFS_ACTION === 'block') {
-				throw new PermissionDeniedException();
+				throw new NamedUserException('wcf.user.register.error.blacklistMatches');
 			}
 		}
 	}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 71a0dd3440..4458b71ef5 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4617,6 +4617,7 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}
 <p>Der Verwendung veröffentlichter Kontaktdaten durch Dritte zum Zwecke von Werbung wird ausdrücklich widersprochen. Wir behalten uns rechtliche Schritte für den Fall der unverlangten Zusendung von Werbeinformationen, z.B. durch Spam-Mails, vor.</p>
 <p><br></p>
 <p><small><em>Quelle: <a href="http://www.mustervorlage.net/disclaimer-muster" class="externalURL">Mustervorlage.net</a></em></small></p>]]></item>
+		<item name="wcf.user.register.error.blacklistMatches"><![CDATA[Die Registrierung kann auf Grund von Einschränkungen nicht fortgesetzt werden, bitte wende{if !LANGUAGE_USE_INFORMAL_VARIANT}n Sie{/if} sich direkt an den Administrator dieser Seite.]]></item>
 	</category>
 	<category name="wcf.user.trophy">
 		<item name="wcf.user.trophy.trophyPoints"><![CDATA[Trophäen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 38878ba0f5..7c9576a350 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4613,6 +4613,7 @@ Open the link below to access the user profile:
 <p>The use by third parties of all published contact details for the purpose of advertising is expressly excluded. We reserve the right to take legal steps in the case of the unsolicited sending of advertising information; e.g., by means of spam mail.</p>
 <p><br></p>
 <p><small><em>Source: <a href="http://www.mustervorlage.net/disclaimer-muster" class="externalURL">Mustervorlage.net</a></em></small></p>]]></item>
+		<item name="wcf.user.register.error.blacklistMatches"><![CDATA[The registration could not be completed due to active restrictions, please contact the site administrator.]]></item>
 	</category>
 	<category name="wcf.user.trophy">
 		<item name="wcf.user.trophy.trophyPoints"><![CDATA[Trophies]]></item>
-- 
2.20.1