Stop using UserUtil::isAvailableUsername()

diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
index 3cf03d03d83002c909bc2af2359c40a734690466..b8ff713d5bba55fa0ab3683593b8a42252f4622f 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
@@ -3,6 +3,7 @@
 namespace wcf\acp\form;
 
 use wcf\data\user\group\UserGroup;
+use wcf\data\user\User;
 use wcf\data\user\UserAction;
 use wcf\form\AbstractForm;
 use wcf\system\bbcode\BBCodeHandler;
@@ -341,7 +342,7 @@ class UserAddForm extends UserOptionListForm
         }
 
         // Check if username exists already.
-        if (!UserUtil::isAvailableUsername($username)) {
+        if (User::getUserByUsername($username)->userID) {
             throw new UserInputException('username', 'notUnique');
         }
     }

diff --git a/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php b/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php
index 4410f5bd31cf555b81c922cf519366f1d6405355..59461f04e19bc22eb0591d84304de5d742539049 100644 (file)
--- a/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php
+++ b/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php
@@ -3,12 +3,12 @@
 namespace wcf\data;
 
 use wcf\data\object\type\ObjectType;
+use wcf\data\user\User;
 use wcf\system\captcha\CaptchaHandler;
 use wcf\system\captcha\ICaptchaHandler;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\UserRegistrationUtil;
-use wcf\util\UserUtil;
 
 /**
  * Provides methods related to the guest dialog of message quick reply.
@@ -117,7 +117,7 @@ trait TMessageQuickReplyGuestDialogAction
             if (!UserRegistrationUtil::isValidUsername($this->parameters['data']['username'])) {
                 throw new UserInputException('username', 'invalid');
             }
-            if (!UserUtil::isAvailableUsername($this->parameters['data']['username'])) {
+            if (User::getUserByUsername($this->parameters['data']['username'])->userID) {
                 throw new UserInputException('username', 'notUnique');
             }
         } catch (UserInputException $e) {

diff --git a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php
index 0c46b9fe9e79a5f826e3c8c2cae14e8aff351566..09c6827e4b8ce6d9b02e6d76fcfce19ab971bc49 100644 (file)
--- a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php
+++ b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php
@@ -11,6 +11,7 @@ use wcf\data\comment\response\StructuredCommentResponse;
 use wcf\data\IMessageInlineEditorAction;
 use wcf\data\object\type\ObjectType;
 use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\User;
 use wcf\system\bbcode\BBCodeHandler;
 use wcf\system\captcha\CaptchaHandler;
 use wcf\system\comment\CommentHandler;
@@ -35,7 +36,6 @@ use wcf\system\user\notification\UserNotificationHandler;
 use wcf\system\WCF;
 use wcf\util\MessageUtil;
 use wcf\util\UserRegistrationUtil;
-use wcf\util\UserUtil;
 
 /**
  * Executes comment-related actions.
@@ -1423,7 +1423,7 @@ class CommentAction extends AbstractDatabaseObjectAction implements IMessageInli
             if (!UserRegistrationUtil::isValidUsername($this->parameters['data']['username'])) {
                 throw new UserInputException('username', 'invalid');
             }
-            if (!UserUtil::isAvailableUsername($this->parameters['data']['username'])) {
+            if (User::getUserByUsername($this->parameters['data']['username'])->userID) {
                 throw new UserInputException('username', 'notUnique');
             }
         } catch (UserInputException $e) {

diff --git a/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php b/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php
index 14a1888e1fdd685c09fd92b65b5f5f0c8c2722cb..755c5224dde8fbf7d484b9a35ec5ece2b99a34b0 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php
@@ -60,7 +60,7 @@ class UserRegistrationAction extends UserAction
             ];
         }
 
-        if (!UserUtil::isAvailableUsername($this->parameters['username'])) {
+        if (User::getUserByUsername($this->parameters['username'])->userID) {
             return [
                 'isValid' => false,
                 'error' => 'notUnique',

diff --git a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
index 584ebcb1356f07697f5a4e1ff7a4bc75fcc5f282..f8bc090570b8080d471dcde42acc59a43618fa8e 100644 (file)
--- a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
+++ b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php
@@ -248,7 +248,7 @@ class AccountManagementForm extends AbstractForm
                 }
 
                 // checks if user name exists already.
-                if (!UserUtil::isAvailableUsername($this->username)) {
+                if (User::getUserByUsername($this->username)->userID) {
                     throw new UserInputException('username', 'notUnique');
                 }
             }

diff --git a/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php
index 75f2cdc1a93ce1ebb95a2d50f561f6e646567728..77552b6da665f2dc14636cfe7e0ee4fc9796f385 100644 (file)
--- a/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/user/UsernameFormField.class.php
@@ -2,6 +2,7 @@
 
 namespace wcf\system\form\builder\field\user;
 
+use wcf\data\user\User;
 use wcf\system\form\builder\field\AbstractFormField;
 use wcf\system\form\builder\field\IAttributeFormField;
 use wcf\system\form\builder\field\IAutoCompleteFormField;
@@ -132,7 +133,7 @@ class UsernameFormField extends AbstractFormField implements
                         'invalid',
                         'wcf.form.field.username.error.invalid'
                     ));
-                } elseif (!UserUtil::isAvailableUsername($this->getValue())) {
+                } elseif (User::getUserByUsername($this->getValue())->userID) {
                     $this->addValidationError(new FormFieldValidationError(
                         'notUnique',
                         'wcf.form.field.username.error.notUnique'