Same thing fixed, but without the opps ...

[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 7630af452acf3d02368c3ef9ed1fbb6e4ee73da4..ccc9fbd0a90b07dabfaffd346b6766a953cf88bc 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-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 *
@@ -50,20 +50,12 @@ if ((!isExtensionActive('bonus')) && (!isAdmin())) {
        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', '');
+$USE = '`turbo_bunus`';
+if (!empty($add)) {
+       $USE = '(0' . $add . ')';
+} // END - if
 
 // Init variables
 $lastOnline = '%s';
@@ -77,7 +69,9 @@ if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
 
 // Let's check if there are some points left we can 'pay'...
 $result = SQL_QUERY_ESC("SELECT
-       `userid`, ".$USE." AS `points`, `last_online`
+       `userid`,
+       ".$USE." AS `points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -86,8 +80,8 @@ WHERE
        " . $lastOnline . "
 ORDER BY
        `points` DESC,
-       last_online DESC,
-       userid ASC
+       `last_online` DESC,
+       `userid` ASC
 LIMIT {?bonus_ranks?}",
        array(
                $ONLINE