Registry rewritten, exception added #2

[core.git] / inc / classes / main / controller / login / class_WebLoginAreaController.php

diff --git a/inc/classes/main/controller/login/class_WebLoginAreaController.php b/inc/classes/main/controller/login/class_WebLoginAreaController.php
index 0ad97f05cd9a7ab083e4c6ce6b3f15d07255c089..4d4d466942c9d8254ccc417bc3d337e0c99c1c1d 100644 (file)
--- a/inc/classes/main/controller/login/class_WebLoginAreaController.php
+++ b/inc/classes/main/controller/login/class_WebLoginAreaController.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @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, 2010 Core Developer Team

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -47,16 +47,16 @@ class WebLoginAreaController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // User auth filter
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // User auth filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter', array($controllerInstance)));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));

 
                // User update filter
 
                // User update filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter', array($controllerInstance)));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter'));

 
                // News fetcher filter
 
                // News fetcher filter

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter', array($controllerInstance)));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));

 
                // News proccess/display-preparation
 
                // News proccess/display-preparation

-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter', array($controllerInstance)));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter'));

 
                // Return the prepared instance
                return $controllerInstance;
 
                // Return the prepared instance
                return $controllerInstance;


@@ -82,7 +82,7 @@ class WebLoginAreaController extends BaseController implements Controller {
                        $this->executePreFilters($requestInstance, $responseInstance);
                } catch (UserAuthorizationException $e) {
                        // Redirect to main page
                        $this->executePreFilters($requestInstance, $responseInstance);
                } catch (UserAuthorizationException $e) {
                        // Redirect to main page

-                       $responseInstance->redirectToConfiguredUrl('login_failed_url');
+                       $responseInstance->redirectToConfiguredUrl('login_failed');

 
                        // Exit here
                        exit();
 
                        // Exit here
                        exit();