A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 2dace09bf4e719390edaa52a6ab4990b428b3876..085c941d54a8dd3723e07357ead14bb727081370 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -53,19 +53,17 @@ if (isBonusRallyeActive()) {
                displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
        } // END - if
 
-       if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
+       // Old version ???
+       $USE = '`turbo_bonus`';
+
+       // Run filter chain to find more columns
+       $add = runFilterChain('add_bonus_points_user_columns', '');
+
+       // Add them, if some where configured
+       if (!empty($add)) {
                // Add more bonus points here
-               $USE = '(0';
-               if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
-               if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`';
-               if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`';
-               if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`';
-               if (getConfig('bonus_ref_yn')   == 'Y') $USE .= ' + `bonus_ref`';
-               $USE .= ')';
-       } else {
-               // Old version ???
-               $USE = '`turbo_bonus`';
-       }
+               $USE = '(0' . $add . ')';
+       } // END - if
 
        // Init variables
        $lastOnline = '';
@@ -78,7 +76,13 @@ if (isBonusRallyeActive()) {
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY("SELECT
-       `userid`, `email`, `gender`, `surname`, `family`, " . $USE . " AS `points`, `last_online`
+       `userid`,
+       `email`,
+       `gender`,
+       `surname`,
+       `family`,
+       " . $USE . " AS `points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -92,7 +96,9 @@ ORDER BY
 
        if (!SQL_HASZERONUMS($result)) {
                // List users
-               $OUT = ''; $count = 1; $total = '0';
+               $OUT   = '';
+               $count = 1;
+               $total = '0';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Add total points
                        $total += $content['points'];
@@ -108,9 +114,9 @@ ORDER BY
                        // Prepare content
                        $content['email']       = generateEmailLink($content['email'], 'user_data');
                        $content['last_online'] = generateDateTime($content['last_online'], 2);
-                       $content['win1']   = $WIN1;
-                       $content['win2']   = $WIN2;
-                       $content['count']  = $count;
+                       $content['win1']        = $WIN1;
+                       $content['win2']        = $WIN2;
+                       $content['count']       = $count;
 
                        // Load template and add it
                        $OUT .= loadTemplate('admin_list_bonus_rows', true, $content);