X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailid_top.php;h=ba47505ab9043fd61461c75d9d6bdbfa163d822d;hb=ad85ea5a3690e65e3509d4e4e8c63083b2b71b0c;hp=29a08b5f24b4a4a7bcbc0dd8f7fedab7bf4e7274;hpb=e45e218c4f629ec63f0788cab231bfc88b3fa46e;p=mailer.git
diff --git a/mailid_top.php b/mailid_top.php
index 29a08b5f24..ba47505ab9 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -74,25 +74,24 @@ if (isGetRequestParameterSet('code')) $code = bigintval(getRequestParam
if (isGetRequestParameterSet('mode')) $mode = getRequestParameter('mode');
// 01 1 12 2 2 21 1 22 10
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
+if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
// No image? Then output header
if ($mode != 'img') loadIncludeOnce('inc/header.php');
// 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",
+ $result_main = 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__);
$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",
+ $result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
array($url_bid, $url_userid), __FILE__, __LINE__);
$type = 'bonusid'; $urlId = $url_bid;
}
- if (SQL_NUMROWS($result) == 1) {
+ if (SQL_NUMROWS($result_main) == 1) {
// Is the stats id valid?
- list($lid, $ltype) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+ list($lid, $ltype) = SQL_FETCHROW($result_main);
// Init result here with invalid to avoid possible missing variable
$result_mailid = false;
@@ -110,7 +109,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
break;
default: // Unknown type
- debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
break;
}
@@ -122,9 +121,6 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
// Correct notification switch in non-bonus mails
if (($notify != 'Y') && ($notify != 'N')) $notify = 'N';
- // Free some memory
- SQL_FREERESULT($result_mailid);
-
// Set sender to 0 when we have a bonus mail
if ($ltype == 'BONUS') $sender = '0';
@@ -166,7 +162,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
break;
default: // Unknown type
- debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
break;
}
@@ -214,12 +210,11 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
break;
default: // Unknown type
- debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
break;
} // END - switch
// Export data into constants for the template
- $content['points'] = translateComma($payment);
$content['banner'] = loadTemplate('mailid_banner', true);
// Only when user extension = v0.1.2: Update mails-confirmed counter
@@ -232,7 +227,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
// Update random confirmed as well?
if (isExtensionInstalledAndNewer('user', '0.3.4')) {
// Update second counter
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE `userid`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=`rand_confirmed` + 1 WHERE `userid`=%s LIMIT 1",
array($url_userid), __FILE__, __LINE__);
} // END - if
} // END - if
@@ -243,13 +238,11 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
// Right code entered?
if (bigintval(postRequestParameter('gfx_check')) == $img_code) {
// Add points over referal system is the default
- $locked = false;
$template = 'mailid_points_done';
// Right code entered add points and remove entry
- if ((getUserData('ref_payout') > 0) && (getConfig('allow_direct_pay') != 'Y')) {
+ if ((getUserData('ref_payout') > 0) && (!isDirectPaymentAllowed())) {
// Don't add points over the referal system
- $locked = true;
$template = 'mailid_points_locked';
} // END - if
@@ -260,14 +253,14 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
// Add points
// @TODO Try to rewrite the following unset()
unset($GLOBALS['ref_level']);
- addPointsThroughReferalSystem('mailid_okay', $url_userid, $payment, false, 0, $locked);
+ addPointsThroughReferalSystem('mailid_okay', $url_userid, $payment);
// Shall I add bonus points for "turbo clickers" ?
if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
// Is an active-rallye running and this is not a notification mail?
- if ((getConfig('bonus_active') == 'Y') && ($notify != 'Y')) {
+ if ((isBonusRallyeActive()) && ($notify != 'Y')) {
// 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)) {
+ if ((((getBonusUserId() == $url_userid) && (getConfig('bonus_include_own') == 'Y')) || (getBonusUserId() != $url_userid)) && (getConfig('def_refid') != $url_userid)) {
// Add points and remember ranking are done in this function....
addTurboBonus($urlId, $url_userid, $type);
@@ -282,14 +275,11 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
} // END - if
// Load total points
- $content['total'] = translateComma(
- countSumTotalData($url_userid, 'user_points', 'points') -
- countSumTotalData($url_userid, 'user_data', 'used_points')
- );
+ $content['total'] = getTotalPoints($url_userid);
// Load template
loadTemplate($template, false, $content);
- } elseif ($sender > 0) {
+ } elseif (isValidUserId($sender)) {
// Wrong image code! So add points to sender's account
addPointsDirectly('mailid_payback', $sender, $payment);
@@ -328,7 +318,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
loadTemplate($templ, false, $content);
} else {
// Cannot confirm!
- debug_report_bug('No code given.');
+ debug_report_bug(__FILE__, __LINE__, 'No code given.');
}
break;
@@ -348,7 +338,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
break;
default: // Unknown mode
- debug_report_bug('Unknown mode ' . $mode . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $mode . ' detected.');
break;
} // END - switch
} else {
@@ -364,21 +354,24 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
$mode = 'failed';
}
} else {
- SQL_FREERESULT($result);
loadTemplate('admin_settings_saved', false, '{--MAIL_ALREADY_CONFIRMED--} (3)
');
$mode = 'failed';
}
} else {
- SQL_FREERESULT($result);
loadTemplate('admin_settings_saved', false, '{--MAIL_ALREADY_CONFIRMED--} (2)
');
$mode = 'failed';
}
+
+ // Free result
+ SQL_FREERESULT($result_mailid);
} else {
- SQL_FREERESULT($result);
loadTemplate('admin_settings_saved', false, '{--MAIL_ALREADY_CONFIRMED--} (1)
');
$mode = 'failed';
}
+ // Free result
+ SQL_FREERESULT($result_main);
+
// Insert footer if no image
if ($mode != 'img') {
// Write footer