X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=index.php;h=14bb9504466ff9aa914294db40a3d8c68f96a7d4;hp=3b7f082544b72dcaebefe3db00e4752fdb4aa922;hb=b9ea3b382bbe4ece196f0e3e054f1a61c77cfb7a;hpb=19445516c44ca3cace124c077002d6b2746f8138 diff --git a/index.php b/index.php index 3b7f082..14bb950 100644 --- a/index.php +++ b/index.php @@ -7,11 +7,11 @@ * * But good little boys and girls would always initialize their variables... ;-) * - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core 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 @@ -32,41 +32,25 @@ final class ApplicationEntryPoint { */ private static $corePath = ''; - /** - * The instances we want to remove after all is done - * - * @return void - */ - private static $instances = array ( - 'cfg', // The configuration system - 'loader', // The class loader system - 'debug', // Debug output - 'db', // Database layer - 'io', // Base I/O system (local file [or network]) - 'engine', // Template engine ( for ApplicationEntryPoint::app_die() ) - 'lang', // Language sub-system - 'app', // The ApplicationHelper instance - ); - /** * The application's emergency exit * * @param $message The optional message we shall output on exit * @param $code Error code from exception * @param $extraData Extra information from exceptions - * @param $silentMode Wether not silent mode is turned on + * @param $silentMode Whether silent mode is turned on * @return void - * @todo This method is old code and needs heavy rewrite + * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper */ - public static function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) { + public static final function app_exit ($message = '', $code = FALSE, $extraData = '', $silentMode = FALSE) { // Is this method already called? if (isset($GLOBALS['app_die_called'])) { // Then output the text directly - die($message); + exit($message); } // END - if // This method shall not be called twice - $GLOBALS['app_die_called'] = true; + $GLOBALS['app_die_called'] = TRUE; // Is a message set? if (empty($message)) { @@ -75,32 +59,32 @@ final class ApplicationEntryPoint { } // END - if // Get config instance - $configInstance = FrameworkConfiguration::getInstance(); + $configInstance = FrameworkConfiguration::getSelfInstance(); // Do we have debug installation? - if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { + if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === TRUE)) { // Abort here - die(); + exit(); } // END - if // Get some instances - $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class'); - $languageInstance = LanguageSystem::getInstance(); + $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_template_class'); + $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE - $templateInstance = null; + $templateInstance = NULL; // Get response instance - $responseInstance = ApplicationHelper::getInstance()->getResponseInstance(); + $responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance(); // Is the template engine loaded? if ((class_exists($tpl)) && (is_object($languageInstance))) { // Use the template engine for putting out (nicer look) the message try { // Get the template instance from our object factory - $templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance())); + $templateInstance = ObjectFactory::createObjectByName($tpl); } catch (FrameworkException $e) { - die(sprintf("[Main:] Could not initialize template engine for reason: %s", + exit(sprintf("[Main:] Could not initialize template engine for reason: %s", $e->getMessage() )); } @@ -109,9 +93,18 @@ final class ApplicationEntryPoint { $backtraceArray = debug_backtrace(); $backtrace = ''; foreach ($backtraceArray as $key => $trace) { - if (!isset($trace['file'])) $trace['file'] = __FILE__; - if (!isset($trace['line'])) $trace['line'] = __LINE__; - if (!isset($trace['args'])) $trace['args'] = array(); + // Set missing array elements + if (!isset($trace['file'])) { + $trace['file'] = __FILE__; + } // END - if + if (!isset($trace['line'])) { + $trace['line'] = __LINE__; + } // END - if + if (!isset($trace['args'])) { + $trace['args'] = array(); + } // END - if + + // Add the traceback path to the final output $backtrace .= sprintf("%s:%d, %s(%d)
\n", basename($trace['file']), $trace['line'], @@ -121,15 +114,15 @@ final class ApplicationEntryPoint { } // END - foreach // Init application instance - $appInstance = null; + $applicationInstance = NULL; // Is the class there? if (class_exists('ApplicationHelper')) { // Get application instance - $appInstance = ApplicationHelper::getInstance(); + $applicationInstance = ApplicationHelper::getSelfInstance(); // Assign application data - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); } // END - if // We only try this @@ -139,7 +132,7 @@ final class ApplicationEntryPoint { $templateInstance->assignVariable('code', $code); $templateInstance->assignVariable('extra', $extraData); $templateInstance->assignVariable('backtrace', $backtrace); - $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal()); + $templateInstance->assignVariable('total_includes', ClassLoader::getSelfInstance()->getTotal()); $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal()); $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title')); @@ -159,14 +152,14 @@ final class ApplicationEntryPoint { $responseInstance->flushBuffer(); } catch (FileIoException $e) { // Even the template 'emergency_exit' wasn't found so output both message - die($message . ', exception: ' . $e->getMessage()); + exit($message . ', exception: ' . $e->getMessage()); } // Good bye... exit(); } else { // Output message and die - die(sprintf("[Main:] Emergency exit reached: %s", + exit(sprintf('[Main:] Emergency exit reached: %s', $message )); } @@ -176,9 +169,9 @@ final class ApplicationEntryPoint { * Determines the correct absolute path for all includes only once per run. * Other calls of this method are being "cached". * - * @return $basePath Base path (core) for all includes + * @return $corePath Base path (core) for all includes */ - protected static function detectCorePath () { + protected static final function detectCorePath () { // Is it not set? if (empty(self::$corePath)) { // Auto-detect our core path @@ -197,7 +190,7 @@ final class ApplicationEntryPoint { * * @return void */ - public static function main () { + public static final function main () { // Load config file require(self::detectCorePath() . '/inc/config.php'); @@ -213,10 +206,10 @@ final class ApplicationEntryPoint { } // END - class // Developer mode active? Comment out if no dev! -define('DEVELOPER', true); +define('DEVELOPER', TRUE); // Log all exceptions (only debug! This option can create large error logs) -//define('LOG_EXCEPTIONS', true); +//define('LOG_EXCEPTIONS', TRUE); //xdebug_start_trace();