X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=54f17d5ad32b494b566fdaa0c7e4d39847110970;hb=dd83f83e740ec1cce013e8c93305671bf4809476;hp=3afc87b5110f60766ebba0b72382a96cb98321db;hpb=56931cd9321119dd37372bd16d6c552857e40066;p=mailer.git diff --git a/mailid_top.php b/mailid_top.php index 3afc87b511..54f17d5ad3 100644 --- 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 * @@ -174,10 +176,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 +227,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? @@ -237,10 +239,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr } // END - if // Insert stats record - insertUserStatsRecord($userId, $type, $stats_data); + //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'); @@ -298,8 +300,17 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr // Wrong image code! So add points to sender's account 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 +319,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr break; case 'img': - generateImageOrCode($img_code); + generateImageOrCode($realCode); break; case 'confirm': @@ -321,11 +332,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'; }