New wrapper function introduced, more EL rewrites:

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index e267d77efa333e4d0887ae48eaa92f5ba62d07a0..36a5c007856fbe55ff9fffaa52399a9f51bd51f9 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -215,7 +215,6 @@ if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFa
                                                                        } // 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
@@ -261,9 +260,9 @@ if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFa
                                                                                // 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 ((ifBonusRallyeActive()) && ($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);
 
@@ -278,10 +277,7 @@ if ((isValidUserId($url_userid)) && (($url_mid > 0) || ($url_bid > 0)) && (!ifFa
                                                                                } // 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);