X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=index.php;h=5b3894a3797ad1534645ad861269651dba6c1180;hp=9d61748040789a81eec21cfd61263ca3a1ff4d9b;hb=886d3459eb15f9bc6b15051b2fe2d3605c19a5d4;hpb=7be9aec7da3a85e55153376faada5388f4876541

diff --git a/index.php b/index.php
index 9d61748040..5b3894a379 100644
--- a/index.php
+++ b/index.php
@@ -68,7 +68,7 @@ class ApplicationEntryPoint {
 		if (empty($message)) {
 			// No message provided
 			$message = "No message provided!";
-		}
+		} // END - if
 
 		// Get some instances
 		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
@@ -93,13 +93,25 @@ class ApplicationEntryPoint {
 			// Get and prepare backtrace for output
 			$backtraceArray = debug_backtrace();
 			$backtrace = "";
-			foreach ($backtraceArray as $key=>$trace) {
+			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();
 				$backtrace .= "<span class=\"backtrace_file\">".basename($trace['file'])."</span>:".$trace['line'].", <span class=\"backtrace_function\">".$trace['function']."(".count($trace['args']).")</span><br />";
 			} // END - foreach
 
+			// Init application instance
+			$appInstance = null;
+
+			// Is the class there?
+			if (class_exists('ApplicationHelper')) {
+				// Get application instance
+				$appInstance = ApplicationHelper::getInstance();
+
+				// Assign application data
+				$templateInstance->assignApplicationData($appInstance);
+			} // END - if
+
 			// Assign variables
 			$templateInstance->assignVariable('message', $message);
 			$templateInstance->assignVariable('code', $code);
@@ -150,13 +162,13 @@ class ApplicationEntryPoint {
 		require(dirname(__FILE__) . '/inc/config.php');
 
 		// Load all include files
-		require(PATH . 'inc/includes.php');
+		require($cfg->readConfig('base_path') . 'inc/includes.php');
 
 		// Load all framework classes
-		require(PATH . 'inc/classes.php');
+		require($cfg->readConfig('base_path') . 'inc/classes.php');
 
 		// Include the application selector
-		require(PATH . 'inc/selector.php');
+		require($cfg->readConfig('base_path') . 'inc/selector.php');
 	} // END - main()
 
 } // END - class