Several fixes for broken actions (sorry for lame text)

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index fa10da86cb92a5d280d8f62dbc8438d128904dad..f1e83132d403e9ebae7a440ad436634c13b538b0 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -56,12 +56,17 @@ setContentType('text/html');
 redirectOnUninstalledExtension('mailid');
 
 // Secure all data
-$url_userid = 0; $url_bid = 0; $url_mid = 0; $code = 0; $mode = '';
-if (isGetRequestElementSet('userid'))     $url_userid = bigintval(getRequestElement('userid'));
-if (isGetRequestElementSet('mailid'))  $url_mid = bigintval(getRequestElement('mailid'));
-if (isGetRequestElementSet('bonusid')) $url_bid = bigintval(getRequestElement('bonusid'));
-if (isGetRequestElementSet('code'))    $code    = bigintval(getRequestElement('code'));
-if (isGetRequestElementSet('mode'))    $mode    = getRequestElement('mode');
+$url_userid = 0;
+$url_bid = 0;
+$url_mid = 0;
+$code = 0;
+$mode = '';
+
+if (isGetRequestElementSet('userid'))  $url_userid = bigintval(getRequestElement('userid'));
+if (isGetRequestElementSet('mailid'))  $url_mid    = bigintval(getRequestElement('mailid'));
+if (isGetRequestElementSet('bonusid')) $url_bid    = bigintval(getRequestElement('bonusid'));
+if (isGetRequestElementSet('code'))    $code       = bigintval(getRequestElement('code'));
+if (isGetRequestElementSet('mode'))    $mode       = getRequestElement('mode');
 
 // 01        1        12            2    2            21    1                   22     10
 if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
@@ -71,7 +76,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
        // Maybe he wants to confirm an email?
        if ($url_mid > 0) {
                $result = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
-               array($url_mid, $url_userid), __FILE__, __LINE__);
+                       array($url_mid, $url_userid), __FILE__, __LINE__);
                $type = 'mailid'; $urlId = $url_mid;
        } elseif ($url_bid > 0) {
                $result = SQL_QUERY_ESC("SELECT `id`, link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
@@ -116,8 +121,8 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        if ($ltype == 'BONUS') $sender = 0;
 
                        // Is the user's ID unlocked?
-                       $result = SQL_QUERY_ESC("SELECT status, gender, surname, family, ref_payout FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                       array($url_userid), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`, `family`, `ref_payout` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+                               array($url_userid), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
                                list($status, $gender, $surname, $family, $ref_pay) = SQL_FETCHROW($result);
@@ -170,9 +175,10 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                        }
 
                                        // Is this entry valid?
-                                       if ($isValid) {
+                                       if ($isValid === true) {
                                                if (($time == '0') && ($payment > 0)) $time = '1';
                                                if (($time > 0) && ($payment > 0)) {
+                                                       $img_code = 0;
                                                        if (!empty($code)) {
                                                                // Generate code
                                                                $img_code = generateRandomCode(getConfig('code_length'), $code, $url_userid, $urlId);
@@ -267,14 +273,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                                                                // Shall I exclude the webmaster's own userid from the active-rallye?
                                                                                                if ((((getConfig('bonus_userid') == $url_userid) && (getConfig('bonus_include_own') == 'Y')) || (getConfig('bonus_userid') != $url_userid)) && (getConfig('def_refid') != $url_userid)) {
                                                                                                        // Add points and remember ranking are done in this function....
-                                                                                                       addTurboBonus($payment, $url_userid, $type);
+                                                                                                       addTurboBonus($urlId, $url_userid, $type);
 
                                                                                                        // Set template to mailid_points_done2 which contains a link to the ranking list
                                                                                                        $template = 'mailid_points_done2';
                                                                                                        if ($locked) $template = 'mailid_points_locked2';
                                                                                                        $content['userid']  = $url_userid;
-                                                                                                       $content['type'] = $type;
-                                                                                                       $content['data'] = translateComma($payment);
+                                                                                                       $content['type']    = $type;
+                                                                                                       $content['data']    = $urlId;
                                                                                                } // END - if
                                                                                        } // END - if
                                                                                } // END - if
@@ -307,9 +313,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                                case 'confirm':
                                                                        if ($code > 0) {
                                                                                // Export data into constants for the template
-                                                                               $content['code'] = $code;
-                                                                               $content['userid']  = $url_userid;
-                                                                               $content['type'] = $type;
+                                                                               $content['code']   = $code;
+                                                                               $content['userid'] = $url_userid;
+                                                                               $content['type']   = $type;
                                                                                $content['data']   = $urlId;
                                                                                $content['banner'] = loadTemplate('mailid_banner', true);
                                                                                if (getConfig('code_length') > 0) {