Updated domain without a dash :(

[admin.git] / application / admin / main / commands / web / class_WebAdminUserLoginCommand.php

diff --git a/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php b/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
index 03fc48509a733c1ecfc0f3d19e73d69254636067..bc416db3fd4f02f3a2db49f78a1ddfec87d09c8a 100644 (file)
--- a/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
+++ b/application/admin/main/commands/web/class_WebAdminUserLoginCommand.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 Admin-Area 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,10 +30,6 @@ class WebAdminUserLoginCommand extends BaseCommand implements Commandable {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -42,7 +38,7 @@ class WebAdminUserLoginCommand extends BaseCommand implements Commandable {
         * @param       $resolverInstance       An instance of a command resolver
         * @return      $commandInstance        The created command instance
         */
-       public final static function createWebAdminUserLoginCommand (CommandResolver $resolverInstance) {
+       public static final function createWebAdminUserLoginCommand (CommandResolver $resolverInstance) {
                // Get a new instance
                $commandInstance = new WebAdminUserLoginCommand();
 
@@ -78,7 +74,7 @@ class WebAdminUserLoginCommand extends BaseCommand implements Commandable {
                        // Try to redirect here
                        try {
                                // Redirect...
-                               $responseInstance->redirectToConfiguredUrl('app_login_url');
+                               $responseInstance->redirectToConfiguredUrl('app_login');
 
                                // Exit here
                                exit();
@@ -102,25 +98,25 @@ class WebAdminUserLoginCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?
-               switch ($this->getConfigInstance()->readConfig('login_type')) {
+               switch ($this->getConfigInstance()->getConfigEntry('login_type')) {
                        case "username": // Login via username
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter', array($controllerInstance)));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
                                break;
 
                        case "email": // Login via email
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter', array($controllerInstance)));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter'));
                                break;
 
                        default: // Wether username or email is set
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter', array($controllerInstance)));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter'));
                                break;
                }
 
                // Password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter', array($controllerInstance)));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));
 
                // Add filter for CAPTCHA
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter', array($controllerInstance)));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));
        }
 }