X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=9d61748040789a81eec21cfd61263ca3a1ff4d9b;hp=48976ab9738d0d5034fd46860f766b190a987402;hb=efba981c9bf18c733dfde945b09111ff4b6007ce;hpb=55b327a3f5f2fe1d244532e07be7444e94b2a768
diff --git a/index.php b/index.php
index 48976ab..9d61748 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
* @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
@@ -49,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);
@@ -69,60 +71,58 @@ 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));
- } catch (BasePathIsEmptyException $e) {
- die(sprintf("[Main:] Could not initialize template engine for this reason: %s",
- $e->getMessage()
- ));
- } catch (InvalidBasePathStringException $e) {
- die(sprintf("[Main:] Could not initialize template engine for this reason: %s",
- $e->getMessage()
- ));
- } catch (BasePathIsNoDirectoryException $e) {
- die(sprintf("[Main:] Could not initialize template engine for this reason: %s",
- $e->getMessage()
- ));
- } catch (BasePathReadProtectedException $e) {
- die(sprintf("[Main:] Could not initialize template engine for this reason: %s",
+ $templateInstance = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+ } catch (FrameworkException $e) {
+ die(sprintf("[Main:] Could not initialize template engine for reason: %s",
$e->getMessage()
));
}
- // Backtrace holen und aufbereiten
+ // Get and prepare backtrace for output
$backtraceArray = debug_backtrace();
$backtrace = "";
foreach ($backtraceArray as $key=>$trace) {
if (!isset($trace['file'])) $trace['file'] = __FILE__;
- if (!isset($trace['line'])) $trace['line'] = 5;
+ if (!isset($trace['line'])) $trace['line'] = __LINE__;
if (!isset($trace['args'])) $trace['args'] = array();
$backtrace .= "".basename($trace['file']).":".$trace['line'].", ".$trace['function']."(".count($trace['args']).")
";
- }
+ } // END - foreach
// Assign variables
- $tplEngine->assignVariable('message', $message);
- $tplEngine->assignVariable('backtrace', $backtrace);
- $tplEngine->assignVariable('total_objects', ObjectFactory::getTotal());
+ $templateInstance->assignVariable('message', $message);
+ $templateInstance->assignVariable('code', $code);
+ $templateInstance->assignVariable('extra', $extraData);
+ $templateInstance->assignVariable('backtrace', $backtrace);
+ $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
+ $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
+ $templateInstance->assignVariable('title', $lang->getMessage('emergency_exit_title'));
// Load the template
- $tplEngine->loadCodeTemplate('emergency_exit');
+ $templateInstance->loadCodeTemplate('emergency_exit');
// Compile the template
- $tplEngine->compileTemplate();
+ $templateInstance->compileTemplate();
// Compile all variables
- $tplEngine->compileVariables();
+ $templateInstance->compileVariables();
- // Output all
- $tplEngine->output();
+ // Transfer data to response
+ $templateInstance->transferToResponse($responseInstance);
+
+ // Flush the response
+ $responseInstance->flushBuffer();
// Good bye...
exit();
@@ -157,7 +157,6 @@ class ApplicationEntryPoint {
// Include the application selector
require(PATH . 'inc/selector.php');
-
} // END - main()
} // END - class