X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffatal_errors.php;h=3ff6ec562ebf971879cc27dba211697d83f89d38;hp=05959f4e2623c2170d3f281b58314d9950318ed9;hb=0437f06b273f885db05736449a952c6eb72086ca;hpb=80e2def8ef2125fd4d7d1312ee3993ab613f0846

diff --git a/inc/fatal_errors.php b/inc/fatal_errors.php
index 05959f4e26..3ff6ec562e 100644
--- a/inc/fatal_errors.php
+++ b/inc/fatal_errors.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Gibt fatale Fehler aus                           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,23 +37,24 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
-{
+if (getTotalFatalErrors() > 0) {
+	// Load config here
+	loadIncludeOnce('inc/load_config.php');
+
 	// Main div container
-	LOAD_TEMPLATE("fatal_header");
+	LOAD_TEMPLATE('fatal_header');
 
 	// Set unset variable
-	if (empty($check)) $check = "";
-	if (isBooleanConstantAndTrue('mxchange_installing')) {
+	if (empty($check)) $check = '';
+	if ((isInstalling()) || (!isInstalled())) {
 		// While we are installing ouput other header than while it is installed... :-)
-		$OUT = "";
-		foreach ($FATAL as $key => $value) {
+		$OUT = '';
+		foreach (getFatalArray() as $key => $value) {
 			// Prepare content for the template
 			$content = array(
 				'key'   => ($key + 1),
@@ -56,15 +62,15 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
 			);
 
 			// Load row template
-			$OUT .= LOAD_TEMPLATE("install_fatal_row", true, $content);
+			$OUT .= LOAD_TEMPLATE('install_fatal_row', true, $content);
 		}
 
 		// Load main template
-		LOAD_TEMPLATE("install_fatal_table", false, $OUT);
-	} elseif (isBooleanConstantAndTrue('mxchange_installed')) {
+		LOAD_TEMPLATE('install_fatal_table', false, $OUT);
+	} elseif (isInstalled()) {
 		// Display all runtime fatal errors
-		$OUT = "";
-		foreach ($FATAL as $key => $value) {
+		$OUT = '';
+		foreach (getFatalArray() as $key => $value) {
 			// Prepare content for the template
 			$content = array(
 				'key'   => ($key + 1),
@@ -72,21 +78,26 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
 			);
 
 			// Load row template
-			$OUT .= LOAD_TEMPLATE("runtime_fatal_row", true, $content);
+			$OUT .= LOAD_TEMPLATE('runtime_fatal_row', true, $content);
 		}
 
 		// Load main template
-		mxchange_die(LOAD_TEMPLATE("runtime_fatal_table", true, $OUT));
+		LOAD_TEMPLATE('runtime_fatal_table', false, $OUT);
+
+		// Abort here
+		shutdown();
 	}
-	$CORR = FATAL_REPORT_ERRORS;
+
+	// Message to regular users (non-admin)
+	$CORR = getMessage('FATAL_REPORT_ERRORS');
 
 	// PHP warnings fixed
-	if ($check == "done") {
-		if (IS_ADMIN()) $CORR = FATAL_CORRECT_ERRORS;
-	}
+	if ($check == 'done') {
+		if (IS_ADMIN()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
+	} // END - if
 
 	// Load footer template
-	LOAD_TEMPLATE("fatal_footer", false, $CORR);
+	LOAD_TEMPLATE('fatal_footer', false, $CORR);
 }
 
 //