Huge rewrite:

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 58b41d6b753ae75a14c756354e94259b67a4bc34..34de98562876460a958ae3dd910dc3101bda1557 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -45,6 +45,7 @@ $GLOBALS['startTime'] = microtime(true);
 // Tell everyone we are in this module
 $GLOBALS['module'] = 'mailid';
 $GLOBALS['output_mode'] = -1;
+$errorCode = '';
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -72,13 +73,13 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
        // 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'; $urlId = $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'; $urlId = $url_bid;
        } else {
                // Problem: No ID entered
@@ -129,8 +130,8 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
                        setExtraTitle($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);
@@ -190,37 +191,37 @@ if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors
                                                        // Load template
                                                        LOAD_TEMPLATE('mailid_frames');
                                                } else {
-                                                       $msg = getCode('DATA_INVALID');
+                                                       $errorCode = getCode('DATA_INVALID');
                                                }
                                        } else {
-                                               $msg = getCode('POSSIBLE_INVALID');
+                                               $errorCode = getCode('POSSIBLE_INVALID');
                                        }
                                } else {
-                                       $msg = getCode('ACCOUNT_LOCKED');
+                                       $errorCode = getCode('ACCOUNT_LOCKED');
                                }
                        } else {
                                SQL_FREERESULT($result);
-                               $msg = getCode('USER_404');
+                               $errorCode = getCode('USER_404');
                        }
                } else {
                        SQL_FREERESULT($result);
-                       $msg = getCode('STATS_404');
+                       $errorCode = getCode('STATS_404');
                }
        } else {
                SQL_FREERESULT($result);
-               $msg = getCode('ALREADY_CONFIRMED');
+               $errorCode = getCode('ALREADY_CONFIRMED');
        }
 } else {
        // Nothing entered
-       $msg = getCode('ERROR_MAILID');
+       $errorCode = getCode('ERROR_MAILID');
 }
 
 // Error code is set?
-if (!empty($msg)) {
+if (!empty($errorCode)) {
        // @TODO Rewrite this to a filter
        switch (getConfig('mailid_error_redirect')) {
                case 'INDEX': // Redirect to index page
-                       redirectToUrl('modules.php?module=index&msg='.$msg.'&ext=mailid');
+                       redirectToUrl('modules.php?module=index&msg=' . $errorCode . '&ext=mailid');
                        break;
 
                case 'REJECT': // Redirect to rejection page