X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fcommands%2Fweb%2Fclass_WebShipsimuRegisterCommand.php;h=a6afca66befcfdcf1aaecca27fe326636c9f1cb9;hb=d1607d7f06fc0703aa4123d5d2e05ddb4404cecb;hp=3958ea587ec91b4fb3de788eb2853ef25a009390;hpb=75552231db513fd6657bdb232c5f3109aaa605d7;p=shipsimu.git

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
index 3958ea5..a6afca6 100644
--- a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -31,12 +31,6 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set part description
-		$this->setObjectDescription("Registration handling command for Ship-Simu");
-
-		// Create unique ID number
-		$this->generateUniqueId();
-
 		// Clean up a little
 		$this->removeNumberFormaters();
 		$this->removeSystemArray();
@@ -55,16 +49,6 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 		// Set the resolver instance
 		$commandInstance->setResolverInstance($resolverInstance);
 
-		// Get the controller instance from the resolver (breaks MVC pattern again)
-		$controllerInstance = $resolverInstance->getControllerInstance();
-
-		/* @TODO Add some more pre/post filters to the controller */
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_class'));
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_class'));
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_class'));
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_class'));
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
-
 		// Return the prepared instance
 		return $commandInstance;
 	}
@@ -105,10 +89,28 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 	 * Adds extra filters to the given controller instance
 	 *
 	 * @param	$controllerInstance		A controller instance
+	 * @param	$requestInstance		An instance of a class with an Requestable interface
 	 * @return	void
+	 * @todo	Add some more pre/post filters to the controller
 	 */
-	function addExtraFilters (Controller $controllerInstance) {
-		// Empty for now
+	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
+		// Validate email address (if configured: check on double email addresses)
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_class'));
+
+		// Validate username and check if it does not exist
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_class'));
+
+		// Validate if username is "guest" and not taken
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_class'));
+
+		// Validate if password is set
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_class'));
+
+		// Check if rules where accepted
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
+
+		// Validate CAPTCHA input
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_class'));
 	}
 }