Following things are changed: (in order of class names)

[shipsimu.git] / index.php

diff --git a/index.php b/index.php
index 1a3a883e19c89856e701d3b408e225231d7655fe..9ad3a004105a12bfcd8a035112395d454870a184 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,7 +1,6 @@
 <?php
 // Developer mode active? Comment out if no dev!
 define('DEVELOPER', true);
-
 //xdebug_start_trace();
 /**
  * The main class with the entry point to the whole application. This class
@@ -11,11 +10,11 @@ define('DEVELOPER', true);
  *
  * But good little boys and girls would always initialize their variables... ;-)
  *
- * @author             Roland Haeder <webmaster@mxchange.org>
+ * @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, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.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
@@ -37,8 +36,8 @@ class ApplicationEntryPoint {
         * @return      void
         */
        private static $instances = array (
-               'cfg',  // The configuration system
-               'loader',       // The class loader system
+               'cfg',    // The configuration system
+               'loader', // The class loader system
                'debug',  // Debug output
                'db',     // Database layer
                'io',     // Base I/O system (local file [or network])
@@ -50,15 +49,17 @@ class ApplicationEntryPoint {
        /**
         * The application's emergency exit
         *
-        * @param               $message        The optional message we shall output on exit
+        * @param       $message        The optional message we shall output on exit
+        * @param       $code           Error code from exception
+        * @param       $extraData      Extra information from exceptions
         * @return      void
         */
-       public static function app_die ($message = "") {
+       public static function app_die ($message = "", $code = false, $extraData = "") {
                // Is this method already called?
                if (defined('EMERGENCY_EXIT_CALLED')) {
                        // Then output the text directly
                        die($message);
-               }
+               } // END - if
 
                // This method shall not be called twice
                define('EMERGENCY_EXIT_CALLED', true);
@@ -70,16 +71,19 @@ class ApplicationEntryPoint {
                }
 
                // Get some instances
-               $tpl = FrameworkConfiguration::getInstance()->readConfig('tpl_engine');
+               $tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
                $lang = LanguageSystem::getInstance();
                $io = FileIoHandler::getInstance();
 
+               // Get response instance
+               $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
+
                // Is the template engine loaded?
                if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory
-                               $tplEngine = ObjectFactory::createObjectByConfiguredName('tpl_engine', array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+                               $tplEngine = ObjectFactory::createObjectByConfiguredName('template_class', array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
                        } catch (BasePathIsEmptyException $e) {
                                die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",
                                        $e->getMessage()
@@ -106,11 +110,14 @@ class ApplicationEntryPoint {
                                if (!isset($trace['line'])) $trace['line'] = 5;
                                if (!isset($trace['args'])) $trace['args'] = array();
                                $backtrace .= "<span class=\"backtrace_file\">".basename($trace['file'])."</span>:".$trace['line'].", <span class=\"backtrace_function\">".$trace['function']."(".count($trace['args']).")</span><br />";
-                       }
+                       } // END - foreach
 
                        // Assign variables
                        $tplEngine->assignVariable('message', $message);
+                       $tplEngine->assignVariable('code', $code);
+                       $tplEngine->assignVariable('extra', $extraData);
                        $tplEngine->assignVariable('backtrace', $backtrace);
+                       $tplEngine->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
                        $tplEngine->assignVariable('total_objects', ObjectFactory::getTotal());
 
                        // Load the template
@@ -122,8 +129,11 @@ class ApplicationEntryPoint {
                        // Compile all variables
                        $tplEngine->compileVariables();
 
-                       // Output all
-                       $tplEngine->output();
+                       // Transfer data to response
+                       $tplEngine->transferToResponse($responseInstance);
+
+                       // Flush the response
+                       $responseInstance->flushBuffer();
 
                        // Good bye...
                        exit();