Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

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

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 2fc94b378ae610245231f27453fd96514b972215..ee31c8b790e0037ba8d25a17b866198ea346b846 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
@@ -46,45 +46,43 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bonus')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}');
        return;
 } // END - if
 
-if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
-       // Add more bonus points here
-       // @TODO Rewrite this to a filter
-       $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`';
-}
+// Add more bonus points here
+$add = runFilterChain('add_bonus_points_user_columns', '');
+$pointsColumns = '`turbo_bunus`';
+if (!empty($add)) {
+       $pointsColumns = '(0' . $add . ')';
+} // END - if
+
+// Init variables
+$lastOnline = '%s';
+$ONLINE = '';
 
 // Autopurge installed?
-$lastOnline = '%s'; $ONLINE = '';
-if (isExtensionActive('autopurge')) {
+if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
        // Use last online timestamp to keep inactive members away from here
-       $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
+       $lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
 } // END - if
 
 // Let's check if there are some points left we can 'pay'...
 $result = SQL_QUERY_ESC("SELECT
-       `userid`, ".$USE." AS `points`, `last_online`
+       `userid`,
+       ".$pointsColumns." AS `points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       " . $USE . " > 0 AND
+       " . $pointsColumns . " > 0 AND
        `status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . "
        " . $lastOnline . "
 ORDER BY
        `points` DESC,
-       last_online DESC,
-       userid ASC
+       `last_online` DESC,
+       `userid` ASC
 LIMIT {?bonus_ranks?}",
        array(
                $ONLINE
@@ -97,8 +95,8 @@ if (!SQL_HASZERONUMS($result)) {
        $count = 1;
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
-               $content['cnt']         = $count;
-               $content['last_online'] = generateDateTime($content['last_online'], 2);
+               $content['count']       = $count;
+               $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template
                $OUT .= loadTemplate('member_bonus_row', true, $content);