Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[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 afd5af2f32b7f0fc169bcb3c35f46b862fd8cc79..bfc486f5bc438e13b750deba84663fc1363e0ea0 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 - 2015 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();
 }
@@ -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', '');
+$pointsColumns = '`turbo_bunus`';
+if (!empty($add)) {
+       $pointsColumns = '(0' . $add . ')';
+} // END - if
 
 // Init variables
 $lastOnline = '%s';
@@ -72,22 +64,25 @@ $ONLINE = '';
 // 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
 
 // Let's check if there are some points left we can 'pay'...
-$result = SQL_QUERY_ESC("SELECT
-       `userid`, ".$USE." AS `points`, `last_online`
+$result = sqlQueryEscaped("SELECT
+       `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
@@ -95,33 +90,33 @@ LIMIT {?bonus_ranks?}",
 
 // Reset temporary variable and check for users
 $OUT = '';
-if (!SQL_HASZERONUMS($result)) {
+if (!ifSqlHasZeroNumRows($result)) {
        // Load our winners...
        $count = 1;
-       while ($content = SQL_FETCHARRAY($result)) {
+       while ($content = sqlFetchArray($result)) {
                // Prepare data for the template
                $content['count']       = $count;
                $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template
-               $OUT .= loadTemplate('member_bonus_row', true, $content);
+               $OUT .= loadTemplate('member_bonus_row', TRUE, $content);
 
                // Count one up
                $count++;
        } // END - while
 } else {
        // No one is interested in our "active rallye" ! :-(
-       $OUT = loadTemplate('member_bonus_404', true);
+       $OUT = loadTemplate('member_bonus_404', TRUE);
 }
 
 // Free memory
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // Prepare content array
 $content['rows'] = $OUT;
 
 // Load final template
-loadTemplate('member_bonus', false, $content);
+loadTemplate('member_bonus', FALSE, $content);
 
 // [EOF]
 ?>