X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fcommands%2Fweb%2Fclass_WebShipsimuRegisterCommand.php;h=181ce2f38fa211a8dd7db844903cb2ac4231f926;hp=0b41b4fe913e08c03e92cdba110eb77144756479;hb=4f70843ae8428f051d70ccff5bb43fc4c03dda8d;hpb=b226bbefe6bc09bcd75432c3c3ba32bf7da45b71

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
index 0b41b4f..181ce2f 100644
--- a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command for registration handling
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu 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
@@ -23,23 +23,13 @@
  */
 class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 	/**
-	 * Private constructor
+	 * Protected constructor
 	 *
 	 * @return	void
 	 */
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set part description
-		$this->setObjectDescription("Registration handling command for Ship-Simu");
-
-		// Create unique ID number
-		$this->createUniqueID();
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -48,19 +38,13 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver
 	 * @return	$commandInstance	The created command instance
 	 */
-	public final static function createWebShipsimuRegisterCommand (CommandResolver $resolverInstance) {
+	public static final function createWebShipsimuRegisterCommand (CommandResolver $resolverInstance) {
 		// Get a new instance
 		$commandInstance = new WebShipsimuRegisterCommand();
 
 		// 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(UserNameValidatorFilter::createUserNameValidatorFilter());
-
 		// Return the prepared instance
 		return $commandInstance;
 	}
@@ -73,7 +57,59 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
 	 * @return	void
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-		$this->partialStub();
+		// First get a UserRegistration instance
+		$registerInstance = ObjectFactory::createObjectByConfiguredName('user_registration_class');
+
+		// First set request and response instance
+		$registerInstance->setRequestInstance($requestInstance);
+		$registerInstance->setResponseInstance($responseInstance);
+
+		// Encrypt the password
+		$registerInstance->encryptPassword('pass1');
+
+		// Do things before registration
+		$registerInstance->doPreRegistration();
+
+		// Register the new user
+		$registerInstance->registerNewUser();
+
+		// Do things after registration like notifying partner pages or queueing
+		// them for notification
+		$registerInstance->doPostRegistration();
+
+		// Redirect or login after registration
+		$registerInstance->doPostAction();
+	}
+
+	/**
+	 * 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
+	 */
+	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
+		// Validate email address (if configured: check on double email addresses)
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter'));
+
+		// Validate username and check if it does not exist
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_filter'));
+
+		// Validate if username is "guest" and not taken
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_filter'));
+
+		// Validate if password is set
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_filter'));
+
+		// Check if rules where accepted
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter'));
+
+		// Validate CAPTCHA input
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter'));
+
+		// Validate birthday
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter'));
 	}
 }