Fixes for rallye (again) and missing array element

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 1f38c5b15e389657dcb381c26aad371b7ad2c4f5..68dfb1cfe185b99d1253754212d7d11c2ea4bd86 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -83,7 +83,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        array($url_bid, $url_userid), __FILE__, __LINE__);
                $type = 'bonusid'; $urlId = $url_bid;
        } else {
-               // Problem: No ID entered
+               // Problem: No id entered
                redirectToUrl('index.php');
        }
 
@@ -94,7 +94,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                // @TODO Rewrite this to a filter
                switch ($ltype) {
                        case 'NORMAL':
-                               // Is the stats ID valid?
+                               // 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__);
                                break;
@@ -123,13 +123,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        // Set it
                        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_userid), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1) {
-                               list($status, $gender, $surname, $family) = SQL_FETCHROW($result);
-                               SQL_FREERESULT($result);
-                               if ($status == 'CONFIRMED') {
+                       // Is the user's id unlocked?
+                       if (fetchUserData($url_userid)) {
+                               // Status must be CONFIRMED
+                               if (getUserData('status') == 'CONFIRMED') {
                                        // User has confirmed his account so we can procede...
                                        // @TODO Rewrite this to a filter
                                        switch ($ltype) {
@@ -190,7 +187,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                $errorCode = getCode('POSSIBLE_INVALID');
                                        }
                                } else {
-                                       $errorCode = getCode('ACCOUNT_' . $status);
+                                       $errorCode = getCode('ACCOUNT_' . getUserData('status'));
                                }
                        } else {
                                $errorCode = getCode('USER_404');