Fixes and cleanups

[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 0c8129d11d2f89124b69b5f526b192b2695a0ff6..7b3524d3cdba3dfb0b3a7374b6c47be13cccc593 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 if (isBonusRallyeActive()) {
        // Shall I withdraw now?
-       if (isPostRequestParameterSet('withdraw')) {
+       if (isPostRequestElementSet('withdraw')) {
                // Okay, let's prepare...
                $curr = getMonth() - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
@@ -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 = '';
@@ -73,12 +71,15 @@ if (isBonusRallyeActive()) {
        // Autopurge installed?
        if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
                // Use last online timestamp to keep inactive members away from here
-               $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
+               $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
        } // END - if
 
        // 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`,
+       " . $USE . " AS `points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -92,14 +93,16 @@ 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'];
 
                        // Generate array fore the dynamic template
                        $WIN1 = ''; $WIN2 = '';
-                       if ($count <= getConfig('bonus_ranks')) {
+                       if ($count <= getBonusRanks()) {
                                // Maybe he can win his active bonus?
                                $WIN1 = '<strong>';
                                $WIN2 = '</strong>';
@@ -108,9 +111,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['cnt']    = $count;
+                       $content['win1']        = $WIN1;
+                       $content['win2']        = $WIN2;
+                       $content['count']       = $count;
 
                        // Load template and add it
                        $OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
@@ -118,7 +121,7 @@ ORDER BY
                } // END - while
 
                $content['rows']  = $OUT;
-               $content['total'] = $total;
+               $content['total_points'] = $total;
 
                // Check if we need to display form or not with manuel withdraw
                if (getLastMonth() == getMonth()) {
@@ -134,7 +137,7 @@ ORDER BY
                if (isExtensionActive('autopurge')) {
                        $content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
                } else {
-                       $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
+                       $content['autopurge_timeout'] = '{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}';
                }
 
                // Load final template