More improvements:

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index 214a1252183d504e195d463052e1bdb90110b3ef..59253188f434afd23c3776162a4e9d05140ae0a0 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -282,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);
 
@@ -371,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