Some internal TODOs fixed, rewrites to script inclusion

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index 27da0b7caad766ad991ea81c62556912f36ea683..2136361822a3784dfd2c0777a0e7510b4e2634f0 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!
-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+               addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
        } // 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'];
 
-       // 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");
 
@@ -240,7 +240,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                                ADD_POINTS_REFSYSTEM("mailid_okay", $url_uid, $payment, false, "0", $locked);
 
                                                                                // Shall I add bonus points for "turbo clickers" ?
-                                                                               if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (function_exists('BONUS_ADD_TURBO_POINTS'))) {
+                                                                               if (GET_EXT_VERSION("bonus") >= "0.2.2") {
                                                                                        // Is an active-rallye running and this is not a notification mail?
                                                                                        if ((getConfig('bonus_active') == "Y") && ($notify == "N")) {
                                                                                                // Shall I exclude the webmaster's own userid from the active-rallye?
@@ -327,22 +327,22 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                        break;
                                                                }
                                                        }
-                                                        else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</STRONG>");
+                                                        else OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (6)</div>");
                                                }
-                                                else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</STRONG>");
+                                                else OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (5)</div>");
                                        }
-                                        else OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</STRONG>");
+                                        else OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (4)</div>");
                                } else {
                                        SQL_FREERESULT($result);
-                                       OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</STRONG>");
+                                       OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (3)</div>");
                                }
                        } else {
                                SQL_FREERESULT($result);
-                               OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</STRONG>");
+                               OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (2)</div>");
                        }
                } else {
                        SQL_FREERESULT($result);
-                       OUTPUT_HTML("<STRONG class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</STRONG>");
+                       OUTPUT_HTML("<div class=\"member_failed\">".MAIL_ALREADY_CONFIRMED." (1)</div>");
                }
 
                // Insert footer if no image
@@ -352,7 +352,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                } // END - if
        }
 } elseif ($mode != "img") {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }