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

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

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index 25b5bdce5577eb930160866f9f3bf756ceca9bb0..6a1e548af6ead9a09c43cc469600a689f59ba60b 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.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();
 }
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('beg')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('beg'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}');
        return;
 } // END - if
 
@@ -54,19 +54,22 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) {
 $lastOnline = '%s';
 $ONLINE = '';
 
-if (isExtensionActive('autopurge')) {
+if ((isExtensionActive('autopurge')) && (isBegActiveEnabled()) && ((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`, `beg_points`, `last_online`
+$result = sqlQueryEscaped("SELECT
+       `userid`,
+       `beg_points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `beg_points` > 0 AND
        `status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . "
        " . $lastOnline . "
 ORDER BY
        `beg_points` DESC,
@@ -79,38 +82,33 @@ LIMIT {?beg_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
-               // @TODO points->beg_points
-               $content = array(
-                       'cnt'         => $count,
-                       'userid'      => $content['userid'],
-                       'points'      => $content['beg_points'],
-                       'last_online' => generateDateTime($content['last_online'], 2),
-               );
+               $content['count']       = $count;
+               $content['last_online'] = generateDateTime($content['last_online'], '2');
 
                // Load row template
-               $OUT .= loadTemplate('member_list_beg_row', true, $content);
+               $OUT .= loadTemplate('member_list_beg_row', TRUE, $content);
 
                // Count one up
                $count++;
        } // END - while
 } else {
-       // No one is interested in our "active rallye" ! :-(
-       $OUT = loadTemplate('member_beg_404', true);
+       // No one is interested in our "begging rallye" ! :-(
+       $OUT = loadTemplate('member_beg_404', TRUE);
 }
 
 // Prepare content
 $content['rows'] = $OUT;
 
 // Free memory
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // Load final template
-loadTemplate('member_list_beg', false, $content);
+loadTemplate('member_list_beg', FALSE, $content);
 
 // [EOF]
 ?>