Some functions rewritten to hungarian notation, handling of array rewritten

diff --git a/click.php b/click.php
index f5dbe4bd91d9af879dd93ce520a935c1c68f7b8a..13431b1f3e652cf4e3f90eec69227cd9af9499ff 100644 (file)
--- a/click.php
+++ b/click.php
@@ -46,13 +46,12 @@ require("inc/config.php");
 
 if (((!empty($_GET['user'])) || (!empty($_GET['reseller']))) && (!empty($_GET['banner']))) {
        // Update clicks counter...
 
 if (((!empty($_GET['user'])) || (!empty($_GET['reseller']))) && (!empty($_GET['banner']))) {
        // Update clicks counter...

-       $CLICK = 1;

        SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refbanner SET clicks=clicks+1 WHERE id=%s LIMIT 1", array(bigintval($_GET['banner'])), __FILE__, __LINE__);
        if (SQL_AFFECTEDROWS() == 1) {
                if (!empty($_GET['user'])) {
                        LOAD_URL("ref.php?refid=".bigintval($_GET['user']));
        SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refbanner SET clicks=clicks+1 WHERE id=%s LIMIT 1", array(bigintval($_GET['banner'])), __FILE__, __LINE__);
        if (SQL_AFFECTEDROWS() == 1) {
                if (!empty($_GET['user'])) {
                        LOAD_URL("ref.php?refid=".bigintval($_GET['user']));

-               } else {
-                       LOAD_URL("shop_reseller.php?reseller=".bigintval($_GET['user']));
+               } elseif (!empty($_GET['reseller'])) {
+                       LOAD_URL("shop_reseller.php?reseller=".bigintval($_GET['reseller']));

                }
        } // END - if
 } // END - if
                }
        } // END - if
 } // END - if

diff --git a/debug.php b/debug.php
index 0d6150cadb20880a8c97ca87bfefe41dd1ea3e57..025ec75cfdec9369ec9576a890057c38bd71a26f 100644 (file)
--- a/debug.php
+++ b/debug.php
@@ -35,10 +35,9 @@
 require_once("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 require_once("inc/libs/security_functions.php");
 
 // Init "action" and "what"

-global $what, $action, $FATAL;
+global $what, $action;

 $GLOBALS['what'] = "";
 $GLOBALS['action'] = "";
 $GLOBALS['what'] = "";
 $GLOBALS['action'] = "";

-$FATAL = array();

 
 // Set module and fake "CSS mode"
 $GLOBALS['module'] = "debug"; $CSS = -1;
 
 // Set module and fake "CSS mode"
 $GLOBALS['module'] = "debug"; $CSS = -1;


@@ -47,7 +46,13 @@ $GLOBALS['module'] = "debug"; $CSS = -1;
 require("inc/config.php");
 
 // Redirect only to registration page when this script is installed
 require("inc/config.php");
 
 // Redirect only to registration page when this script is installed

-if ((isBooleanConstantAndTrue('mxchange_installed')) && (count($FATAL) == 0)) {
+if ((isBooleanConstantAndTrue('mxchange_installed')) && (getTotalFatalErrors() == 0)) {
+       // Is the extension installed?
+       if (!EXT_IS_ACTIVE("debug")) {
+               // Then abort here
+               exit;
+       } // END - if
+

        // Is the request parameter set?
        if (isset($_POST['request'])) {
                // Handle the request
        // Is the request parameter set?
        if (isset($_POST['request'])) {
                // Handle the request


@@ -77,7 +82,7 @@ if ((isBooleanConstantAndTrue('mxchange_installed')) && (count($FATAL) == 0)) {
        }
 } else {
        // Not installed or fatal errors
        }
 } else {
        // Not installed or fatal errors

-       DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_fatal", count($FATAL));
+       DEBUG_ABUSE_LOG(__FILE__, __LINE__, "request_fatal", getTotalFatalErrors());

 } // END - if
 
 // Really all done here... ;-)
 } // END - if
 
 // Really all done here... ;-)

diff --git a/inc/databases.php b/inc/databases.php
index c7fed7c1a58bcf505b50e228aec36d70d906e051..768f9b62647e58e055a7d79399e33776b34fe521 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -47,12 +47,12 @@ define('CODE_NO_COOKIES'       , 0x006);
 define('CODE_CNTR_FAILED'      , 0x008);
 define('CODE_LOGOUT_DONE'      , 0x008);
 define('CODE_LOGOUT_FAILED'    , 0x009);
 define('CODE_CNTR_FAILED'      , 0x008);
 define('CODE_LOGOUT_DONE'      , 0x008);
 define('CODE_LOGOUT_FAILED'    , 0x009);

-define('CODE_URL_TLOCK'        , 0x00A);
-define('CODE_URL_FOUND'        , 0x00B);
-define('CODE_OVERLENGTH'       , 0x00C);
-define('CODE_SUBJ_URL'         , 0x00D);
-define('CODE_BLIST_URL'        , 0x00E);
-define('CODE_NO_RECS_LEFT'     , 0x00F);
+define('CODE_URL_TLOCK'        , 0x00a);
+define('CODE_URL_FOUND'        , 0x00b);
+define('CODE_OVERLENGTH'       , 0x00c);
+define('CODE_SUBJ_URL'         , 0x00d);
+define('CODE_BLIST_URL'        , 0x00e);
+define('CODE_NO_RECS_LEFT'     , 0x00f);

 define('CODE_INVALID_TAGS'     , 0x010);
 define('CODE_MORE_POINTS'      , 0x011);
 define('CODE_COOKIES_DISABLED' , 0x012);
 define('CODE_INVALID_TAGS'     , 0x010);
 define('CODE_MORE_POINTS'      , 0x011);
 define('CODE_COOKIES_DISABLED' , 0x012);


@@ -63,15 +63,15 @@ define('CODE_USER_404'         , 0x016);
 define('CODE_STATS_404'        , 0x017);
 define('CODE_ALREADY_CONFIRMED', 0x018);
 define('CODE_ERROR_MAILID'     , 0x019);
 define('CODE_STATS_404'        , 0x017);
 define('CODE_ALREADY_CONFIRMED', 0x018);
 define('CODE_ERROR_MAILID'     , 0x019);

-define('CODE_EXTENSION_PROBLEM', 0x01A);
-define('CODE_MORE_RECEIVERS1'  , 0x01B);
-define('CODE_MORE_RECEIVERS2'  , 0x01C);
-define('CODE_MORE_RECEIVERS3'  , 0x01D);
-define('CODE_INVALID_URL'      , 0x01E);
-define('CODE_MENU_NOT_VALID'   , 0x01F);
+define('CODE_EXTENSION_PROBLEM', 0x01a);
+define('CODE_MORE_RECEIVERS1'  , 0x01b);
+define('CODE_MORE_RECEIVERS2'  , 0x01c);
+define('CODE_MORE_RECEIVERS3'  , 0x01d);
+define('CODE_INVALID_URL'      , 0x01e);
+define('CODE_MENU_NOT_VALID'   , 0x01f);

 define('CODE_LOGIN_FAILED'     , 0x020);
 define('CODE_LOGIN_FAILED'     , 0x020);

-define('CODE_BEG_SAME_AS_OWN'  , 0x020);
-define('CODE_UNHANDLED_STATUS' , 0x020);
+define('CODE_BEG_SAME_AS_OWN'  , 0x021);
+define('CODE_UNHANDLED_STATUS' , 0x022);

 
 // Full version string: /([0-9]){1}\.([0-9]){1}\.([0-9]){1}(-(alpha|beta|pre|rc([1-3]))([0-9]+))?/
 // If you understand regular expressions ^^^ you may know how I versionize... ;-)
 
 // Full version string: /([0-9]){1}\.([0-9]){1}\.([0-9]){1}(-(alpha|beta|pre|rc([1-3]))([0-9]+))?/
 // If you understand regular expressions ^^^ you may know how I versionize... ;-)


@@ -97,7 +97,7 @@ define('START_TDAY', MAKE_TIME(0, 0, 0, time()));
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision

-define('CURR_SVN_REVISION', "715");
+define('CURR_SVN_REVISION', "716");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index fe37cb669966e3f80c45fd4db05c86251d590f31..b1104563e55f077ac00535ee7f4ec6f44e5d622f 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -50,7 +50,7 @@ function SQL_QUERY ($sql_string, $F, $L) {
        // Run SQL command
        //* DEBUG: */ echo $sql_string."<br />\n";
        $result = @mysql_query($sql_string, $link)
        // Run SQL command
        //* DEBUG: */ echo $sql_string."<br />\n";
        $result = @mysql_query($sql_string, $link)

-        or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
+        or addFatalMessage($F." (".$L."):".mysql_error()."<br />

 Query string:<br />
 ".$sql_string);
 
 Query string:<br />
 ".$sql_string);
 


@@ -176,14 +176,14 @@ function SQL_RESULT($res, $row, $field) {
 }
 // SQL connect
 function SQL_CONNECT($host, $login, $password, $F, $L) {
 }
 // SQL connect
 function SQL_CONNECT($host, $login, $password, $F, $L) {

-       $connect = @mysql_connect($host, $login, $password) or ADD_FATAL($F." (".$L."):".mysql_error());
+       $connect = @mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());

        return $connect;
 }
 // SQL select database
 function SQL_SELECT_DB($dbName, $link, $F, $L) {
        $select = false;
        if (is_resource($link)) {
        return $connect;
 }
 // SQL select database
 function SQL_SELECT_DB($dbName, $link, $F, $L) {
        $select = false;
        if (is_resource($link)) {

-               $select = @mysql_select_db($dbName, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
+               $select = @mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());

        }
        return $select;
 }
        }
        return $select;
 }


@@ -208,7 +208,7 @@ function SQL_CLOSE(&$link, $F, $L) {
        } // END - if
 
        // Close database link and forget the link
        } // END - if
 
        // Close database link and forget the link

-       $close = @mysql_close($link) or ADD_FATAL($F." (".$L."):".mysql_error());
+       $close = mysql_close($link) or addFatalMessage($F." (".$L."):".mysql_error());

        $link = null;
        return $close;
 }
        $link = null;
        return $close;
 }

diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php
index 3798fa967750c08fae77eeef4085285b3a0a14b3..9d5f72a052ae2b4501069d815fd35d7cfa2494ae 100644 (file)
--- a/inc/extensions/ext-cache.php
+++ b/inc/extensions/ext-cache.php
@@ -251,7 +251,7 @@ default: // Do stuff when extension is loaded
                $cacheInstance = new CacheSystem(getConfig('cache_update'), PATH."inc/".getConfig('cache_path'), getConfig('cache_tested'));
                if ($cacheInstance->getStatus() != "done") {
                        // Failed to initialize cache sustem
                $cacheInstance = new CacheSystem(getConfig('cache_update'), PATH."inc/".getConfig('cache_path'), getConfig('cache_tested'));
                if ($cacheInstance->getStatus() != "done") {
                        // Failed to initialize cache sustem

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_INITIALIZE);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_INITIALIZE);

                } // END - if
        } // END - if
        break;
                } // END - if
        } // END - if
        break;

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 4cb2b00ca072997470b3ca0c0fe2c25f7a2a2be1..3cdd3ce01cf2def6107140a2a6c67fba74a76338 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -52,7 +52,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;

-               ADD_FATAL(MOD_REWRITE_ERROR);
+               addFatalMessage(MOD_REWRITE_ERROR);

        } // END - if
 
        // SQL commands to run
        } // END - if
 
        // SQL commands to run


@@ -69,7 +69,7 @@ case "activate": // Do stuff when admin activates this extension
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')) {
                SQL_QUERY("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
                $EXT_REPORTS_FAILURE = true;
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')) {
                SQL_QUERY("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
                $EXT_REPORTS_FAILURE = true;

-               ADD_FATAL(MOD_REWRITE_ERROR);
+               addFatalMessage(MOD_REWRITE_ERROR);

         } // END - if
 
        // SQL commands to run
         } // END - if
 
        // SQL commands to run


@@ -148,7 +148,7 @@ case "update": // Update an extension
                // Check if mod_rewrite is loadeded
                if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                        $EXT_REPORTS_FAILURE = true;
                // Check if mod_rewrite is loadeded
                if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                        $EXT_REPORTS_FAILURE = true;

-                       //ADD_FATAL(MOD_REWRITE_ERROR);
+                       //addFatalMessage(MOD_REWRITE_ERROR);

                } // END - if
                $UPDATE_NOTES = "Es wird beim Registrieren und aktivieren geprüft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.";
                break;
                } // END - if
                $UPDATE_NOTES = "Es wird beim Registrieren und aktivieren geprüft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.";
                break;


@@ -163,7 +163,7 @@ default: // Do stuff when extension is loaded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;
                SQL_QUERY("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;
                SQL_QUERY("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);

-               if (!IS_ADMIN())ADD_FATAL(MOD_REWRITE_ERROR);
+               if (!IS_ADMIN())addFatalMessage(MOD_REWRITE_ERROR);

         } // END - if
        break;
 }
         } // END - if
        break;
 }

diff --git a/inc/fatal_errors.php b/inc/fatal_errors.php
index 96a7d8539eb39de32922d865aa1654d63bf4feac..a3a476ca543d5afcbe8069890861785aac2094c4 100644 (file)
--- a/inc/fatal_errors.php
+++ b/inc/fatal_errors.php
@@ -37,8 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
        require($INC);
 }
 

-if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
-{
+if (getTotalFatalErrors() > 0) {

        // Main div container
        LOAD_TEMPLATE("fatal_header");
 
        // Main div container
        LOAD_TEMPLATE("fatal_header");
 


@@ -77,12 +76,14 @@ if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
                // Load main template
                mxchange_die(LOAD_TEMPLATE("runtime_fatal_table", true, $OUT));
        }
                // Load main template
                mxchange_die(LOAD_TEMPLATE("runtime_fatal_table", true, $OUT));
        }

+
+       // Message to regular users (non-admin)

        $CORR = FATAL_REPORT_ERRORS;
 
        // PHP warnings fixed
        if ($check == "done") {
                if (IS_ADMIN()) $CORR = FATAL_CORRECT_ERRORS;
        $CORR = FATAL_REPORT_ERRORS;
 
        // PHP warnings fixed
        if ($check == "done") {
                if (IS_ADMIN()) $CORR = FATAL_CORRECT_ERRORS;

-       }
+       } // END - if

 
        // Load footer template
        LOAD_TEMPLATE("fatal_footer", false, $CORR);
 
        // Load footer template
        LOAD_TEMPLATE("fatal_footer", false, $CORR);

diff --git a/inc/filters.php b/inc/filters.php
index 9c4c86230dc15a3fdcd122434ab375de1e29059e..bd4fd26d0644170312c57881c7ef8a282ec50535 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -44,7 +44,7 @@ function INIT_FILTER_SYSTEM () {
        // Is the filter already initialized?
        if ((isset($filters)) && (is_array($filters))) {
                // Then abort here
        // Is the filter already initialized?
        if ((isset($filters)) && (is_array($filters))) {
                // Then abort here

-               ADD_FATAL(FILTER_FAILED_ALREADY_INIT);
+               addFatalMessage(FILTER_FAILED_ALREADY_INIT);

                return false;
        } // END - if
 
                return false;
        } // END - if
 


@@ -143,7 +143,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        if ((isset($filters[$filterName][$filterFunction])) && (!$force)) {
                // Then abort here
                if (!$silentAbort) {
        if ((isset($filters[$filterName][$filterFunction])) && (!$force)) {
                // Then abort here
                if (!$silentAbort) {

-                       ADD_FATAL(sprintf(FILTER_FAILED_ALREADY_ADDED, $filterFunction, $filterName));
+                       addFatalMessage(sprintf(FILTER_FAILED_ALREADY_ADDED, $filterFunction, $filterName));

                } // END - if
 
                // Abort here
                } // END - if
 
                // Abort here


@@ -153,7 +153,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        // Is the function there?
        if (!function_exists($filterFunction)) {
                // Then abort here
        // Is the function there?
        if (!function_exists($filterFunction)) {
                // Then abort here

-               ADD_FATAL(sprintf(FILTER_FAILED_NOT_FOUND, $filterFunction, $filterName));
+               addFatalMessage(sprintf(FILTER_FAILED_NOT_FOUND, $filterFunction, $filterName));

                return false;
        } // END - if
 
                return false;
        } // END - if
 


@@ -177,7 +177,7 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
        // Is that filter there?
        if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) {
                // Not found, so abort here
        // Is that filter there?
        if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) {
                // Not found, so abort here

-               ADD_FATAL(sprintf(FILTER_FAILED_NOT_REMOVED, $filterFunction, $filterName));
+               addFatalMessage(sprintf(FILTER_FAILED_NOT_REMOVED, $filterFunction, $filterName));

                return false;
        } // END - if
 
                return false;
        } // END - if
 


@@ -198,7 +198,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
                // Then abort here (quick'N'dirty hack)
                if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
                        // Add fatal message
                // Then abort here (quick'N'dirty hack)
                if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
                        // Add fatal message

-                       ADD_FATAL(sprintf(FILTER_FAILED_NO_FILTER_FOUND, $filterName));
+                       addFatalMessage(sprintf(FILTER_FAILED_NO_FILTER_FOUND, $filterName));

                } // END - if
 
                // Abort here
                } // END - if
 
                // Abort here


@@ -250,7 +250,7 @@ function FILTER_FLUSH_FILTERS () {
        // Is a database link here and not in installation mode?
        if ((!is_resource($link)) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
                // Abort here
        // Is a database link here and not in installation mode?
        if ((!is_resource($link)) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
                // Abort here

-               ADD_FATAL(sprintf(FILTER_FLUSH_FAILED_NO_DATABASE, $filterFunction, $filterName));
+               addFatalMessage(sprintf(FILTER_FLUSH_FAILED_NO_DATABASE, $filterFunction, $filterName));

                return false;
        } // END - if
 
                return false;
        } // END - if
 

diff --git a/inc/footer.php b/inc/footer.php
index 5e248a609b532bdbb83a79ea761e366808e12362..9a7b05ffd9cf30f4762cb641013d379bbab64638 100644 (file)
--- a/inc/footer.php
+++ b/inc/footer.php
@@ -45,7 +45,7 @@ if (!isset($footer)) $footer = 0;
 
 if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
        // Output the generated HTML code or do nothing in direct-mode
 
 if (($footer != "1") && ($footer != "2") && ($CSS != "1")) {
        // Output the generated HTML code or do nothing in direct-mode

-       if (!empty($FATAL[0])) {
+       if (getTotalFatalMessages() > 0) {

                // Output fatal error messages
                require_once(PATH."inc/fatal_errors.php");
        } // END - if
                // Output fatal error messages
                require_once(PATH."inc/fatal_errors.php");
        } // END - if

diff --git a/inc/functions.php b/inc/functions.php
index 049a0c58178fb5061742363a671ba4b3a9ae1c54..0562cceee69afa2bb287f694d6b68315ed3cbc1f 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -222,7 +222,7 @@ function OUTPUT_RAW ($HTML) {
 }
 
 // Add a fatal error message to the queue array
 }
 
 // Add a fatal error message to the queue array

-function ADD_FATAL ($message, $extra="") {
+function addFatalMessage ($message, $extra="") {

        global $FATAL;
 
        if (empty($extra)) {
        global $FATAL;
 
        if (empty($extra)) {


@@ -238,8 +238,25 @@ function ADD_FATAL ($message, $extra="") {
        DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}");
 }
 
        DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}");
 }
 

+// Getter for total fatal message count
+function getTotalFatalMessages () {
+       global $FATAL;
+
+       // Init coun
+       $count = 0;
+
+       // Do we have at least the first entry?
+       if (!empty($FATAL[0])) {
+               // Get total count
+               $count = count($FATAL);
+       } // END - if
+
+       // Return value
+       return $count;
+}
+

 // Load a template file and return it's content (only it's name; do not use ' or ")
 // Load a template file and return it's content (only it's name; do not use ' or ")

-function LOAD_TEMPLATE($template, $return=false, $content=array()) {
+function LOAD_TEMPLATE ($template, $return=false, $content=array()) {

        // Add more variables which you want to use in your template files
        global $DATA, $_CONFIG, $username;
 
        // Add more variables which you want to use in your template files
        global $DATA, $_CONFIG, $username;
 

diff --git a/inc/header.php b/inc/header.php
index b510202cc6834f0c3e255cf16d49faedcbe31a9a..40a3a80863329727550f8a8dc56402082baa9a66 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -92,7 +92,7 @@ if (($header != "1") && ($header != "2")) {
                                define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
 
                                // Do not add the fatal message in installation mode
                                define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
 
                                // Do not add the fatal message in installation mode

-                               if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
+                               if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(NO_CONFIG_FOUND);

                        }
                } // END - if
 
                        }
                } // END - if
 

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 0ff9df89976b9622efd1dc1f383e5d52cd463eae..1b9ecb61af12783a006787fc589f3350f5034292 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -164,7 +164,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                if (empty($mysql['login']))  $mysql['login']  = "your_login";
                if (empty($mysql['host']))   $mysql['host']   = "localhost";
                if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
                if (empty($mysql['login']))  $mysql['login']  = "your_login";
                if (empty($mysql['host']))   $mysql['host']   = "localhost";
                if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";

-               if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
+               if (getTotalFatalErrors() > 0) {

                        OUTPUT_HTML("<SPAN class=\"install_fatal\">");
                        foreach ($FATAL as $key => $err) {
                                OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");
                        OUTPUT_HTML("<SPAN class=\"install_fatal\">");
                        foreach ($FATAL as $key => $err) {
                                OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");


@@ -333,7 +333,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
        case "finalize": // Write captured data to files
                if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) {
                        // You have submitted data then we have to reset the fatal messages
        case "finalize": // Write captured data to files
                if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) {
                        // You have submitted data then we have to reset the fatal messages

-                       $FATAL = array(); $SQLs = array();
+                       $SQLs = array();

 
                        // Connect to MySQL server
                        $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
 
                        // Connect to MySQL server
                        $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);


@@ -359,7 +359,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                // Are some SQLs found?
                                                if (count($SQLs) == 0) {
                                                        // Abort here
                                                // Are some SQLs found?
                                                if (count($SQLs) == 0) {
                                                        // Abort here

-                                                       ADD_FATAL(INSTALL_SQL_IMPORT_FAILED);
+                                                       addFatalMessage(INSTALL_SQL_IMPORT_FAILED);

                                                        return;
                                                } // END - if
 
                                                        return;
                                                } // END - if
 


@@ -396,12 +396,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                                                install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
                                        } else {
                                                // Installation area not found!
                                                install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
                                        } else {
                                                // Installation area not found!

-                                               ADD_FATAL(INSTALL_MISSING_DUMPS);
+                                               addFatalMessage(INSTALL_MISSING_DUMPS);

                                        }
                                } // END - if
                        } // END - if
 
                                        }
                                } // END - if
                        } // END - if
 

-                       if ((sizeof($FATAL) > 0) || ((isset($FATAL[0])) && ($FATAL[0] != ''))) {
+                       if (getTotalFatalErrors() > 0) {

                                $OUT = "";
                                foreach ($FATAL as $value) {
                                        $OUT .= "    <LI>".$value."</LI>\n";
                                $OUT = "";
                                foreach ($FATAL as $value) {
                                        $OUT .= "    <LI>".$value."</LI>\n";


@@ -455,7 +455,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                        LOAD_TEMPLATE("install_finished");
                } else {
                        // Something goes wrong during installation! :-(
                        LOAD_TEMPLATE("install_finished");
                } else {
                        // Something goes wrong during installation! :-(

-                       ADD_FATAL(INSTALL_FINALIZER_FAILED);
+                       addFatalMessage(INSTALL_FINALIZER_FAILED);

                        include ("inc/fatal_errors.php");
                }
                break;
                        include ("inc/fatal_errors.php");
                }
                break;


@@ -466,7 +466,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
                break;
        }
 } else {
                break;
        }
 } else {

-       ADD_FATAL(ALREADY_INSTALLED);
+       addFatalMessage(ALREADY_INSTALLED);

 }
 //
 ?>
 }
 //
 ?>

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 671853299bc8388f083e649fddd4bc08be2b7fea..bb5db58000437a062c22366339b8590ab85638f6 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -112,7 +112,7 @@ class CacheSystem {
                        $this->storeExtensionVersion("cache");
                } else {
                        // Cannot create file
                        $this->storeExtensionVersion("cache");
                } else {
                        // Cannot create file

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);

                }
        }
 
                }
        }
 


@@ -142,7 +142,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot create file
                        }
                } else {
                        // Cannot create file

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);

                }
        }
 
                }
        }
 


@@ -205,7 +205,7 @@ class CacheSystem {
                        }
                } else {
                        // Cache file not found or not readable
                        }
                } else {
                        // Cache file not found or not readable

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->inc.CACHE_CANNOT_LOAD_2);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->inc.CACHE_CANNOT_LOAD_2);

                }
        }
 
                }
        }
 


@@ -228,7 +228,7 @@ class CacheSystem {
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!

-                               ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);
+                               addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);

                        }
                } // END - if
        }
                        }
                } // END - if
        }


@@ -259,7 +259,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot write to cache!
                        }
                } else {
                        // Cannot write to cache!

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);

                }
        }
 
                }
        }
 


@@ -283,7 +283,7 @@ class CacheSystem {
                        } // END - foreach
                } else {
                        // Cannot write array!
                        } // END - foreach
                } else {
                        // Cannot write array!

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);

                }
        }
 
                }
        }
 


@@ -320,7 +320,7 @@ class CacheSystem {
                        } // END - if
                } else {
                        // Cannot write to cache!
                        } // END - if
                } else {
                        // Cannot write to cache!

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);

                }
        }
 
                }
        }
 


@@ -338,7 +338,7 @@ class CacheSystem {
                        //* DEBUG: */ print __METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />\n";
                } else {
                        // Cannot create file
                        //* DEBUG: */ print __METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />\n";
                } else {
                        // Cannot create file

-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);

                }
        }
 
                }
        }
 

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 5b5589359bb578d872be26063f7e714b8442d234..02b5132855095765d3d3774993e246b41ca2c5ee 100644 (file)
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -59,10 +59,6 @@ function secureString ($str, $strip=true) {
 // Run only once this security check/exchange
 if (defined('__SECURITY')) return;
 
 // Run only once this security check/exchange
 if (defined('__SECURITY')) return;
 

-// Fatal messages goes here
-global $FATAL;
-$FATAL = array();
-

 // Runtime/GPC quoting is off now...
 @set_magic_quotes_runtime(false);
 @ini_set('magic_quotes_gpc', false); // This may not work on some systems
 // Runtime/GPC quoting is off now...
 @set_magic_quotes_runtime(false);
 @ini_set('magic_quotes_gpc', false); // This may not work on some systems

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 434ce4f15c55cb459335868f7e3da2b6e63ce063..31cd556dad86d66bc612700a326ae6912c2677d8 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -253,7 +253,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
        } else {
                // Log invalid request
                DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");
        } else {
                // Log invalid request
                DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");

-               ADD_FATAL(sprintf("Invalid member action! action=%s,id=%s,function=%s", $formData['action'], $formData['id'], $functionName));
+               addFatalMessage(sprintf("Invalid member action! action=%s,id=%s,function=%s", $formData['action'], $formData['id'], $functionName));

        }
 
        // Return status
        }
 
        // Return status


@@ -413,7 +413,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
                } // END - if
        } else {
                // Not found!
                } // END - if
        } else {
                // Not found!

-               ADD_FATAL(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName));
+               addFatalMessage(sprintf(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName));

        }
 
        // Return status
        }
 
        // Return status


@@ -653,7 +653,7 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
        if (defined($constantName)) {
                $subject = constant($constantName);
        } else {
        if (defined($constantName)) {
                $subject = constant($constantName);
        } else {

-               ADD_FATAL(ADMIN_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
+               addFatalMessage(ADMIN_SURFBAR_NOTIFY_SUBJECT_404, $constantName);

        }
 
        // Translate some data if present
        }
 
        // Translate some data if present


@@ -689,7 +689,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
        if (defined($constantName)) {
                $subject = constant($constantName);
        } else {
        if (defined($constantName)) {
                $subject = constant($constantName);
        } else {

-               ADD_FATAL(MEMBER_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
+               addFatalMessage(MEMBER_SURFBAR_NOTIFY_SUBJECT_404, $constantName);

        }
 
        // Translate some data if present
        }
 
        // Translate some data if present

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 719533118c282da673b8d8cd738f95bbb0ad7623..9bb05dc9ec0814cf6ddd19103a2d8452f32abc84 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -332,7 +332,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
 
                // Add fatal message
                OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
 
                // Add fatal message

-               ADD_FATAL(CANNOT_UNREG_SESS);
+               addFatalMessage(CANNOT_UNREG_SESS);

        }
 } else {
        // Maybe an Admin want's to login?
        }
 } else {
        // Maybe an Admin want's to login?


@@ -369,13 +369,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();

-               ADD_FATAL(ADMIN_NOT_FOUND);
+               addFatalMessage(ADMIN_NOT_FOUND);

                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();

-               ADD_FATAL(WRONG_PASS);
+               addFatalMessage(WRONG_PASS);

                break;
 
        default: // Others will be logged
                break;
 
        default: // Others will be logged

diff --git a/inc/modules/admin/action- b/inc/modules/admin/action-
index b376444c6890eb72e1e6e615d25832bffcf86bf0..df0c9bf5a7ba3c923b0e09521735312e61f5fb4f 100644 (file)
--- a/inc/modules/admin/action-
+++ b/inc/modules/admin/action-
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-admins.php b/inc/modules/admin/action-admins.php
index 57e0b82c7918e255689cc61e5da64e9568656f82..37a2dbe46caa1f107ec65741ac88c315d74e6886 100644 (file)
--- a/inc/modules/admin/action-admins.php
+++ b/inc/modules/admin/action-admins.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-bank.php b/inc/modules/admin/action-bank.php
index fd7f3e0325d00223625268c22b19c13dbab8d4bd..cef20946e473d62fdc629c3322333b78e5cc3e4f 100644 (file)
--- a/inc/modules/admin/action-bank.php
+++ b/inc/modules/admin/action-bank.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-country.php b/inc/modules/admin/action-country.php
index 4736252208de367343f8e2977d127ac70de3adc6..6c50163bf8f143fd44e455fd60f1d00330121704 100644 (file)
--- a/inc/modules/admin/action-country.php
+++ b/inc/modules/admin/action-country.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-doubler.php b/inc/modules/admin/action-doubler.php
index baa342f6129da0965e05a2e4e13ddffa87d4cc5d..85af60e46015bc8917bea52062bf64d243e7e6d5 100644 (file)
--- a/inc/modules/admin/action-doubler.php
+++ b/inc/modules/admin/action-doubler.php
@@ -47,7 +47,7 @@ if (FILE_READABLE($INC)) {
        include($INC);
 } else {
        // "what file" not found
        include($INC);
 } else {
        // "what file" not found

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-email.php b/inc/modules/admin/action-email.php
index 806fc69daf85e1552c0f66265e9640152717c31e..e14a825f3240f732e49ac5b7826628469b4887e3 100644 (file)
--- a/inc/modules/admin/action-email.php
+++ b/inc/modules/admin/action-email.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-holiday.php b/inc/modules/admin/action-holiday.php
index 79247485a31ff8b2d1a769e4b41fa6f57ce6e7ee..184d74005d882b86aea704bf2b5dac65d2af5875 100644 (file)
--- a/inc/modules/admin/action-holiday.php
+++ b/inc/modules/admin/action-holiday.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-login.php b/inc/modules/admin/action-login.php
index 5e51c7f267be84507c34f9442dbe693b5c060d1e..ff9a9ec376717da7e1ce9586510c2484cc9cb2b0 100644 (file)
--- a/inc/modules/admin/action-login.php
+++ b/inc/modules/admin/action-login.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-menu.php b/inc/modules/admin/action-menu.php
index 2643a16251ec3c1da1fe396b2f3fdef0471e411a..c327a28d3b3a873650f0ddd92acfa632838c0ff8 100644 (file)
--- a/inc/modules/admin/action-menu.php
+++ b/inc/modules/admin/action-menu.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-misc.php b/inc/modules/admin/action-misc.php
index 0f33b8e6770ea94ccb45b157d32668f1d1bb8ac7..b4aa437f93d45f421cf331c7eb2aa17353a6493b 100644 (file)
--- a/inc/modules/admin/action-misc.php
+++ b/inc/modules/admin/action-misc.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-mods.php b/inc/modules/admin/action-mods.php
index e286fcab47614894b7dab3bd5d95a70a73efee49..fe175182451c0fe6e0dbf46ff9a56b8779440214 100644 (file)
--- a/inc/modules/admin/action-mods.php
+++ b/inc/modules/admin/action-mods.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-newsletter.php b/inc/modules/admin/action-newsletter.php
index 4114603ea45b4a10285e26ce26d048a04ff3dc14..27a2b8b4f97e0c1b36ebf83703038696c2a1ad25 100644 (file)
--- a/inc/modules/admin/action-newsletter.php
+++ b/inc/modules/admin/action-newsletter.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-payouts.php b/inc/modules/admin/action-payouts.php
index 8a44bf64507bba850736aa822e607107f9f5f471..8431860fe7d203e6e239adacce6ca89b18c3cdc2 100644 (file)
--- a/inc/modules/admin/action-payouts.php
+++ b/inc/modules/admin/action-payouts.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-primera.php b/inc/modules/admin/action-primera.php
index cc6d11dfa251601d33de9ff964a9e5e7c0600488..7f4fa85b577e165eb0fdef013d5792b6d51899da 100644 (file)
--- a/inc/modules/admin/action-primera.php
+++ b/inc/modules/admin/action-primera.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-rallye.php b/inc/modules/admin/action-rallye.php
index 7534627533a25733dc5951ad997fed759ac1f9ca..c1b230cd9079496386cb75b1f90ad603bcce6c1c 100644 (file)
--- a/inc/modules/admin/action-rallye.php
+++ b/inc/modules/admin/action-rallye.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-repair.php b/inc/modules/admin/action-repair.php
index 6073f068df867850284b77cdca64525ed51601a9..c6565fd0ede5b58655f3fb5ee19dce64e16cb911 100644 (file)
--- a/inc/modules/admin/action-repair.php
+++ b/inc/modules/admin/action-repair.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-setup.php b/inc/modules/admin/action-setup.php
index 4cf61595b5a6582cac357b180ac0ba5def779068..048bee24ef784c2c1258dde5ba6649e2b08b5e68 100644 (file)
--- a/inc/modules/admin/action-setup.php
+++ b/inc/modules/admin/action-setup.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-sponsor.php b/inc/modules/admin/action-sponsor.php
index 7effb6fb076b0c92f4d920f0382f8b76b1f4635f..f840cf94f4a9da7f580dee883fc458c4f3fee96b 100644 (file)
--- a/inc/modules/admin/action-sponsor.php
+++ b/inc/modules/admin/action-sponsor.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 //
 ?>
 }
 //
 ?>

diff --git a/inc/modules/admin/action-stats.php b/inc/modules/admin/action-stats.php
index add4def3f209586a4713c16d9e3c31375884204b..6926bd275525c73fbeafa0296cb7d535f5806e44 100644 (file)
--- a/inc/modules/admin/action-stats.php
+++ b/inc/modules/admin/action-stats.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-surfbar.php b/inc/modules/admin/action-surfbar.php
index 2a69435104eb23d63bbdf2a89dfe7792fbfeedef..da666b587a76bbe1eab4e477f383efbeb8c4115e 100644 (file)
--- a/inc/modules/admin/action-surfbar.php
+++ b/inc/modules/admin/action-surfbar.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php
index 9f28d4622f88f7f28788c017183af7f31ea2f563..f143558e1f4bf69df4ba3a6be69bf06a56cc8727 100644 (file)
--- a/inc/modules/admin/action-task.php
+++ b/inc/modules/admin/action-task.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "task");

        return;
 }
 
        return;
 }
 


@@ -49,7 +49,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-theme.php b/inc/modules/admin/action-theme.php
index dbf518f62b9f7c0c24e6197ec9d6e321cd016f0f..b832d39e2a70ac34cdf2b67bc625ff22110c1870 100644 (file)
--- a/inc/modules/admin/action-theme.php
+++ b/inc/modules/admin/action-theme.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-transfer.php b/inc/modules/admin/action-transfer.php
index 692128a1dd3c2faf556ca357d056c7d941496b2a..08a6d3e150fdf1e3ceace9423002e8b350d4fbaf 100644 (file)
--- a/inc/modules/admin/action-transfer.php
+++ b/inc/modules/admin/action-transfer.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-user.php b/inc/modules/admin/action-user.php
index ba5a009c393fc3a06990754162fa282765d3bbfa..3971d4304db4f04a4859ea24739106a656e1ae21 100644 (file)
--- a/inc/modules/admin/action-user.php
+++ b/inc/modules/admin/action-user.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/action-wernis.php b/inc/modules/admin/action-wernis.php
index 65a75c8b6863968cbda210ed90ea6d1ce5280f03..c38971934b7010a978dca9a3e6f2180d66bcf676 100644 (file)
--- a/inc/modules/admin/action-wernis.php
+++ b/inc/modules/admin/action-wernis.php
@@ -46,7 +46,7 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the admin action module
        include($INC);
 } else {
        // Ok, we finally load the admin action module
        include($INC);
 } else {

-       ADD_FATAL(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);
+       addFatalMessage(ADMIN_404_ACTION_1.$GLOBALS['what'].ADMIN_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index af97f703787b6a680cfb38465ab76a37c67b3b8b..fe98128a1ecfdf694383b0bd41b77988cf1888c2 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -356,16 +356,16 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);
                } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);

-                       ADD_FATAL(ADMIN_ACCESS_DENIED);
+                       addFatalMessage(ADMIN_ACCESS_DENIED);

                } else {
                        // Include file not found! :-(
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
                } else {
                        // Include file not found! :-(
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);

-                       ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+                       addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);

                }
        } else {
                // Invalid action/what pair found!
                LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION);
                }
        } else {
                // Invalid action/what pair found!
                LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION);

-               ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+               addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);

        }
 
        // Free memory
        }
 
        // Free memory

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 3b6d1266a0ff77a7c5c82c3d7ab54998d85e2755..9b79974df7e2c4f4b61fbb3a082818f84b21906b 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("other")) || (GET_EXT_VERSION("other") == "")) {
        // Missing extension!
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("other")) || (GET_EXT_VERSION("other") == "")) {
        // Missing extension!

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "other"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "other"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index b50caf3a30613f846c9247dddb6f159b501e8c9a..f196a2838c0c4dc4c1da2ee55feb62e2ba141f04 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("yoomedia")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("yoomedia")) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php
index 7212e1ecee27ede55e33fde086ca2a6499446925..3aa851bf1aa3a5adb3fcc4f5a414eb32e01e72a7 100644 (file)
--- a/inc/modules/admin/what-del_task.php
+++ b/inc/modules/admin/what-del_task.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "task");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 18848922d90c9bc32a64f4bc639ae786b32ca2a9..2b81e0620a7fbb8409af34523e3e29af2de8d7f5 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("mailid")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("mailid")) {

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index b9a66f3e4b853c7f63ba90329b3ddd1acf2197b0..8370a1c19d485e0d6655b7977b6a2d15f1c8aeaa 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "task");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 86bf30742befc4f04b25fa159dbd4629d5acab05..a6bdba6c3830f2a97d23ad3ed4d8620bae7dd2d6 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("mailid")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("mailid")) {

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 95e3d7172b53cc34a0f374fcf2ecb6f77e28eb1a..9b15ec8843d635207014b31c10635ffd7e515395 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
        // Missing extension!
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
        // Missing extension!

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 1e9e49e3171af20d05985c867d1a5032a5174db4..67c9db27b6f8b70796966d5bb1850362c1eb92a1 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -35,10 +35,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("yoomedia")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("yoomedia")) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "yoomedia");

        return;
 } elseif (!EXT_IS_ACTIVE("bonus")) {
        return;
 } elseif (!EXT_IS_ACTIVE("bonus")) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 965ac2be33a9fe8fc706ab6271b7aed8b08f52ab..83e1660d255c88f8a0b98f6f407330ade4fa5a39 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -61,7 +61,7 @@ if ($GLOBALS['action'] == "login") {
 // Are there jobs to be done?
 if ($JOBS_DONE) {
        // Generate overview of all main menus
 // Are there jobs to be done?
 if ($JOBS_DONE) {
        // Generate overview of all main menus

-       global $menuDesription, $FATAL;
+       global $menuDesription;

        if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) {
                $OUT = "";
                foreach ($menuDesription as $key => $value)
        if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) {
                $OUT = "";
                foreach ($menuDesription as $key => $value)

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index 0d4a1f6058e16173ed5cbeceaf7e5fc117946aef..583d7eb15ed78d729dbbfd1367bd41c2144f38c6 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("order")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("order")) {

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "order"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "order"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index f69e0a4da27d7f2e617da0c6ae4f93eb35c69cd0..ef64b514125890f7c0043e4dd49a124d9dcb5ece 100644 (file)
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 1df771d2cf23af205d636907cdb0e6ebd9d81c72..871e94ac4239c64cd73aaac178cb87c7cbeb2ceb 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("theme")) {

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "theme"));

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/action- b/inc/modules/guest/action-
index 6b8b39bc5d5d2dc578b50406f0407c87e61d42b1..a1eb5eb9e4e5480769298ec5bed094bf13521a57 100644 (file)
--- a/inc/modules/guest/action-
+++ b/inc/modules/guest/action-
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "");

        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected


@@ -52,9 +52,9 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {

-       ADD_FATAL(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 } else {
 } else {

-       ADD_FATAL(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index efbbf18c97424a6f79e6682061891dff5684ab61..5d3416a663a1b3f7c7f6bf06abf0e66bfaf0ab09 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -46,9 +46,9 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {

-       ADD_FATAL(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 } else {
 } else {

-       ADD_FATAL(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 94592b2f4f248681bd3211c89b17009b04a75770..87d77a9846cd66425669643fd42e62ed458730fb 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -51,9 +51,9 @@ if ((FILE_READABLE($INC)) && ($IS_VALID)) {
        // Ok, we finally load the guest action module
        require_once($INC);
 } elseif ($IS_VALID) {
        // Ok, we finally load the guest action module
        require_once($INC);
 } elseif ($IS_VALID) {

-       ADD_FATAL(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 } else {
 } else {

-       ADD_FATAL(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index 78362718dc619e2953b5c3e79b279be5daed39ea..c24c213ab93f9ed0a52954719f5caa2a3bd63417 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -49,9 +49,9 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {

-       ADD_FATAL(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 } else {
 } else {

-       ADD_FATAL(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index df18e405970a269791e87dbef04ebba93fe0515e..323eea8bf1aa0bdefc053dcc51996c20a902cbee 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -35,7 +35,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");

        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected


@@ -51,9 +51,9 @@ if (FILE_READABLE($INC)) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {
        // Ok, we finally load the guest action module
        include($INC);
 } elseif ($IS_VALID) {

-       ADD_FATAL(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_404_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 } else {
 } else {

-       ADD_FATAL(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));
+       addFatalMessage(sprintf(getMessage('GUEST_LOCKED_ACTION'), SQL_ESCAPE($GLOBALS['what'])));

 }
 
 //
 }
 
 //

diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php
index 8bbac22d4670fc25baf0019ff46c75f88da05ea0..810f1ab52b197b5962183b9e2b8cfd5601f724a4 100644 (file)
--- a/inc/modules/guest/action-themes.php
+++ b/inc/modules/guest/action-themes.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index ba45f0cc7a246c018b85d23bf39fe8447d77d9e6..724810e1dbbb981ea2f3e436f89566e8e0e586e5 100644 (file)
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("active")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("active")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "active");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "active");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php
index 88b8d4695eeb576ebc227b05e8ca4d295a8705cf..d61d0d067122c8d156bc5a5e91e4d31567e4a354 100644 (file)
--- a/inc/modules/guest/what-beg.php
+++ b/inc/modules/guest/what-beg.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index b50ddca2a7a8932bb007b39497c49b697a2059d3..71cfbdd73ea4810ff7c7849f3ef08e0d0b737759 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 6b108994f6918487ef27986af1ab8e2de9ecd362..23d2f9df8b82fdebf3fd022d2562e034b499fe2e 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "user");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "user");

        return;
 }
 
        return;
 }
 


@@ -162,8 +162,7 @@ if (EXT_IS_ACTIVE("nickname")) {
 // Was an URL constructed?
 if (!empty($URL)) {
        // URL was constructed
 // Was an URL constructed?
 if (!empty($URL)) {
        // URL was constructed

-       global $FATAL;
-       if (!empty($FATAL[0])) {
+       if (getTotalFatalErrorMessages()) {

                // Fatal errors!
                require_once(PATH."inc/fatal_errors.php");
        } else {
                // Fatal errors!
                require_once(PATH."inc/fatal_errors.php");
        } else {

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index e2f2fabaf73061e60211e1199fe7d83d6f04b696..0d0b12a4dd69515917aa2b9dde66c33b31801d95 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("mediadata")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("mediadata")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "mediadata");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "mediadata");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index edf07850d46d9a64358e7b17f121ae1049b238ce..fc616fb5acbeb9c38e68094c0390e0a1c9fa71fa 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index b7f3948965e48d6e6833a17299ef113ba4950193..f17a36cb826b60950ad7be1251b1e4b03ad1c404 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -37,9 +37,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("register"))) {
        if (IS_ADMIN()) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("register"))) {
        if (IS_ADMIN()) {

-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "register"));

        } else {
        } else {

-               ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "register");
+               addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "register");

        }
        return;
 }
        }
        return;
 }

diff --git a/inc/modules/guest/what-sponsor_agb.php b/inc/modules/guest/what-sponsor_agb.php
index ec291ec77abe97d8f5821def9947bec6321c779c..6697f1ee9a985df38689a9a8e36d55e01287aec0 100644 (file)
--- a/inc/modules/guest/what-sponsor_agb.php
+++ b/inc/modules/guest/what-sponsor_agb.php
@@ -36,9 +36,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {

-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));

        } else {
        } else {

-               ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+               addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");

        }
        return;
 }
        }
        return;
 }

diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index 39cf47fe7ea9c0158da1e5ddaee4a35bfccea267..f172a5abfc502c1950bc1a4300f0004602f7bdac 100644 (file)
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -36,9 +36,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {

-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));

        } else {
        } else {

-               ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+               addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");

        }
        return;
 }
        }
        return;
 }

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 2f7ed2aebda320035273e145e3660f673f424dd0..c175a55b8b59b477fbb426993662d2b94635b12c 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -36,9 +36,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {

-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));

        } else {
        } else {

-               ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+               addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");

        }
        return;
 }
        }
        return;
 }

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 7060952e9d3e3b83ec031c873712d41ee5ad4fac..cb67895a30157393c094c35beb8c9adbac6eef4b 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -36,9 +36,9 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))) {
        if (IS_ADMIN()) {

-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "sponsor"));

        } else {
        } else {

-               ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+               addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");

        }
        return;
 }
        }
        return;
 }

diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php
index 5259cdf1e69109230425753caf4aa78e3326de73..56c36548f701c0b2586e544314f5c5ecb660b6c8 100644 (file)
--- a/inc/modules/guest/what-top10.php
+++ b/inc/modules/guest/what-top10.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("top10")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("top10")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "top10");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "top10");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php
index fa37e336630a31661b7677892b9da2b82ac0957f..eb6491c642e0468b9dd653566a27c8ae28c20e57 100644 (file)
--- a/inc/modules/guest/what-wernis_portal.php
+++ b/inc/modules/guest/what-wernis_portal.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/action- b/inc/modules/member/action-
index 9f305f19f2f36d7a18c8d883d5d06252203a75a0..fdb3590d3447f9fae5983e5cc858bab739fbbbf4 100644 (file)
--- a/inc/modules/member/action-
+++ b/inc/modules/member/action-
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_LOGGED_IN()) {
        LOAD_URL(URL."/modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {
 } elseif (!IS_LOGGED_IN()) {
        LOAD_URL(URL."/modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "");

        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected


@@ -54,7 +54,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php
index 91e746e0961879e7eb4d6438e50648dff1e005f5..8f169ece400f85e0256114fa2c9f9aa5019dc1d2 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index d334432548d6bbf323173bb55c534ce780955ecd..b3fd7f4e0ca945031cbfd6de0968662b9ebd2511 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");

        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected


@@ -54,7 +54,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 89cdbb859c4ac591976649f5f9d1d7ed17d6cc68..0badee216ad7c943884335b060be47a3f883d75b 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index 8c2867af95a4465887cfb56133fceb051a6df95c..74945d10ee16cd1b6996a266dcb1c269412dd5d0 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index 24359aa6fd70b4ce50aa7fc9d74dc22b235b63e8..e280b75340b9a9ead4f23345cd2854fb94dd99f0 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index b546a774dad7722ec27e916df2bffd6160ae6ca5..6c327f2568a7775ee91377aeb37cae1f84c6b89f 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");

        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected


@@ -54,7 +54,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index 07465dfbde6b5c5bb6a1b70b9b16d203b24cbb71..b562617d6ed5749a491615dca62f8cf05166c954 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index a60ad4ba0cf320c9e8b640077a581b66493af94d..bd22b44803fed60dff75a7f63377115c8e12f995 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -51,7 +51,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index 163bd496f85204e46a6c61d10a67d9a84e711f4f..4cfdee58118e763976c6a29e40d291f9930065b6 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");

        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected
        return;
 } elseif ($BLOCK_MODE) {
        // Block mode detected


@@ -54,7 +54,7 @@ if (FILE_READABLE($INC_WHAT)) {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {
        // Ok, we finally load the member action module
        include_once($INC_WHAT);
 } else {

-       ADD_FATAL(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);
+       addFatalMessage(MEMBER_404_ACTION_1.$GLOBALS['what'].MEMBER_404_ACTION_2);

 }
 
 //
 }
 
 //

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index c06b4d9b2193d1c7d9f1336f9654c43044e1e91a..9e39e3e1f8b44a4c91adb7d167d6494df2856a7b 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-bank_create.php b/inc/modules/member/what-bank_create.php
index fc9288fe53133ae48f7f4fec6452c1e9a4890c43..31bbf4c3c9ecb2d4f4e24f4295789712d9b1821e 100644 (file)
--- a/inc/modules/member/what-bank_create.php
+++ b/inc/modules/member/what-bank_create.php
@@ -36,7 +36,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");

        return;
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
        return;
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");

diff --git a/inc/modules/member/what-bank_deposit.php b/inc/modules/member/what-bank_deposit.php
index 7012c64f8208ce3c5f6fc5ee47cb10017c783076..1344403fa0714ef2d3f53a32081074525fb59fb7 100644 (file)
--- a/inc/modules/member/what-bank_deposit.php
+++ b/inc/modules/member/what-bank_deposit.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-bank_infos.php b/inc/modules/member/what-bank_infos.php
index c622b560df0312f09cfb724fb252e2bed616f1fb..d9915dffaff50414636f4d545ddc76b6db5de696 100644 (file)
--- a/inc/modules/member/what-bank_infos.php
+++ b/inc/modules/member/what-bank_infos.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-bank_output.php b/inc/modules/member/what-bank_output.php
index c622b560df0312f09cfb724fb252e2bed616f1fb..d9915dffaff50414636f4d545ddc76b6db5de696 100644 (file)
--- a/inc/modules/member/what-bank_output.php
+++ b/inc/modules/member/what-bank_output.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-bank_withdraw.php b/inc/modules/member/what-bank_withdraw.php
index c622b560df0312f09cfb724fb252e2bed616f1fb..d9915dffaff50414636f4d545ddc76b6db5de696 100644 (file)
--- a/inc/modules/member/what-bank_withdraw.php
+++ b/inc/modules/member/what-bank_withdraw.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bank");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php
index 3c52da348780ffd313ba80d635f568a5b28411f6..e9a2d6404b8a234815156f8acbc0fceeab6d2d58 100644 (file)
--- a/inc/modules/member/what-beg.php
+++ b/inc/modules/member/what-beg.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index dad135342079edd14865683a9a54f731fe14ae5b..116fd821d0722256917bc46af2789922e82c3d28 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 15861a7bcf301b29b4a1c5ccb6ee98c653c7a10d..13f45b08d5cb6492920077c0fea1bf13f4f69656 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index a57b9ea8fa20e322b76cbcb65658127833261ec0..b22a9f3bc9b5962a4e60eb709f433baf8cc98420 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 61446af679e7a32bdf6117b369ff6f03c04af12d..d9bf8ba0b22ffe68be6931ad9a0ccf2fb910ac5b 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index c961f043d4b7968f67ef748c9ba910913fa71827..c847867ca12239e5b35fa531f27de1e8b59dd2e0 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 7122e5e79a1cbe22ff4377bf079326a2bc7045d7..cdd6f8a8fbe2706b8cf6ba997383f9299d491896 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("mydata")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("mydata")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "mydata");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "mydata");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index d0897250351d3fb8d262413f4051edc7779f12ae..07baf13a77f66f389be91f55b851e730b5ea2fc6 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 794862a32fec37397ee918bca1303bf63a679a33..490ab2a768c4e73f083b935732e5c4452a92f37b 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "nickname");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "nickname");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index fec95d23c23e818f566d6fd99429afed5654e41f..eb5511c230cdb585a46e4f442aa38b57401b0c11 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 88dbcc90be60c6ae7328eda74ff0e62de9197d9f..a95a8777350ea991e01206103962da1875b5b8ab 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        // Not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("payout")) && (!IS_ADMIN())) {
        // Not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("payout")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "payout");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "payout");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index cdf9dcbd77bf0a704156e751dafa41fb10ff920f..465e377ca5bcf8dfd349ab158f435ba0c9eb7158 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -191,7 +191,7 @@ if (EXT_IS_ACTIVE("user")) {
        LOAD_TEMPLATE("member_points");
 } elseif (IS_ADMIN()) {
        // Missing extension
        LOAD_TEMPLATE("member_points");
 } elseif (IS_ADMIN()) {
        // Missing extension

-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));

 } else {
        // Message for user
        LOAD_TEMPLATE("admin_settings_saved", false, PROBLEM_POINTS_OVERVIEW_UNAVAILABLE);
 } else {
        // Message for user
        LOAD_TEMPLATE("admin_settings_saved", false, PROBLEM_POINTS_OVERVIEW_UNAVAILABLE);

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 5889898c2c52bfd6f7d1531fb777e45a54c7e244..7abf34c0769597a96ba316f1b534f4877e4cc571 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) {
        // Extension "primera" is not activated
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) {
        // Extension "primera" is not activated

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 7d280f18259dc7e41999767f543b8e9e50f36feb..05e609467bb2b20a1661132052dd836c2e6f543a 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("rallye")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "rallye");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php
index 9563cf746ecef399bd91d81f9f14fff3b4e5ba1c..2a30ff392a24a08ce3fbb29ab376172d8d694588 100644 (file)
--- a/inc/modules/member/what-refback.php
+++ b/inc/modules/member/what-refback.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
        // User is not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("refback")) && (!IS_ADMIN())) {
        // User is not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("refback")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "refback");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "refback");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-sponsor.php b/inc/modules/member/what-sponsor.php
index f6f60f75b7832926657c96d112bc27ca419e4a7b..fa65035f3a13fb6d21302e2646247e93f805bc5d 100644 (file)
--- a/inc/modules/member/what-sponsor.php
+++ b/inc/modules/member/what-sponsor.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "sponsor");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 13cc548ee8e1701c222e762acdf40f5c90c96f99..904d67393f7e7c2d6fd98cd7de4c71acb3031e5a 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }  elseif (!IS_MEMBER()){
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("support")) && (!IS_ADMIN())) {
 }  elseif (!IS_MEMBER()){
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("support")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "support");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "support");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index c70cb251994d18cd96a27dbb3ee2920a626e75d3..c1d861aecaa2b9b912423ef9ae5ade382031caaa 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
        // Redirect
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        // Redirect
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 4a5493fb025c96965a55d3cf6777df5dbf209ddd..d3754e6c13d6a507aa280e5461d09f0c3720de5a 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php
index ccb4d2dd5c381f387976c13e6e29987009d8f577..13837e422c7791e33561416adca0cb14d1f64c2f 100644 (file)
--- a/inc/modules/member/what-surfbar_start.php
+++ b/inc/modules/member/what-surfbar_start.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
        // Not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        // Not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php
index bcdd6d1b4ce2cd4b85a95b185f47e5db13710bbc..a79ab6da58f32e91b67b2b285286bc6fd2ee19bc 100644 (file)
--- a/inc/modules/member/what-surfbar_stats.php
+++ b/inc/modules/member/what-surfbar_stats.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "surfbar");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 17708e14d7e278ac6a43e7f2cd8f483121722c77..bca190b2afb94ff3dcfa6260f88330f387ee229a 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("theme")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "theme");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 06406df1f02f765b4f52fae85e31b4e8e45b3700..abb2c5677ebdc8db3999db77231ea8b858186170 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("transfer")) && (!IS_ADMIN())) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("transfer")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "transfer");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "transfer");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index c6e74e40940d3d557c2d8fcbc0d010ccd5d7c9c5..c66b29d414da95b6f73157ec000dd9aebf7f3c73 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
        // User is not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) {
        // User is not logged in
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("wernis")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "wernis");

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/order.php b/inc/modules/order.php
index c6c5be24a52e0b06b4f7712e4b19d9b01b423204..db72794c44ab9e8be34336e6a59588f5ee76d323 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");

        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!
        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!

diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php
index 1067b359030c2c9e3c419e8180e8fd55d83a8de7..4abb280e8553e007a30d0f1a4d7ba487d804d8e0 100644 (file)
--- a/inc/modules/sponsor.php
+++ b/inc/modules/sponsor.php
@@ -35,11 +35,11 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE);

        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

-       ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
+       addFatalMessage(SPONSOR_ONLY_AREA_ENTERED);

        return;
 } elseif (empty($GLOBALS['what'])) {
        // Empty what value detected!
        return;
 } elseif (empty($GLOBALS['what'])) {
        // Empty what value detected!

diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php
index 2fcd67209180bf2e751bb9dbdc2792769f149ce1..ff7f46596c34b623a114d7d53021ceafef715bb2 100644 (file)
--- a/inc/modules/sponsor/.php
+++ b/inc/modules/sponsor/.php
@@ -35,11 +35,11 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE);

        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

-       ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
+       addFatalMessage(SPONSOR_ONLY_AREA_ENTERED);

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 70c8f4b1284c7e13c06ee30709b4e565b4c1ee03..747104be271497a12d118b849743e62c0dfc5403 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -35,11 +35,11 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE);

        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

-       ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
+       addFatalMessage(SPONSOR_ONLY_AREA_ENTERED);

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 0d46ecf1296fc3cc5fef1a417c075520beb53472..b1b2464830890761a6de2a21c888397d3d1c2576 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -35,11 +35,11 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE);

        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

-       ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
+       addFatalMessage(SPONSOR_ONLY_AREA_ENTERED);

        return;
 }
 
        return;
 }
 

diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php
index d2c0c59444109a7b59757bcf848e6bb8754990d8..0c4be620507e9360bbeaa5c4310091d55147f51c 100644 (file)
--- a/inc/modules/sponsor/welcome.php
+++ b/inc/modules/sponsor/welcome.php
@@ -35,11 +35,11 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))

-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE);

        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!

-       ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
+       addFatalMessage(SPONSOR_ONLY_AREA_ENTERED);

        return;
 }
 
        return;
 }
 

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a8d95cf98fd0b49b5a2ed8300c5d47f91f9a1eae..5d0c6c8a489fb7b2b5b1e21b2cd2e9848ca37d81 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -95,7 +95,7 @@ function __SHUTDOWN_HOOK () {
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link
                SQL_CLOSE($link, __FILE__, __LINE__);
        } else {
                // No database link

-               ADD_FATAL(NO_DB_LINK);
+               addFatalMessage(NO_DB_LINK);

        }
 }
 
        }
 }
 


@@ -125,6 +125,10 @@ $_CONFIG = array(
        'last_update' => time()
 );
 
        'last_update' => time()
 );
 

+// Init fatal messages
+global $FATAL;
+$FATAL = array();
+

 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory
 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory


@@ -234,14 +238,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                include (PATH."inc/language.php");
 
                                // Wrong database?
                                include (PATH."inc/language.php");
 
                                // Wrong database?

-                               ADD_FATAL(WRONG_DB_SELECTED);
+                               addFatalMessage(WRONG_DB_SELECTED);

                        }
                } else {
                        // Add language system
                        include (PATH."inc/language.php");
 
                        // No link to database!
                        }
                } else {
                        // Add language system
                        include (PATH."inc/language.php");
 
                        // No link to database!

-                       ADD_FATAL(NO_DB_LINK);
+                       addFatalMessage(NO_DB_LINK);

                        $db = false;
                }
        } else {
                        $db = false;
                }
        } else {


@@ -249,7 +253,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                include (PATH."inc/language.php");
 
                // Maybe you forgot to enter your MySQL data?
                include (PATH."inc/language.php");
 
                // Maybe you forgot to enter your MySQL data?

-               ADD_FATAL(MYSQL_DATA_MISSING);
+               addFatalMessage(MYSQL_DATA_MISSING);

        }
 } else {
        ///////////////////////////////////////////////////
        }
 } else {
        ///////////////////////////////////////////////////


@@ -274,26 +278,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {

-                       ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
+                       addFatalMessage(CONFIG_IS_WRITE_PROTECTED);

                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {

-                       ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
+                       addFatalMessage(DUMMY_IS_WRITE_PROTECTED);

                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {

-                       ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
+                       addFatalMessage(SECRET_IS_WRITE_PROTECTED);

                } // END - if
        } // END - if
 }
 
                } // END - if
        } // END - if
 }
 

-// Any fatal messages?
-if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {

        // One or more fatal error(s) occur during connect...
        include (PATH."inc/header.php");
        include (PATH."inc/fatal_errors.php");
        // One or more fatal error(s) occur during connect...
        include (PATH."inc/header.php");
        include (PATH."inc/fatal_errors.php");

-       unset($FATAL);

        include (PATH."inc/footer.php");
        include (PATH."inc/footer.php");

-       exit;

 } // END - if
 
 //
 } // END - if
 
 //

diff --git a/install.php b/install.php
index 9f954414b405236f7eb011848b0f9f89832793b3..4a7366a5de40eb059e738c7533dba3148814f936 100644 (file)
--- a/install.php
+++ b/install.php
@@ -72,11 +72,11 @@ if (!isset($_GET['page'])) {
 // Already installed?
 if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered'))) {
        // Add fatal message
 // Already installed?
 if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered'))) {
        // Add fatal message

-       ADD_FATAL(ALREADY_INSTALLED);
+       addFatalMessage(ALREADY_INSTALLED);

 } // END - if
 
 // Does something goes wrong?
 } // END - if
 
 // Does something goes wrong?

-if ((sizeof($FATAL == 0)) && (empty($FATAL[0]))) {
+if (getTotalFatalMessages() == 0) {

        // Add main installation table
        LOAD_TEMPLATE("install_header");
 
        // Add main installation table
        LOAD_TEMPLATE("install_header");
 

diff --git a/mailid.php b/mailid.php
index 523d319c1969087c59416f97595aa4eb39b04a2b..5bca0bab23565d0a33353965f4b9e7fb69e80e56 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -59,10 +59,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
        if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
 
        if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
        if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
 

-       //* DEBUG: */ die("*".$url_uid."/".$url_bid."/".$url_mid."*<pre>".print_r($FATAL, true)."</pre>");
-
-       // 01        1        12            3    32           21    1     2      2     10
-       if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (count($FATAL) == 0)) {
+       // 01        1        12            3    32           21    1                   22     10
+       if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {

                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
                        // Normal-Mails
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
                        // Normal-Mails

diff --git a/mailid_top.php b/mailid_top.php
index 27da0b7caad766ad991ea81c62556912f36ea683..46b7a95310002fe54a4000e9d4aff639e195f596 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -48,7 +48,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Is the extension active
        if (!EXT_IS_ACTIVE("mailid", true)) {
                // Is not activated/installed yet!
        // Is the extension active
        if (!EXT_IS_ACTIVE("mailid", true)) {
                // Is not activated/installed yet!

-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));

        } // END - if
 
        // Secure all data
        } // END - if
 
        // Secure all data


@@ -59,8 +59,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        if (!empty($_GET['code']))    $code    = bigintval($_GET['code']);
        if (!empty($_GET['mode']))    $mode    = $_GET['mode'];
 
        if (!empty($_GET['code']))    $code    = bigintval($_GET['code']);
        if (!empty($_GET['mode']))    $mode    = $_GET['mode'];
 

-       // 01        1        12            2    2            21    1     2      2     10
-       if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (count($FATAL) == 0)) {
+       // 01        1        12            2    2            21    1                   22     10
+       if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {

                // No image? Then output header
                if ($mode != "img") require_once(PATH."inc/header.php");
 
                // No image? Then output header
                if ($mode != "img") require_once(PATH."inc/header.php");
 

diff --git a/modules.php b/modules.php
index f8c1a88e383c282ba09f5e0b85ddaccd413db36b..e05a1b25ed378f9898512d038f903d969cdd6cd6 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -100,8 +100,8 @@ include (PATH."inc/header.php");
 $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin
 $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
        // Maintain mode is active and you are no admin

-       ADD_FATAL(LANG_DOWN_MAINTAINCE);
-} elseif (($link) && ($db) && (sizeof($FATAL) == 0)) {
+       addFatalMessage(LANG_DOWN_MAINTAINCE);
+} elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {

        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
        switch ($check)
        // Did we found the module listed in allowed modules and are we successfully connected?
        $check = CHECK_MODULE($GLOBALS['module']);
        switch ($check)


@@ -113,39 +113,39 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
                define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
 
                // Does the module exists on local file system?
                define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
 
                // Does the module exists on local file system?

-               if ((FILE_READABLE(__MODULE)) && (sizeof($FATAL) == 0)) {
+               if ((FILE_READABLE(__MODULE)) && (getTotalFatalErrors() == 0)) {

                        // Module is valid, active and located on the local disc...
                        $MOD_VALID = true;
                } elseif (!empty($URL)) {
                        // An URL was specified so we load the de-referrer module
                        LOAD_URL(DEREFERER($URL));
                        // Module is valid, active and located on the local disc...
                        $MOD_VALID = true;
                } elseif (!empty($URL)) {
                        // An URL was specified so we load the de-referrer module
                        LOAD_URL(DEREFERER($URL));

-               } elseif (sizeof($FATAL) == 0) {
-                       ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+               } elseif (getTotalFatalErrors() == 0) {
+                       addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);

                }
                break;
 
        case "404":
                }
                break;
 
        case "404":

-               ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+               addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);

                break;
 
        case "locked":
                if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
                        // Module does addionally not exists
                break;
 
        case "locked":
                if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
                        // Module does addionally not exists

-                       ADD_FATAL(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+                       addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);

                } // END - if
 
                // Add fatal message
                } // END - if
 
                // Add fatal message

-               ADD_FATAL(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
+               addFatalMessage(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);

                break;
 
        default:
                DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
                break;
 
        default:
                DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));

-               ADD_FATAL(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
+               addFatalMessage(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);

                break;
        }
                break;
        }

-} elseif (sizeof($FATAL) == 0) {
+} elseif (getTotalFatalErrors() == 0) {

        // MySQL problems!
        // MySQL problems!

-       ADD_FATAL(MYSQL_ERRORS);
+       addFatalMessage(MYSQL_ERRORS);

 }
 
 if (($MOD_VALID) && (defined('__MODULE'))) {
 }
 
 if (($MOD_VALID) && (defined('__MODULE'))) {