Fix for ticket #86, thx 2 profi-concept :)

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 3fb1eaafab8b25fef84e5b702206972939a6853e..5a33578dea7c3db9ff156e507018b0f8a8e60a87 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;
@@ -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,8 +88,8 @@ 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":
@@ -100,8 +100,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                                } // 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,8 +126,8 @@ 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__);
+                                                       $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);
@@ -141,8 +141,8 @@ 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__);
+                                                       $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);
@@ -156,12 +156,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
@@ -216,7 +216,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                }
        } else {
                // Include footer
-               require_once(PATH."inc/footer.php");
+               LOAD_INC_ONCE("inc/footer.php");
        }
 } else {
        // You have to install first!