Notification mails rewritten

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index f4e465fb585342d050283271a33d2349fc0e9a9c..2b18fb308db7ce2fff6269027a4b52dd15becf39 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -32,19 +32,16 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN()))
-{
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+} elseif (!EXT_IS_ACTIVE("bonus")) {
        return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!isBooleanConstantAndTrue('__DAILY_RESET'))) return;
+if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+//* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
 $curr = date("m", time());
@@ -53,37 +50,38 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
 {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE status='CONFIRMED'";
-       $whereStatement2 = 0;
-       $whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
+       $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (EXT_IS_ACTIVE("autopurge"))
        {
                // Use last online stamp only when autopurge for inactive members is activated
-               if ($_CONFIG['ap_in_since'] > 0)
+               if ($_CONFIG['ap_inactive_since'] > 0)
                {
                        // Okay, include last online timestamp
-                       $whereStatement1 = "WHERE status='CONFIRMED' AND last_online >=";
-                       $whereStatement2 = bigintval(time() - $_CONFIG['ap_in_since']);
-                       $whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
+                       $whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
+                       $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
                }
        }
 
        // Add more bonus points here
-       $ADD = " AND (0";
+       $ADD = "";
        if ($_CONFIG['bonus_click_yn'] == "Y") $ADD .= " + turbo_bonus";
        if ($_CONFIG['bonus_login_yn'] == "Y") $ADD .= " + login_bonus";
        if ($_CONFIG['bonus_order_yn'] == "Y") $ADD .= " + bonus_order";
        if ($_CONFIG['bonus_stats_yn'] == "Y") $ADD .= " + bonus_stats";
        if ($_CONFIG['bonus_ref_yn']   == "Y") $ADD .= " + bonus_ref";
-       $ADD .= ") > 0";
+
+       if (!empty($ADD)) {
+               $ADD .= " AND (0".$ADD.") > 0";
+       } // END - if
 
        // SQL string to check for accounts
        $result_main = SQL_QUERY_ESC("SELECT userid, email, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS active_bonus
 FROM "._MYSQL_PREFIX."_user_data
-".$whereStatement1." %s".$ADD."
+".$whereStatement1."".$ADD."
 ORDER BY active_bonus DESC, userid LIMIT %s",
- array($whereStatement2, $whereStatement3), __FILE__, __LINE__);
+ array($whereStatement2), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_main) > 0)
        {
@@ -95,21 +93,13 @@ ORDER BY active_bonus DESC, userid LIMIT %s",
                        $UIDs .= ",'".$uid."'";
 
                        // Add points to user's account directly
-                       $result_data = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points
-SET points=points+%s WHERE ref_depth=0 AND userid=%s LIMIT 1",
- array($points, bigintval($uid)), __FILE__, __LINE__);
-
-                       // Update mediadata as well
-                       if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-                       {
-                               // Update database
-                               MEDIA_UPDATE_ENTRY(array("total_points"), "add", $points);
-                       }
+                       ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
 
                        // Load email template and email it away
                        $msg = LOAD_EMAIL_TEMPLATE("member_bonus", $points, bigintval($uid));
                        SEND_EMAIL($email, BONUS_MONTHLY_ONLINE_BONUS, $msg);
                }
+
                // Remove first commata
                $UIDs = substr($UIDs, 1);
 
@@ -121,7 +111,6 @@ SET points=points+%s WHERE ref_depth=0 AND userid=%s LIMIT 1",
                // Reset accounts
                $result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data
 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __FILE__, __LINE__);
-
        }
 
        // Free memory