ext-admins must be checked here, first admin had never 'allow'

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index 98fe721023078bf93a4ab3b21c00cf36b313b288..59253188f434afd23c3776162a4e9d05140ae0a0 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -117,7 +117,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                break;
 
                        case 'BONUS':
-                               $result_mailid = SQL_QUERY_ESC("SELECT `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                               $result_mailid = SQL_QUERY_ESC("SELECT `id` AS `pool_id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array($urlId), __FILE__, __LINE__);
                                break;
 
@@ -138,7 +138,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
                        // Set sender to 0 when we have a bonus mail
                        if ($data['link_type'] == 'BONUS') {
-                               $data['sender'] = '0';
+                               $data['sender'] = NULL;
                        } // END - if
 
                        // Is the user id valid?
@@ -154,9 +154,9 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
                                                        // Entry found?
                                                        if (SQL_NUMROWS($result) == 1) {
-                                                               list($pay) = SQL_FETCHROW($result);
-                                                               $time      = getPaymentData($pay, 'time');
-                                                               $payment   = getPaymentData($pay, 'payment');
+                                                               list($paymentId) = SQL_FETCHROW($result);
+                                                               $time      = getPaymentData($paymentId, 'time');
+                                                               $payment   = getPaymentData($paymentId, 'payment');
                                                                $isValid   = TRUE;
                                                        } // END - if
 
@@ -185,7 +185,10 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
 
                                        // Is this entry valid?
                                        if ($isValid === TRUE) {
+                                               // Run at least one second
                                                if (($time == '0') && ($payment > 0)) $time = 1;
+
+                                               // Is time and payment set?
                                                if (($time > 0) && ($payment > 0)) {
                                                        $realCode = '0';
                                                        if (!empty($code)) {
@@ -279,7 +282,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                                        // Is an active-rallye running and this is not a notification mail?
                                                                                        if ((isBonusRallyeActive()) && ($data['is_notify'] != 'Y')) {
                                                                                                // Shall I exclude the webmaster's own userid from the active-rallye?
-                                                                                               if ((((getBonusUserid() == $userId) && (getConfig('bonus_include_own') == 'Y')) || (getBonusUserid() != $userId)) && (getDefRefid() != $userId)) {
+                                                                                               if ((((getBonusUserid() == $userId) && (isBonusIncludeOwnEnabled())) || (getBonusUserid() != $userId)) && (getDefRefid() != $userId)) {
                                                                                                        // Add points and remember ranking are done in this function....
                                                                                                        addTurboBonus($urlId, $userId, $type);
 
@@ -368,7 +371,6 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                        $content['userid'] = $userId;
                                                                        $content['type']   = $type;
                                                                        $content['data']   = $urlId;
-                                                                       $content['rand']   = getRandomTan();
                                                                        $content['banner'] = loadTemplate('mailid_banner', TRUE);
 
                                                                        // Load template