X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffatal_errors.php;h=f1f1ee7001299bccb74f02555bee6e1d010e5390;hb=5ceaf268ba5434a7c6e003bc93c0720dcd6588a6;hp=a3a476ca543d5afcbe8069890861785aac2094c4;hpb=3daede4c904e23905c3e48dd6749019deca0a0e0;p=mailer.git diff --git a/inc/fatal_errors.php b/inc/fatal_errors.php index a3a476ca54..f1f1ee7001 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 * @@ -43,10 +48,10 @@ if (getTotalFatalErrors() > 0) { // Set unset variable if (empty($check)) $check = ""; - if (isBooleanConstantAndTrue('mxchange_installing')) { + if ((isInstalling()) || (!isInstalled())) { // 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), @@ -59,10 +64,10 @@ if (getTotalFatalErrors() > 0) { // Load main template LOAD_TEMPLATE("install_fatal_table", false, $OUT); - } elseif (isBooleanConstantAndTrue('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), @@ -74,15 +79,18 @@ if (getTotalFatalErrors() > 0) { } // Load main template - mxchange_die(LOAD_TEMPLATE("runtime_fatal_table", true, $OUT)); + LOAD_TEMPLATE("runtime_fatal_table", false, $OUT); + + // Abort here + shutdown(); } // Message to regular users (non-admin) - $CORR = FATAL_REPORT_ERRORS; + $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