A lot calls saved, expression language rewritten:

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

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 75542597049218dbc545a3630700c7877ad3b06e..2e664ec27bf1bec0968d47914ffdba7ea8d613ce 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Get current month (2 digits)
-$curr = date('m', time());
+$curr = getMonth();
 
 // Check if month is done
 if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getOutputMode() != 1)) {
@@ -65,7 +65,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
        // Let's check if there are some points left we can 'pay'...
        if (isExtensionActive('autopurge')) {
                // Use last online stamp only when autopurge for inactive members is activated
-               if ((getConfig('ap_inactive_since') > 0) && (getConfig('beg_active') == 'Y')) {
+               if ((getApInactiveSince() > 0) && (getConfig('beg_active') == 'Y')) {
                        // Okay, include last online timestamp
                        $whereStatement1 .= " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
                } // END - if
@@ -92,7 +92,7 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
                        // Load email template and email it away
                        $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $message);
+                       sendEmail($content['email'], '{--BEG_MONTHLY_RALLYE--}', $message);
                } // END - while
 
                // Reset accounts