More language strings renamed, TODOs.txt updated:

[mailer.git] / inc / modules / member / what-points.php

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index 6932b6ecd04b07e76792e65f0df88f305c9bf0c3..1b6db929f0880570d88f17e881c788da1801d077 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -125,32 +125,6 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 $content['rows'] = $OUT;
 
-// Initialize variables
-$content['confirmed'] = '---';
-$content['sent']      = '---';
-$content['receive']  = '---';
-
-// Only user >= v0.1.2: Fetch confirmed mails counter
-if (isExtensionInstalledAndNewer('user', '0.1.2')) {
-       $add = '';
-       $content['confirmed'] = getUserData('mails_confirmed');
-
-       if (isExtensionInstalledAndNewer('user', '0.1.4')) {
-               $content['sent']     = getUserData('emails_sent');
-               $content['receive'] = getUserData('emails_received');
-       } // END - if
-
-       // Please update the user extension if you see 3 dashes
-       if (empty($content['sent']))     $content['sent']     = '---';
-       if (empty($content['receive'])) $content['receive'] = '---';
-} else {
-       // Please update!
-       $content['confirmed'] = '---';
-}
-
-// If TLOCK is 0 add 3 zeros for floating
-if ($content['total_locked'] == '0') $content['total_locked'] = '0.00000';
-
 // Remember several values in constants
 $content['total_points']  = ($content['total_points'] - getUserData('used_points'));
 
@@ -161,13 +135,13 @@ if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active
 $content['special_rows'] = '';
 
 // Display login bonus and turbo-click bonus
-if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) {
+if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (isBonusRallyeActive())) {
        // Total bonus points
        $content['total'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
 
        // Output rows
        $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content);
-} elseif ((isExtensionActive('bonus')) && (getConfig('bonus_active') != 'Y')) {
+} elseif ((isExtensionActive('bonus')) && (!isBonusRallyeActive())) {
        // Bonus active rallye deactivated
        $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true);
 } elseif ((isAdmin()) && (isExtensionOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) {