Extension 'ext-coupon' moved to branch, SQLs improved:

[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 6b655305faca120b977ce9e1b8caca0f84993522..2fc94b378ae610245231f27453fd96514b972215 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,14 +43,14 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('bonus')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 } // END - if
 
-if (getExtensionVersion('bonus') >= '0.6.9') {
+if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
        // Add more bonus points here
        // @TODO Rewrite this to a filter
        $USE = '(0';
@@ -67,51 +66,46 @@ if (getExtensionVersion('bonus') >= '0.6.9') {
 }
 
 // Autopurge installed?
-$lastOnline = "%s"; $ONLINE = '';
+$lastOnline = '%s'; $ONLINE = '';
 if (isExtensionActive('autopurge')) {
        // Use last online timestamp to keep inactive members away from here
-       $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
-       $ONLINE = getConfig('ap_inactive_since');
-}
+       $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?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`, ".$USE." AS `points`, `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       ".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline."
+       " . $USE . " > 0 AND
+       `status`='CONFIRMED'
+       " . $lastOnline . "
 ORDER BY
        `points` DESC,
        last_online DESC,
        userid ASC
-LIMIT %s",
+LIMIT {?bonus_ranks?}",
        array(
-               $ONLINE,
-               getConfig('bonus_ranks')
+               $ONLINE
        ), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = '';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // Load our winners...
-       $SW = 2; $cnt = 1;
+       $count = 1;
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
-               $content = array(
-                       'sw'     => $SW,
-                       'cnt'    => $cnt,
-                       'userid'    => bigintval($content['userid']),
-                       'points' => translateComma($content['points']),
-                       'last_online'   => generateDateTime($content['last_online'], 2)
-               );
+               $content['cnt']         = $count;
+               $content['last_online'] = generateDateTime($content['last_online'], 2);
 
                // Load row template
                $OUT .= loadTemplate('member_bonus_row', true, $content);
 
-               // Count one up and switch colors
-               $cnt++; $SW = 3 - $SW;
-       }
+               // Count one up
+               $count++;
+       } // END - while
 } else {
        // No one is interested in our "active rallye" ! :-(
        $OUT = loadTemplate('member_bonus_404', true);