Typo fixed

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index 3afc87b5110f60766ebba0b72382a96cb98321db..0ad68b00d53cbeb9357004b3ef793fe288b75e0d 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -15,6 +15,8 @@
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
+ * @TODO Merge this script with mailid.php                              *
+ * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
@@ -82,12 +84,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
        // Maybe he wants to confirm an email?
        if ($mailId > 0) {
-               $result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+               $result_main = SQL_QUERY_ESC("SELECT `id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
                        array($mailId, $userId), __FILE__, __LINE__);
                $type = 'mailid';
                $urlId = $mailId;
        } elseif ($bonusId > 0) {
-               $result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+               $result_main = SQL_QUERY_ESC("SELECT `id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
                        array($bonusId, $userId), __FILE__, __LINE__);
                $type = 'bonusid';
                $urlId = $bonusId;
@@ -103,12 +105,12 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                // @TODO Rewrite this to a filter
                switch ($ltype) {
                        case 'NORMAL':
-                               $result_mailid = SQL_QUERY_ESC("SELECT `pool_id`, `userid`, `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+                               $result_mailid = SQL_QUERY_ESC("SELECT `pool_id`,`userid`,`id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                        array($mailId), __FILE__, __LINE__);
                                break;
 
                        case 'BONUS':
-                               $result_mailid = SQL_QUERY_ESC("SELECT `id`, `id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                               $result_mailid = SQL_QUERY_ESC("SELECT `id`,`id`,`is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array($bonusId), __FILE__, __LINE__);
                                break;
 
@@ -123,10 +125,14 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                        list($pool, $sender, $notify) = SQL_FETCHROW($result_mailid);
 
                        // Correct notification switch in non-bonus mails
-                       if (($notify != 'Y') && ($notify != 'N')) $notify = 'N';
+                       if (($notify != 'Y') && ($notify != 'N')) {
+                               $notify = 'N';
+                       } // END - if
 
                        // Set sender to 0 when we have a bonus mail
-                       if ($ltype == 'BONUS') $sender = '0';
+                       if ($ltype == 'BONUS') {
+                               $sender = '0';
+                       } // END - if
 
                        // Is the user id valid?
                        if (fetchUserData($userId) === true) {
@@ -152,7 +158,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        break;
 
                                                case 'BONUS':
-                                                       $result = SQL_QUERY_ESC("SELECT `time`, `points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT `time`,`points` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($pool)), __FILE__, __LINE__);
 
                                                        // Entry found?
@@ -174,10 +180,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                        if ($isValid === true) {
                                                if (($time == '0') && ($payment > 0)) $time = 1;
                                                if (($time > 0) && ($payment > 0)) {
-                                                       $img_code = '0';
+                                                       $realCode = '0';
                                                        if (!empty($code)) {
-                                                               // Generate code
-                                                               $img_code = generateRandomCode(getCodeLength(), $code, $userId, $urlId);
+                                                               // Generate code (the user sees in the CAPTCHA)
+                                                               $realCode = generateRandomCode(getCodeLength(), $code, $userId, $urlId);
                                                        } // END - if
 
                                                        // @TODO Rewrite this to a filter
@@ -225,7 +231,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        // @TODO Rewrite these blocks to filter
                                                                        if (isExtensionInstalledAndNewer('user', '0.1.2')) {
                                                                                // Update counter
-                                                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE `userid`=%s LIMIT 1",
+                                                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `mails_confirmed`=`mails_confirmed`+1 WHERE `userid`=%s LIMIT 1",
                                                                                        array($userId), __FILE__, __LINE__);
 
                                                                                // Update random confirmed as well?
@@ -240,7 +246,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        insertUserStatsRecord($userId, $type, $stats_data);
 
                                                                        // Right code entered?
-                                                                       if (bigintval(postRequestParameter('gfx_check')) == $img_code) {
+                                                                       if (bigintval(postRequestParameter('gfx_check')) == $realCode) {
                                                                                // Set HTTP status to okay
                                                                                setHttpStatus('200 OK');
 
@@ -296,10 +302,20 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                loadTemplate($template, false, $content);
                                                                        } elseif (isValidUserId($sender)) {
                                                                                // Wrong image code! So add points to sender's account
+                                                                               initReferalSystem();
                                                                                addPointsThroughReferalSystem('mailid_payback', $sender, $payment);
 
+                                                                               // Add payment points
+                                                                               $content['points'] = $payment;
+
                                                                                // Load template
                                                                                loadTemplate('mailid_points_failed', false, $content);
+                                                                       } else {
+                                                                               // Add payment points (again)
+                                                                               $content['points'] = $payment;
+
+                                                                               // Load template
+                                                                               loadTemplate('mailid_points_failed2', false, $content);
                                                                        }
 
                                                                        // Remove link from table
@@ -308,7 +324,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        break;
 
                                                                case 'img':
-                                                                       generateImageOrCode($img_code);
+                                                                       generateImageOrCode($realCode);
                                                                        break;
 
                                                                case 'confirm':
@@ -321,11 +337,11 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                $content['banner'] = loadTemplate('mailid_banner', true);
                                                                                if (getCodeLength() > 0) {
                                                                                        // Generate Code
-                                                                                       $content['image'] = generateCaptchaCode($code, $type, $urlId, $userId);
+                                                                                       $content['image'] = generateCaptchaCode($realCode, $type, $urlId, $userId);
                                                                                        $templ = 'mailid_enter_code';
                                                                                } else {
                                                                                        // Disabled code
-                                                                                       $content['gfx'] = $img_code;
+                                                                                       $content['gfx'] = $realCode;
                                                                                        $templ = 'mailid_confirm_buttom';
                                                                                }