Two tickets resolved (57/89)

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 5bca0bab23565d0a33353965f4b9e7fb69e80e56..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;
@@ -48,7 +48,7 @@ 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
@@ -64,13 +64,13 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
                        // Normal-Mails
-                       $result = SQL_QUERY_ESC("SELECT link_type FROM "._MYSQL_PREFIX."_user_links WHERE stats_id=%s AND userid=%s LIMIT 1",
-                        array($url_mid, $url_uid), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND userid=%s LIMIT 1",
+                               array($url_mid, $url_uid), __FILE__, __LINE__);
                        $type = "mailid"; $DATA = $url_mid;
                } elseif ($url_bid > 0) {
                        // Bonus-Mail
-                       $result = SQL_QUERY_ESC("SELECT link_type FROM "._MYSQL_PREFIX."_user_links WHERE bonus_id=%s AND userid=%s LIMIT 1",
-                        array($url_bid, $url_uid), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND userid=%s LIMIT 1",
+                               array($url_bid, $url_uid), __FILE__, __LINE__);
                        $type = "bonusid"; $DATA = $url_bid;
                } else {
                        // Problem: No ID entered
@@ -88,20 +88,20 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                        {
                        case "NORMAL":
                                // Is the stats ID valid?
-                               $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
-                                array($url_mid), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
+                                       array($url_mid), __FILE__, __LINE__);
                                break;
 
                        case "BONUS":
                                // 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
-                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
-                                array($url_bid), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                                       array($url_bid), __FILE__, __LINE__);
                                break;
                        }
 
@@ -116,8 +116,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                $EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
 
                                // Is the user's ID unlocked?
-                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
-                                array($url_uid), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                       array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -126,10 +126,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                switch ($ltype)
                                                {
                                                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)
-                                                       {
+                                                       $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) {
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = GET_PAY_POINTS($pay, "time");
                                                                $payment   = GET_PAY_POINTS($pay, "payment");
@@ -141,10 +140,9 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                        break;
 
                                                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)
-                                                       {
+                                                       $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) {
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = "0.00000";
                                                                $VALID = true;
@@ -156,12 +154,12 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                                }
 
                                                // Add header
-                                               require_once(PATH."inc/header.php");
+                                               LOAD_INC_ONCE("inc/header.php");
 
                                                // Was that mail a valid one?
                                                if ($VALID) {
                                                        // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
-                                                       if (($time == "0") && ($payment > 0)) { $URL = URL; $time = "1"; }
+                                                       if (($time == "0") && ($payment > 0)) { $URL = constant('URL'); $time = "1"; }
                                                        if (($time > 0) && (($payment > 0) || ($points > 0))) {
                                                                // He can confirm this mail!
                                                                // Export data into constants for the template
@@ -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?
@@ -206,20 +204,20 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                break;
 
                        case "REJECT": // Redirect to rejection page
-                               LOAD_URL(getConfig('reject_url'));
+                               LOAD_CONFIGURED_URL('reject_url');
                                break;
 
                        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 {
                // Include footer
-               require_once(PATH."inc/footer.php");
+               LOAD_INC_ONCE("inc/footer.php");
        }
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }