More SQL rewrites, TODO: Put all table and column names in backticks (`)

[mailer.git] / inc / fatal_errors.php

diff --git a/inc/fatal_errors.php b/inc/fatal_errors.php
index edee328c70734d6b98083215650361dce3b530d4..96a7d8539eb39de32922d865aa1654d63bf4feac 100644 (file)
--- a/inc/fatal_errors.php
+++ b/inc/fatal_errors.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -45,10 +44,10 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
 
        // Set unset variable
        if (empty($check)) $check = "";
-       if (mxchange_installing) {
+       if (isBooleanConstantAndTrue('mxchange_installing')) {
                // While we are installing ouput other header than while it is installed... :-)
                $OUT = "";
-               foreach ($FATAL as $key=>$value) {
+               foreach ($FATAL as $key => $value) {
                        // Prepare content for the template
                        $content = array(
                                'key'   => ($key + 1),
@@ -61,10 +60,10 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
 
                // Load main template
                LOAD_TEMPLATE("install_fatal_table", false, $OUT);
-       } elseif (mxchange_installed) {
+       } elseif (isBooleanConstantAndTrue('mxchange_installed')) {
                // Display all runtime fatal errors
                $OUT = "";
-               foreach ($FATAL as $key=>$value) {
+               foreach ($FATAL as $key => $value) {
                        // Prepare content for the template
                        $content = array(
                                'key'   => ($key + 1),