All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index fe2c59e7ab54ee16c4c52073eacb77fa80a43c6a..b877c10f19b9d172b4a7d61ecf21268762f2c226 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -59,20 +59,18 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        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
-                       $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
@@ -90,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":
@@ -102,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;
                        }
 
@@ -118,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);
@@ -128,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);
@@ -143,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);
@@ -202,17 +200,17 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
        // Error code is set?
        if (!empty($msg)) {
-               switch ($_CONFIG['mailid_error_redirect']) {
+               switch (getConfig('mailid_error_redirect')) {
                        case "INDEX": // Redirect to index page
                                LOAD_URL("modules.php?module=index&amp;msg=".$msg."&amp;ext=mailid");
                                break;
 
                        case "REJECT": // Redirect to rejection page
-                               LOAD_URL($_CONFIG['reject_url']);
+                               LOAD_CONFIGURED_URL('reject_url');
                                break;
 
                        default:
-                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", $_CONFIG['mailid_error_redirect']));
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
                                LOAD_URL("modules.php?module=index&amp;msg=".CODE_UNKNOWN_STATUS."&amp;ext=mailid");
                                break;
                }
@@ -221,7 +219,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
                require_once(PATH."inc/footer.php");
        }
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }