Fix wording/codestyle

Co-authored-by: Tim Düsterhus <duesterhus@woltlab.com>
Co-authored-by: Matthias Schmidt <gravatronics@live.com>

diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 670a49511d9be2cc544f3acd6171685072141a27..b3540f9664ba3eab12a4585a8a6880180bc860e2 100644 (file)
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -20,7 +20,7 @@
                <p class="warning" role="status">{lang}wcf.user.register.needAdminActivation{/lang}</p>
        {/if}
        
-       {* user needs email activation w/o beeing disabled *}
+       {* user needs email activation w/o being disabled *}
        {if !$__wcf->user->isEmailConfirmed() && REGISTER_ACTIVATION_METHOD & 1 && $__wcf->user->isActivated() && $templateName != 'registerActivation' && $templateName != 'register' && $templateName != 'redirect' && $__wcf->user->getBlacklistMatches()|empty}
                <p class="warning" role="status">{lang}wcf.user.register.needEmailConfirmation{/lang}</p>
        {/if}

diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php
index d9329523b768e7413044e1247c837a5cc2674f1d..e4f7560633d7478a5fc7858e1f12d90385625073 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/User.class.php
+++ b/wcfsetup/install/files/lib/data/user/User.class.php
@@ -108,7 +108,7 @@ final class User extends DatabaseObject implements IRouteController, IUserConten
        const REGISTER_ACTIVATION_NONE = 0;
        const REGISTER_ACTIVATION_USER = 1;
        const REGISTER_ACTIVATION_ADMIN = 2;
-       const REGISTER_ACTIVATION_USER_AND_ADMIN = 3; // self::REGISTER_ACTIVATION_USER + self::REGISTER_ACTIVATION_ADMIN
+       const REGISTER_ACTIVATION_USER_AND_ADMIN = 3; // self::REGISTER_ACTIVATION_USER | self::REGISTER_ACTIVATION_ADMIN
        
        /** @noinspection PhpMissingParentConstructorInspection */
        /**

diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index 5427da2a7f5293d9d017a91b5759fdb5ad30a0a1..9d011bf2a8210b8bb6548723bcce5a0849c0ee71 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -635,19 +635,19 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
        }
        
        /**
-        * Marks the email address as confirmed and enables the user, iff the register method is user activation only.
-        * @since 5.3 
+        * Marks the email address as confirmed. It also enables the user, iff the register method is user activation only.
+
+        * @since       5.3
         */
        public function confirmEmail() {
                if (empty($this->objects)) $this->readObjects();
                
                if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_ADMIN) {
-                       $action = new UserAction($this->objects, 'update', [
+                       (new UserAction($this->objects, 'update', [
                                'data' => [
-                                       'emailConfirmed' => null
+                                       'emailConfirmed' => null,
                                ]
-                       ]);
-                       $action->executeAction();
+                       ]))->executeAction();
                }
                else {
                        $this->enable();
@@ -684,7 +684,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
                        'data' => [
                                'activationCode' => 0,
                                'blacklistMatches' => '',
-                               'emailConfirmed' => null
+                               'emailConfirmed' => null,
                        ],
                        'removeGroups' => UserGroup::getGroupIDsByType([UserGroup::GUESTS])
                ]);
@@ -728,7 +728,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
                $action = new UserAction($this->objects, 'update', [
                        'data' => [
                                'activationCode' => UserRegistrationUtil::getActivationCode(),
-                               'emailConfirmed' => bin2hex(\random_bytes(20))
+                               'emailConfirmed' => bin2hex(\random_bytes(20)),
                        ],
                        'removeGroups' => UserGroup::getGroupIDsByType([UserGroup::USERS])
                ]);

diff --git a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
index 19f87d2daa8177e03e93ea39a2cd56b9939da312..4436a3e7bc63e6ee1e0a36c038bce678e8ad54a6 100644 (file)
--- a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
@@ -276,7 +276,7 @@ class UserClipboardAction extends AbstractClipboardAction {
                
                $userIDs = [];
                foreach ($this->objects as $user) {
-                       if ($user->is) $userIDs[] = $user->userID;
+                       if (!$user->isActivated()) $userIDs[] = $user->userID;
                }
                
                return $userIDs;

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index cd522ff97b17572d497cee179800335b97fa89ab..be8d56c679626f69a9d8c03e658b906b2311c50a 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4607,7 +4607,7 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}
                <item name="wcf.user.registerActivation"><![CDATA[Registrierung abschließen]]></item>
                <item name="wcf.user.registerActivation.error.userAlreadyEnabled"><![CDATA[Dieser Benutzer ist bereits freigeschaltet.]]></item>
                <item name="wcf.user.registerActivation.success"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto wurde erfolgreich freigeschaltet.]]></item>
-               <item name="wcf.user.registerActivation.success.awaitAdminActivation"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} E-Mail-Adresse wurde erfolgreich freigeschaltet. {if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto muss nun noch von einem Administrator freigeschaltet werden.]]></item>
+               <item name="wcf.user.registerActivation.success.awaitAdminActivation"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} E-Mail-Adresse wurde erfolgreich bestätigt. {if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto muss nun noch von einem Administrator freigeschaltet werden.]]></item>
                <item name="wcf.user.activationCode.error.invalid"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} einen ungültigen Aktivierungscode eingegeben. {if LANGUAGE_USE_INFORMAL_VARIANT}Klicke auf den unten stehenden Link, falls du einen neuen Aktivierungscode anfordern möchtest.{else}Klicken Sie auf den unten stehenden Link, falls Sie einen neuen Aktivierungscode anfordern möchten.{/if}]]></item>
                <item name="wcf.user.registerNewActivationCode.email.description"><![CDATA[Optional {if LANGUAGE_USE_INFORMAL_VARIANT}kannst du{else}können Sie{/if} hier eine neue E-Mail-Adresse eintragen, an die der neue Aktivierungscode gesendet werden soll. {if LANGUAGE_USE_INFORMAL_VARIANT}Lasse{else}Lassen Sie{/if} dieses Feld frei, wenn der Aktivierungscode an die bestehende Adresse geschickt werden soll.]]></item>
                <item name="wcf.user.newActivationCode.success"><![CDATA[Eine E-Mail mit dem neuen Aktivierungscode wurde an {$email} versendet.]]></item>
@@ -4740,7 +4740,7 @@ Sie sich{/if} bitte an den Administrator unter: {@MAIL_ADMIN_ADDRESS}. Wenn {if
 dich{else}Sie
 sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}haben{/if}, dann {if LANGUAGE_USE_INFORMAL_VARIANT}kannst du{else}können Sie{/if} diese E-Mail ignorieren.]]></item>
                <item name="wcf.user.register.needAdminActivation"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzerkonto muss noch von einem Administrator freigeschaltet werden, um den vollen Funktionsumfang dieser Seite nutzen zu können.]]></item>
-               <item name="wcf.user.register.needEmailConfirmation"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} E-Mail-Adresse muss noch aktiviert werden. <a href="{link controller='RegisterActivation'}{/link}">Aktivieren Sie jetzt Ihre E-Mail-Adresse</a>]]></item>
+               <item name="wcf.user.register.needEmailConfirmation"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} E-Mail-Adresse muss noch bestätigt werden. <a href="{link controller='RegisterActivation'}{/link}">{if LANGUAGE_USE_INFORMAL_VARIANT}Bestätige jetzt deine{else}Bestätigen Sie jetzt Ihre{/if} E-Mail-Adresse</a>.]]></item>
                <!-- Success Messages -->
                <item name="wcf.user.register.success"><![CDATA[Vielen Dank für die Registrierung, {$user->username}. {if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Registrierung ist hiermit vollständig abgeschlossen.]]></item>
                <item name="wcf.user.register.success.needActivation"><![CDATA[Vielen Dank für die Registrierung, {$user->username}.<br>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 409ea1322176804fd7eccb6497c3951004f46e77..8f8f2ab5378a94333e5c64274af7aedf205c6017 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4603,7 +4603,7 @@ not register with us.]]></item>
                <item name="wcf.user.registerActivation"><![CDATA[Complete Registration]]></item>
                <item name="wcf.user.registerActivation.error.userAlreadyEnabled"><![CDATA[The user is already activated.]]></item>
                <item name="wcf.user.registerActivation.success"><![CDATA[The user account has been activated.]]></item>
-               <item name="wcf.user.registerActivation.success.awaitAdminActivation"><![CDATA[{The email address has been activated. Now your account must be activated by an administrator.]]></item>
+               <item name="wcf.user.registerActivation.success.awaitAdminActivation"><![CDATA[The email address has been confirmed. Now your account must be activated by an administrator.]]></item>
                <item name="wcf.user.activationCode.error.invalid"><![CDATA[You have provided an invalid activation code. Click the link below if you wish to request a new activation code.]]></item>
                <item name="wcf.user.registerNewActivationCode.email.description"><![CDATA[You can provide a different email address or leave it empty to send the code to the same email address again.]]></item>
                <item name="wcf.user.newActivationCode.success"><![CDATA[The activation code has been sent to “{$email}”.]]></item>