Registerable instances now possible, some fixes in filters

[shipsimu.git] / inc / classes / main / filter / validator / class_UserNameValidatorFilter.php

diff --git a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
index cb82296417ac0c9536da564ace58fa199b84fcad..38471cdecb248553e631194a19bdcd18724a68b5 100644 (file)
--- a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
@@ -110,6 +110,9 @@ class UserNameValidatorFilter extends BaseFrameworkSystem implements Filterable
                // Default is already taken
                $alreadyTaken = true;
 
+               // Initialize instance
+               $userInstance = null;
+
                // Get a registry instance
                $registry = Registry::getInstance();
 
@@ -119,14 +122,18 @@ class UserNameValidatorFilter extends BaseFrameworkSystem implements Filterable
                        $userInstance = $registry->getInstance('user');
                } else {
                        // If this instance is created then the username *does* exist
-                       $userInstance = User::createUserByUsername($userName);
-
-                       // Remember this user instance in our registry for later usage
-                       $registry->addInstance('user', $userInstance);
+                       try {
+                               $userInstance = User::createUserByUsername($userName);
+
+                               // Remember this user instance in our registry for later usage
+                               $registry->addInstance('user', $userInstance);
+                       } catch (UsernameMissingException $e) {
+                               // User was not found
+                       }
                }
 
                // Does the username exist?
-               if (!$userInstance->ifUsernameExists()) {
+               if ((is_null($userInstance)) || (!$userInstance->ifUsernameExists())) {
                        // This username is still available
                        $alreadyTaken = false;
                }