X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid.php;h=fb180602e9ee55348b297e5995ee4db1a699d4a3;hp=68dfb1cfe185b99d1253754212d7d11c2ea4bd86;hb=ca11996eb52fa0a1ec45d6ab10f5331c4a54a116;hpb=9f6c30cc0e06098171d773d671292081ecee3d29 diff --git a/mailid.php b/mailid.php index 68dfb1cfe1..fb180602e9 100644 --- a/mailid.php +++ b/mailid.php @@ -1,7 +1,7 @@ 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) { +// 01 1 12 2 2 21 1 2210 +if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) { // Init result $result_link = false; // Maybe he wants to confirm an email? - if ($url_mid > 0) { - // Normal-Mails + if ($mailId > 0) { + // Member mail $result_link = SQL_QUERY_ESC("SELECT `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) { - // Bonus-Mail + array($mailId, $userId), __FILE__, __LINE__); + $type = 'mailid'; + $urlId = $mailId; + } elseif ($bonusId > 0) { + // Bonus mail $result_link = SQL_QUERY_ESC("SELECT `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; + array($bonusId, $userId), __FILE__, __LINE__); + $type = 'bonusid'; + $urlId = $bonusId; } else { // Problem: No id entered - redirectToUrl('index.php'); + redirectToUrl('modules.php?module=index'); } if (SQL_NUMROWS($result_link) == 1) { @@ -95,8 +103,8 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr switch ($ltype) { case 'NORMAL': // Is the stats id valid? - $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1", - array($url_mid), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `pool_id`,`url`,`subject` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1", + array($mailId), __FILE__, __LINE__); break; case 'BONUS': @@ -104,18 +112,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr redirectOnUninstalledExtension('bonus'); // Bonus-Mails - $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", - array($url_bid), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `id`,`url`,`subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", + array($bonusId), __FILE__, __LINE__); break; default: // Invalid mail type - debug_report_bug('Invalid mail type ' . $ltype . ' detected.'); + reportBug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.'); break; - } + } // END - switch if (SQL_NUMROWS($result) == 1) { // Load data - list($pool, $URL, $title) = SQL_FETCHROW($result); + list($pool, $url, $title) = SQL_FETCHROW($result); // Free result SQL_FREERESULT($result); @@ -124,14 +132,20 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr setExtraTitle($title); // Is the user's id unlocked? - if (fetchUserData($url_userid)) { + if (fetchUserData($userId)) { // Status must be CONFIRMED if (getUserData('status') == 'CONFIRMED') { + // Update last activity if not admin + if ((!isAdmin()) || (isDebugModeEnabled())) { + // Is not admin, so update last activity + updateLastActivity($userId); + } // END - if + // User has confirmed his account so we can procede... // @TODO Rewrite this to a filter switch ($ltype) { case 'NORMAL': - $result = SQL_QUERY_ESC("SELECT payment_id FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `payment_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1", array(bigintval($pool)), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { list($pay) = SQL_FETCHROW($result); @@ -145,20 +159,20 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr break; case 'BONUS': - $result = SQL_QUERY_ESC("SELECT points, time FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", - array($url_bid), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `points`,`time` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1", + array($bonusId), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { list($points, $time) = SQL_FETCHROW($result); $payment = '0.00000'; $isValid = true; - } + } // END - if // Free memory SQL_FREERESULT($result); break; default: // Invalid mail type - debug_report_bug('Invalid mail type ' . $ltype . ' detected.'); + reportBug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.'); break; } @@ -168,14 +182,21 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr // Was that mail a valid one? if ($isValid === true) { // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems - if (($time == 0) && ($payment > 0)) { $URL = getConfig('URL'); $time = 1; } + if (($time == '0') && ($payment > 0)) { + $url = getUrl(); + $time = 1; + } // END - if + if (($time > 0) && (($payment > 0) || ($points > 0))) { + // Set HTTP status to okay + setHttpStatus('200 OK'); + // Export data into constants for the template $content = array( - 'userid' => $url_userid, - 'type' => $type, - 'data' => $urlId, - 'url' => generateDerefererUrl($URL) + 'userid' => $userId, + 'type' => $type, + 'data' => $urlId, + 'url' => $url ); // Load template @@ -207,29 +228,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr } // Error code is set? -if (!empty($errorCode)) { - // @TODO Rewrite this to a dynamic include or so - switch (getConfig('mailid_error_redirect')) { - case 'INDEX': // Redirect to index page - redirectToUrl('modules.php?module=index&code=' . $errorCode . '&ext=mailid'); - break; - - case 'REJECT': // Redirect to rejection page - if (isExtensionActive('other')) { - // Redirect to configured URL - redirectToConfiguredUrl('reject_url'); - } else { - // Redirect to index - redirectToUrl('index.php'); - } - break; - - default: - logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect'))); - redirectToUrl('modules.php?module=index&code=' . getCode('UNKNOWN_STATUS') . '&ext=mailid'); - break; - } // END - switch -} // END - if +handleMailIdErrorCode($errorCode); // Include footer loadIncludeOnce('inc/footer.php');