Generic index.php is now masking backtrace data

[mailer.git] / index.php

diff --git a/index.php b/index.php
index f717dd4fabf5277770af16eee9cb5ded8b80ae7e..6f4585b3dcec4e5637396e6b1296da7fe7fe9368 100644 (file)
--- a/index.php
+++ b/index.php
@@ -62,13 +62,13 @@ final class ApplicationEntryPoint {
         */
        public static function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
                // Is this method already called?
-               if (defined('EMERGENCY_EXIT_CALLED')) {
+               if (isset($GLOBALS['app_die_called'])) {
                        // Then output the text directly
                        die($message);
                } // END - if
 
                // This method shall not be called twice
-               define('EMERGENCY_EXIT_CALLED', true);
+               $GLOBALS['app_die_called'] = true;
 
                // Is a message set?
                if (empty($message)) {
@@ -86,14 +86,14 @@ final class ApplicationEntryPoint {
                } // END - if
 
                // Get some instances
-               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
-               $lang = LanguageSystem::getInstance();
+               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
+               $languageInstance = LanguageSystem::getInstance();
 
                // Get response instance
                $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
                // Is the template engine loaded?
-               if ((class_exists($tpl)) && (is_object($lang))) {
+               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
@@ -111,7 +111,12 @@ final class ApplicationEntryPoint {
                                if (!isset($trace['file'])) $trace['file'] = __FILE__;
                                if (!isset($trace['line'])) $trace['line'] = __LINE__;
                                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 />";
+                               $backtrace .= sprintf("<span class=\"backtrace_file\">%s</span>:%d, <span class=\"backtrace_function\">%s(%d)</span><br />\n",
+                                       basename($trace['file']),
+                                       $trace['line'],
+                                       $trace['function'],
+                                       count($trace['args'])
+                               );
                        } // END - foreach
 
                        // Init application instance
@@ -133,7 +138,7 @@ final class ApplicationEntryPoint {
                        $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'));
+                       $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));
 
                        // Load the template
                        $templateInstance->loadCodeTemplate('emergency_exit');
@@ -198,7 +203,6 @@ final class ApplicationEntryPoint {
                // Include the application selector
                require($cfg->getConfigEntry('base_path') . 'inc/selector.php');
        } // END - main()
-
 } // END - class
 
 // Do not remove the following line: