X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_UserGuestVerifierFilter.php;h=8e2b952fdeb3715ad461a11719c00dffd4660a70;hp=839b1eb96536330476500fdf9dedde17f0e5e056;hb=a2ec310b333194cfc83f0c2d76309fb5afccace6;hpb=558b417d946a1a6cee5278e86b5ed042afb3aad6

diff --git a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
index 839b1eb965..8e2b952fde 100644
--- a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
@@ -1,9 +1,8 @@
 <?php
 /**
  * A concrete filter for verfying the guest username. This filter may intercept the
- * filter chain if no username is given or if the supplied username has an
- * invalid form. It could also intercept the filter chain if the username was
- * not found.
+ * 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>
  * @version		0.0.0
@@ -38,12 +37,16 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 	/**
 	 * Creates an instance of this filter class
 	 *
-	 * @return	$filterInstance		An instance of this filter class
+	 * @param	$controllerInstance		An instance of a Controller class
+	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserGuestVerifierFilter () {
+	public final static function createUserGuestVerifierFilter (Controller $controllerInstance) {
 		// Get a new instance
 		$filterInstance = new UserGuestVerifierFilter();
 
+		// Set the controller
+		$filterInstance->setControllerInstance($controllerInstance);
+
 		// Return the instance
 		return $filterInstance;
 	}
@@ -65,7 +68,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 			$requestInstance->requestIsValid(false);
 
 			// Add a message to the response
-			$responseInstance->addFatalMessage('username_unset');
+			$responseInstance->addFatalMessage('username_guest_unset');
 
 			// Abort here
 			return false;
@@ -74,16 +77,16 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 			$requestInstance->requestIsValid(false);
 
 			// Add a message to the response
-			$responseInstance->addFatalMessage('username_empty');
+			$responseInstance->addFatalMessage('username_guest_empty');
 
 			// Abort here
 			return false;
-		} elseif (!$this->ifUserGuestIsTaken($userName)) {
+		} elseif ($this->ifUserGuestIsTaken($userName) === false) {
 			// Username is already taken
 			$requestInstance->requestIsValid(false);
 
 			// Add a message to the response
-			$responseInstance->addFatalMessage('username_not_found');
+			$responseInstance->addFatalMessage('username_guest_not_found');
 
 			// Abort here
 			return false;
@@ -128,7 +131,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 		}
 
 		// Does the username exist?
-		if ((is_null($userInstance)) || (!$userInstance->ifUsernameExists())) {
+		if ((is_null($userInstance)) || ($userInstance->ifUsernameExists() === false)) {
 			// This username is still available
 			$alreadyTaken = false;
 		}