X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=e267d77efa333e4d0887ae48eaa92f5ba62d07a0;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=ec0417eafcc66f0da42d785d8720d0f1937f884e;hpb=ad30a667fd8abeb576c04026b62c2e8a29d86f52;p=mailer.git diff --git a/mailid_top.php b/mailid_top.php index ec0417eafc..e267d77efa 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; @@ -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'; @@ -232,7 +228,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 @@ -265,7 +261,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe // 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 ((ifBonusRallyeActive()) && ($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)) { // Add points and remember ranking are done in this function.... @@ -289,7 +285,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe // 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); @@ -364,21 +360,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