Even more language strings renamed

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 500f9f23d471c6e37bc6eee3dc638bc97288bcb1..0210ff69b6937235db61045d930546db0e8bf4d6 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('bonus')) {
@@ -49,16 +49,16 @@ if (!defined('__SECURITY')) {
 }
 
 // Get current month (2 digits)
-$curr = date('m', time());
+$curr = getMonth();
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getScriptOutputMode() != 1)) {
        // 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 +79,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
+       $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 +100,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