Added isGuest() isConfirmed() to BaseUser for wrapping this type of check into

[core.git] / inc / classes / main / filter / verifier / class_UserGuestVerifierFilter.php

diff --git a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
index 7e9efc8cb8ae0d8c3464a39efc0fe60f150f50d7..dde15e7f2c6fd4b855e47a84df1fcf2f198e55e5 100644 (file)
--- a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
@@ -4,11 +4,11 @@
  * filter chain if no username is given or if supplied username has an invalid
  * form. It could also intercept our filter chain if username was not found.
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
        /**
         * Creates an instance of this filter class
         *
-        * @return      $filterInstance                 An instance of this filter class
+        * @return      $filterInstance         An instance of this filter class
         */
        public static final function createUserGuestVerifierFilter () {
                // Get a new instance
@@ -62,7 +62,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                // Is the username set?
                if (is_null($userName)) {
                        // Not found in form so stop the filtering process
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('username_guest_unset');
@@ -71,16 +71,16 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                } elseif (empty($userName)) {
                        // Empty field!
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('username_guest_empty');
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } elseif ($this->ifUserGuestIsTaken($userName) === false) {
+               } elseif ($this->ifUserGuestIsTaken($userName) === FALSE) {
                        // Username is already taken
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('username_guest_not_found');
@@ -94,17 +94,17 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
        }
 
        /**
-        * Check wether the username as already been taken
+        * Check whether the username as already been taken
         *
         * @param       $userName               Username to check for existence
-        * @return      $alreadyTaken   Wether the username has been taken
+        * @return      $alreadyTaken   Whether the username has been taken
         */
        private function ifUserGuestIsTaken ($userName) {
                // Default is already taken
-               $alreadyTaken = true;
+               $alreadyTaken = TRUE;
 
                // Initialize instance
-               $userInstance = null;
+               $userInstance = NULL;
 
                // Get a registry instance
                $registry = Registry::getRegistry();
@@ -128,9 +128,9 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                }
 
                // Does the username exist?
-               if ((is_null($userInstance)) || ($userInstance->ifUsernameExists() === false)) {
+               if ((is_null($userInstance)) || ($userInstance->ifUsernameExists() === FALSE)) {
                        // This username is still available
-                       $alreadyTaken = false;
+                       $alreadyTaken = FALSE;
                }
 
                // Return the result