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

[mailer.git] / inc / monthly / monthly_bonus.php

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index cb010de05e74c2545ff4d830b30cc96be63a2297..ca916cb6bc5cffa5d892d51261882d19732c1a93 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -14,11 +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, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -40,25 +38,25 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
+       // Do not execute when script is in CSS mode or no hourly reset
        return;
 } elseif (!isExtensionActive('bonus')) {
        logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }
 
-// Get current month (2 digits)
-$curr = getMonth();
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
+if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (isExtensionActive('autopurge')) {
                // Use last online stamp only when autopurge for inactive members is activated
-               if (getConfig('ap_inactive_since') > 0) {
+               if (getApInactiveSince() > 0) {
                        // Okay, include last online timestamp
                        $whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
                } // END - if
@@ -79,18 +77,18 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (get
        } // END - if
 
        // Run SQL string to check for accounts
-       $result_main = SQL_QUERY("SELECT
-       `userid`, `email`, `gender`, `surname`, `family`, (0" . $add . ") AS points
+       $result_main = SQL_QUERY('SELECT
+       `userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
-" . $whereStatement1 . "
+' . $whereStatement1 . '
 ORDER BY
        `points` DESC,
        `userid` ASC
-LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
+LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
 
        // Some entries were found?
-       if (SQL_NUMROWS($result_main) > 0) {
+       if (!SQL_HASZERONUMS($result_main)) {
                // Load our winners...
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Make sure zero points are not mailed
@@ -100,7 +98,7 @@ LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-                               sendEmail($content['email'], '{--BONUS_MONTHLY_ONLINE_BONUS--}', $message);
+                               sendEmail($content['email'], '{--MEMBER_MONTHLY_BONUS_WON_SUBJECT--}', $message);
                        } // END - if
                } // END - while
 
@@ -118,5 +116,8 @@ SET
        SQL_FREERESULT($result_main);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>