X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fcommands%2Fweb%2Fclass_WebShipsimuUserLoginCommand.php;h=add9a42eb8c60778c69b819b207048a275d36df8;hp=de345a89dca41e31bd2c015b69c3e906f0ee0156;hb=50d2890511eb23971eb4ee1e392748a42b066def;hpb=d527a312ec4b2983fc0ecda2179ce335c1a5a1f9

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
index de345a8..add9a42 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, 2009 Ship-Simu Developer Team
  * @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 {
-				$responseInstance->redirectToConfiguredUrl('app_login_url');
+				// Redirect...
+				$responseInstance->redirectToConfiguredUrl('app_login');
+
+				// Exit here
+				exit();
 			} catch (FrameworkException $e) {
 				// Something went wrong here!
 				$responseInstance->addFatalMessage($e->getMessage());
@@ -104,25 +102,25 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
 	 */
 	public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
 		// Which login type do we have?
-		switch ($this->getConfigInstance()->readConfig('login_type')) {
-			case "username": // Login via username
-				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_class'));
+		switch ($this->getConfigInstance()->getConfigEntry('login_type')) {
+			case 'username': // Login via username
+				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
 				break;
 
-			case "email": // Login via email
-				$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_class'));
+			case 'email': // Login via email
+				$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;
 		}
 
 		// Password verifier filter
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));
 
 		// Add filter for CAPTCHA
-		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_class'));
+		$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));
 	}
 }