More renamed

[shipsimu.git] / application / ship-simu / main / commands / web / class_WebShipsimuUserLoginCommand.php

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
index 908d1f117156800e303368a63ea7ce63380165e2..2a33a8fe9e201c5c8e6c6484d7650ec9b5b2da46 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command for user login
  *
- * @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
@@ -30,16 +30,6 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
        protected function __construct () {
                // 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();
        }
 
        /**
@@ -48,33 +38,13 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
         * @param       $resolverInstance       An instance of a command resolver
         * @return      $commandInstance        The created command instance
         */
-       public final static function createWebShipsimuUserLoginCommand (CommandResolver $resolverInstance) {
+       public static final function createWebShipsimuUserLoginCommand (CommandResolver $resolverInstance) {
                // Get a new instance
                $commandInstance = new WebShipsimuUserLoginCommand();
 
                // Set the resolver instance
                $commandInstance->setResolverInstance($resolverInstance);
 
-               // Get the controller instance from the resolver (breaks MVC pattern again)
-               $controllerInstance = $resolverInstance->getControllerInstance();
-
-               switch ($commandInstance->getConfigInstance()->readConfig('login_type')) {
-                       case "username": // Login via username
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_class'));
-                               break;
-
-                       case "email": // Login via email
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_class'));
-                               break;
-
-                       default: // Wether username or email is set
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_class'));
-                               break;
-               }
-
-               /* @TODO Add more filters */
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
-
                // Return the prepared instance
                return $commandInstance;
        }
@@ -103,7 +73,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());
@@ -118,10 +92,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) {
-               // Empty for now
+       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
+               // Which login type do we have?
+               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_filter'));
+                               break;
+
+                       default: // Wether username or email is set
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter'));
+                               break;
+               }
+
+               // Password verifier filter
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));
+
+               // Add filter for CAPTCHA
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));
        }
 }