X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fcommands%2Fweb%2Fclass_WebShipsimuUserLoginCommand.php;h=e554d9ac6fb46d2bd18f2c571d7da9fc60507e8e;hp=3721c08e73321ee8904cd6edd7433b77c554ffde;hb=f705ac104f6be9c118c7a469bd154e2cc9eb167b;hpb=495b289c89510c0a56651ff439055cffd35d1f89

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
index 3721c08..e554d9a 100644
--- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.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 WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set part description
-		$this->setObjectDescription("User login handling command for Ship-Simu");
-
-		// Create unique ID number
-		$this->generateUniqueId();
-
 		// Clean up a little
 		$this->removeNumberFormaters();
 		$this->removeSystemArray();
@@ -83,7 +77,11 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
 		if ($loginInstance->ifLoginWasSuccessfull()) {
 			// Try to redirect here
 			try {
+				// Redirect...
 				$responseInstance->redirectToConfiguredUrl('app_login_url');
+
+				// Exit here
+				exit();
 			} catch (FrameworkException $e) {
 				// Something went wrong here!
 				$responseInstance->addFatalMessage($e->getMessage());
@@ -98,26 +96,31 @@ class WebShipsimuUserLoginCommand 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 more filters
 	 */
-	function addExtraFilters (Controller $controllerInstance) {
+	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Which login type do we have?
-		switch ($commandInstance->getConfigInstance()->readConfig('login_type')) {
+		switch ($this->getConfigInstance()->readConfig('login_type')) {
 			case "username": // Login via username
-				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_class'));
+				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
 				break;
 
 			case "email": // Login via email
-				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_class'));
+				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter'));
 				break;
 
 			default: // Wether username or email is set
-				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_class'));
+				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter'));
 				break;
 		}
 
-		/* @TODO Add more filters */
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
+		// Password verifier filter
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));
+
+		// Add filter for CAPTCHA
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));
 	}
 }