X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffatal_errors.php;h=57d133bec66e1e887f7e8d41638e312a5d65c3ce;hp=edee328c70734d6b98083215650361dce3b530d4;hb=f74581eca45c393033acfd9d7798b958031bc625;hpb=75ad748a68473ace540251427a74fb781b1145e9

diff --git a/inc/fatal_errors.php b/inc/fatal_errors.php
index edee328c70..57d133bec6 100644
--- a/inc/fatal_errors.php
+++ b/inc/fatal_errors.php
@@ -32,23 +32,21 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+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) {
 	// Main div container
 	LOAD_TEMPLATE("fatal_header");
 
 	// Set unset variable
 	if (empty($check)) $check = "";
-	if (mxchange_installing) {
+	if (isInstalling()) {
 		// While we are installing ouput other header than while it is installed... :-)
 		$OUT = "";
-		foreach ($FATAL as $key=>$value) {
+		foreach (getFatalArray() as $key => $value) {
 			// Prepare content for the template
 			$content = array(
 				'key'   => ($key + 1),
@@ -61,10 +59,10 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
 
 		// Load main template
 		LOAD_TEMPLATE("install_fatal_table", false, $OUT);
-	} elseif (mxchange_installed) {
+	} elseif (isInstalled()) {
 		// Display all runtime fatal errors
 		$OUT = "";
-		foreach ($FATAL as $key=>$value) {
+		foreach (getFatalArray() as $key => $value) {
 			// Prepare content for the template
 			$content = array(
 				'key'   => ($key + 1),
@@ -76,14 +74,19 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
 		}
 
 		// Load main template
-		mxchange_die(LOAD_TEMPLATE("runtime_fatal_table", true, $OUT));
+		LOAD_TEMPLATE("runtime_fatal_table", false, $OUT);
+
+		// Abort here
+		exit;
 	}
-	$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 (IS_ADMIN()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
+	} // END - if
 
 	// Load footer template
 	LOAD_TEMPLATE("fatal_footer", false, $CORR);