User friendly error message when rejecting registration attempts

diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php
index 8a9cdc5afa97b2a7f324f13de61c330bd1a1a6c1..92e9183ade1fd5a38a6b26f73f9d9a013bdfd4bb 100644 (file)
--- 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 71a0dd3440dbe19cb62de591c960d46550f8c719..4458b71ef5c35b366b0cc674e50822be33a9bd7d 100644 (file)
--- 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 38878ba0f5c969b4aabc94e9541e97b17cfa68aa..7c9576a3506d2cb6b9a3a282abb9ec909bf6b694 100644 (file)
--- 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>