Used exit() instead of die()

[hub.git] / application / hub / main / filter / node / class_NodeInitializationFilter.php

diff --git a/application/hub/main/filter/node/class_NodeInitializationFilter.php b/application/hub/main/filter/node/class_NodeInitializationFilter.php
index 40cb4046be9970c5c4a6bce217e0e0b585936eb3..6eaec8309b5cb0b333478599c004922135318113 100644 (file)
--- a/application/hub/main/filter/node/class_NodeInitializationFilter.php
+++ b/application/hub/main/filter/node/class_NodeInitializationFilter.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -37,7 +37,7 @@ class NodeInitializationFilter extends BaseFilter implements Filterable {
         *
         * @return      $filterInstance         An instance of this filter class
         */
-       public final static function createNodeInitializationFilter () {
+       public static final function createNodeInitializationFilter () {
                // Get a new instance
                $filterInstance = new NodeInitializationFilter();
 
@@ -51,11 +51,11 @@ class NodeInitializationFilter extends BaseFilter implements Filterable {
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
-        * @todo        0% done
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // The default node-mode is from our configuration
-               $nodeMode = $this->getConfigInstance()->getConfigEntry('node_mode');
+               $nodeMode = $this->getConfigInstance()->getConfigEntry('node_default_mode');
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[INIT:] Got default node mode ' . $nodeMode . ' from configuration.');
 
                // Is the node 'mode' parameter set?
                if ($requestInstance->isRequestElementSet('mode')) {
@@ -75,21 +75,22 @@ class NodeInitializationFilter extends BaseFilter implements Filterable {
                        $nodeInstance = ObjectFactory::createObjectByName($className, array($requestInstance));
 
                        // Get a registry
-                       $appInstance = Registry::getRegistry()->getInstance('app');
+                       $applicationInstance = Registry::getRegistry()->getInstance('app');
 
                        // Set the app instance
-                       $nodeInstance->setApplicationInstance($appInstance);
+                       $nodeInstance->setApplicationInstance($applicationInstance);
 
-                       // Initialize all filters
-                       $nodeInstance->initializeFilters();
+                       // Add node-specific filters
+                       $nodeInstance->addExtraFilters($applicationInstance->getControllerInstance(), $responseInstance);
                } catch (ClassNotFoundException $e) {
                        // This exception means, the node mode is invalid.
-                       // @TODO Can we rewrite this to app_die() ?
-                       die('Node mode ' . $nodeMode . ' is invalid.' . "\n");
+                       // @TODO Can we rewrite this to app_exit() ?
+                       $this->debugBackTrace('[' . __METHOD__ . ':' . __LINE__ . ']:  node mode ' . $nodeMode . ' is invalid.');
                }
 
                // Set the node instance in registry
                Registry::getRegistry()->addInstance('node', $nodeInstance);
+               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[INIT:] Node ' . $nodeMode . ' has been added to registry.');
        }
 }