X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=index.php;h=6f4585b3dcec4e5637396e6b1296da7fe7fe9368;hp=d534a4796c15b1caa2032c8049de745f0758ff6a;hb=0d0406c457f617fe44d9be114cbb3cd685632e58;hpb=2b952c84698623aea7b0624f863571da1ac5b0a5

diff --git a/index.php b/index.php
index d534a4796c..6f4585b3dc 100644
--- 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,7 +86,7 @@ final class ApplicationEntryPoint {
 		} // END - if
 
 		// Get some instances
-		$tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
+		$tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
 		$languageInstance = LanguageSystem::getInstance();
 
 		// Get response instance
@@ -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
@@ -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: