Updated ApplicationHelper class to latest API
[mailer.git] / index.php
index 2c960e2063ac434d42b882f74d9893082958b1fe..a14e71b0b5f8275639eb7a3ad1ef652288a9d34a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @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
  *
@@ -34,8 +34,6 @@ final class ApplicationEntryPoint {
 
        /**
         * The instances we want to remove after all is done
-        *
-        * @return      void
         */
        private static $instances = array (
                'cfg',    // The configuration system
@@ -43,7 +41,7 @@ final class ApplicationEntryPoint {
                'debug',  // Debug output
                'db',     // Database layer
                'io',     // Base I/O system (local file [or network])
-               'engine', // Template engine ( for ApplicationEntryPoint::app_die() )
+               'engine', // Template engine ( for ApplicationEntryPoint::app_exit() )
                'lang',   // Language sub-system
                'app',    // The ApplicationHelper instance
        );
@@ -54,15 +52,15 @@ final class ApplicationEntryPoint {
         * @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
@@ -75,23 +73,23 @@ 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)) {
                        // 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))) {
@@ -100,7 +98,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()
                                ));
                        }
@@ -109,9 +107,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("<span class=\"backtrace_file\">%s</span>:%d, <span class=\"backtrace_function\">%s(%d)</span><br />\n",
                                        basename($trace['file']),
                                        $trace['line'],
@@ -121,15 +128,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 +146,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 +166,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
                        ));
                }
@@ -178,7 +185,7 @@ final class ApplicationEntryPoint {
         *
         * @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 +204,7 @@ final class ApplicationEntryPoint {
         *
         * @return      void
         */
-       public static function main () {
+       public static final function main () {
                // Load config file
                require(self::detectCorePath() . '/inc/config.php');