Two tickets resolved (57/89)

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index d1bae743d07eda8393ac191dcb1d2ff5581e6847..e6002741710f8754ef42212b11f27a81534d473b 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action;
@@ -42,13 +42,13 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['module'] = "mailid"; $CSS = -1;
 
 // Load the required file(s)
-require_once("inc/config.php");
+require("inc/config.php");
 
 if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Is the extension active
        if (!EXT_IS_ACTIVE("mailid", true)) {
                // Is not activated/installed yet!
-               LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=mailid");
+               LOAD_URL("modules.php?module=index&msg=".constant('CODE_EXTENSION_PROBLEM')."&ext=mailid");
        } // END - if
 
        // Init
@@ -96,7 +96,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                // Is the bonus extension active?
                                if (!EXT_IS_ACTIVE("bonus")) {
                                        // Abort here
-                                       LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=mailid");
+                                       LOAD_URL("modules.php?module=index&msg=".constant('CODE_EXTENSION_PROBLEM')."&ext=mailid");
                                } // END - if
 
                                // Bonus-Mails
@@ -128,8 +128,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                case "NORMAL":
                                                        $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
                                                                array(bigintval($pool)), __FILE__, __LINE__);
-                                                       if (SQL_NUMROWS($result) == 1)
-                                                       {
+                                                       if (SQL_NUMROWS($result) == 1) {
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = GET_PAY_POINTS($pay, "time");
                                                                $payment   = GET_PAY_POINTS($pay, "payment");
@@ -143,8 +142,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                case "BONUS":
                                                        $result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
                                                                array($url_bid), __FILE__, __LINE__);
-                                                       if (SQL_NUMROWS($result) == 1)
-                                                       {
+                                                       if (SQL_NUMROWS($result) == 1) {
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = "0.00000";
                                                                $VALID = true;
@@ -173,29 +171,29 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                                // Load template
                                                                LOAD_TEMPLATE("mailid_frames");
                                                        } else {
-                                                               $msg = CODE_DATA_INVALID;
+                                                               $msg = constant('CODE_DATA_INVALID');
                                                        }
                                                } else {
-                                                       $msg = CODE_POSSIBLE_INVALID;
+                                                       $msg = constant('CODE_POSSIBLE_INVALID');
                                                }
                                        } else {
-                                               $msg = CODE_ACCOUNT_LOCKED;
+                                               $msg = constant('CODE_ACCOUNT_LOCKED');
                                        }
                                } else {
                                        SQL_FREERESULT($result);
-                                       $msg = CODE_USER_404;
+                                       $msg = constant('CODE_USER_404');
                                }
                        } else {
                                SQL_FREERESULT($result);
-                               $msg = CODE_STATS_404;
+                               $msg = constant('CODE_STATS_404');
                        }
                } else {
                        SQL_FREERESULT($result);
-                       $msg = CODE_ALREADY_CONFIRMED;
+                       $msg = constant('CODE_ALREADY_CONFIRMED');
                }
        } else {
                // Nothing entered
-               $msg = CODE_ERROR_MAILID;
+               $msg = constant('CODE_ERROR_MAILID');
        }
 
        // Error code is set?
@@ -211,7 +209,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
                        default:
                                DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
-                               LOAD_URL("modules.php?module=index&msg=".CODE_UNKNOWN_STATUS."&ext=mailid");
+                               LOAD_URL("modules.php?module=index&msg=".constant('CODE_UNKNOWN_STATUS')."&ext=mailid");
                                break;
                }
        } else {