Updated 'core' + inc/classes.php is no longer used.
[shipsimu.git] / index.php
index 3950334e917c67e0b9c65eaa558bae402cfd9677..51eb50ef9341ef86cdff5c5f4a9b4023502e5024 100644 (file)
--- a/index.php
+++ b/index.php
@@ -7,11 +7,11 @@
  *
  * But good little boys and girls would always initialize their variables... ;-)
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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,66 +32,50 @@ 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 and should be moved to ApplicationHelper
         */
-       public static final 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)) {
                        // No message provided
-                       $message = 'No message provided!';
+                       $message = 'No message provided.';
                } // 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('html_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))) {
@@ -100,7 +84,7 @@ final class ApplicationEntryPoint {
                                // Get the template instance from our object factory
                                $templateInstance = ObjectFactory::createObjectByName($tpl);
                        } catch (FrameworkException $e) {
-                               die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
+                               exit(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
                                        $e->getMessage()
                                ));
                        }
@@ -130,12 +114,12 @@ final class ApplicationEntryPoint {
                        } // END - foreach
 
                        // Init application instance
-                       $applicationInstance = null;
+                       $applicationInstance = NULL;
 
                        // Is the class there?
                        if (class_exists('ApplicationHelper')) {
                                // Get application instance
-                               $applicationInstance = ApplicationHelper::getInstance();
+                               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                                // Assign application data
                                $templateInstance->assignApplicationData($applicationInstance);
@@ -148,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'));
 
@@ -168,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: <span class=\"emergency_span\">%s</span>",
+                       exit(sprintf('[Main:] Emergency exit reached: <span class="emergency_span">%s</span>',
                                $message
                        ));
                }
@@ -213,19 +197,16 @@ final class ApplicationEntryPoint {
                // Load all include files
                require($cfg->getConfigEntry('base_path') . 'inc/includes.php');
 
-               // Load all framework classes
-               require($cfg->getConfigEntry('base_path') . 'inc/classes.php');
-
                // Include the application selector
                require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
        } // END - main()
 } // 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();