isAdmin() uses now for 'caching' its result

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 2bbe3d92017db5fa7d33de7f7904cc447c5629df..7ae9f44a17ea74ea69fc90d40bb0ec45f12b9c28 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -53,7 +53,6 @@ $curr = date('m', time());
 if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";
 if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";

-       $whereStatement2 = getConfig('bonus_ranks');

 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (isExtensionActive('autopurge')) {
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (isExtensionActive('autopurge')) {


@@ -61,34 +60,33 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (get
                if (getConfig('ap_inactive_since') > 0) {
                        // Okay, include last online timestamp
                        $whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
                if (getConfig('ap_inactive_since') > 0) {
                        // Okay, include last online timestamp
                        $whereStatement1 = "WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";

-                       $whereStatement2 = getConfig('bonus_ranks');

                } // END - if
        } // END - if
 
        // Add more bonus points here
        $add = '';
        // @TODO Rewrite this to a filter
                } // END - if
        } // END - if
 
        // Add more bonus points here
        $add = '';
        // @TODO Rewrite this to a filter

-       if (getConfig('bonus_click_yn') == 'Y') $add .= " + `turbo_bonus`";
-       if (getConfig('bonus_login_yn') == 'Y') $add .= " + `login_bonus`";
-       if (getConfig('bonus_order_yn') == 'Y') $add .= " + `bonus_order`";
-       if (getConfig('bonus_stats_yn') == 'Y') $add .= " + `bonus_stats`";
-       if (getConfig('bonus_ref_yn')   == 'Y') $add .= " + `bonus_ref`";
+       if (getConfig('bonus_click_yn') == 'Y') $add .= ' + `turbo_bonus`';
+       if (getConfig('bonus_login_yn') == 'Y') $add .= ' + `login_bonus`';
+       if (getConfig('bonus_order_yn') == 'Y') $add .= ' + `bonus_order`';
+       if (getConfig('bonus_stats_yn') == 'Y') $add .= ' + `bonus_stats`';
+       if (getConfig('bonus_ref_yn')   == 'Y') $add .= ' + `bonus_ref`';

 
        // Shall we add some entries?
        if (!empty($add)) {
 
        // Shall we add some entries?
        if (!empty($add)) {

-               $whereStatement1 .= " AND (0" . $add . ") > 0";
+               $whereStatement1 .= ' AND (0' . $add . ') > 0';

        } // END - if
 
        // Run SQL string to check for accounts
        } // END - if
 
        // Run SQL string to check for accounts

-       $result_main = SQL_QUERY_ESC("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`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`

-".$whereStatement1."".$add."
+" . $whereStatement1 . "

 ORDER BY
        `points` DESC,
        `userid` ASC
 ORDER BY
        `points` DESC,
        `userid` ASC

-LIMIT %s",
-               array($whereStatement2), __FILE__, __LINE__);
+LIMIT {?bonus_ranks?}", __FILE__, __LINE__);

 
        // Some entries were found?
        if (SQL_NUMROWS($result_main) > 0) {
 
        // Some entries were found?
        if (SQL_NUMROWS($result_main) > 0) {


@@ -104,12 +102,12 @@ LIMIT %s",
                                $content['points'] = translateComma($content['points']);
 
                                // Load email template and email it away
                                $content['points'] = translateComma($content['points']);
 
                                // Load email template and email it away

-                               $message = loadEmailTemplate('member_bonus', $content['points'], bigintval($content['userid']));
+                               $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));

                                sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
                        } // END - if
                } // END - while
 
                                sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
                        } // END - if
                } // END - while
 

-               // Reset accounts
+               // Reset all accounts

                $result = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data`
 SET
        `turbo_bonus`=0,
                $result = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data`
 SET
        `turbo_bonus`=0,