All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[mailer.git] / inc / mails / birthday_mails.php

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 634e41d3ba91cc5fc292692bbc1af6b02cf5c0a7..0a69e1c09ed01ac7e256086bee540e18f3fe7885 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -35,13 +35,13 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("birthday")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "birthday");
+} elseif (!EXT_IS_ACTIVE("birthday")) {
        return;
 }
 
 // Do not execute when script is in CSS mode
-if ($CSS == 1) return;
+global $CSS;
+if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 
 // Get current day (01 to 31), month (01 to 12) and year (4-digits year)
 $DAY   = date("d", time());
@@ -50,15 +50,15 @@ $YEAR  = date('Y', time());
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";
-if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+if ((getConfig('birthday_active')) && (EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
        $ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
-       $VALUE = $_CONFIG['ap_inactive_since'];
+       $VALUE = getConfig('ap_inactive_since');
 }
 
 // Only confirmed members shall receive birthday mails...
 $result_birthday = SQL_QUERY_ESC("SELECT userid, email, birth_year
-FROM "._MYSQL_PREFIX."_user_data
-WHERE status='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(ONE_DAY * 364).")".$ADD."
+FROM `{!MYSQL_PREFIX!}_user_data`
+WHERE status='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(getConfig('one_day') * 364).")".$ADD."
 ORDER BY userid",
  array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);
 
@@ -72,21 +72,21 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                // Simply subtract both values and you got the age... :)
                $AGE = $NOW - $BD;
 
-               if ($_CONFIG['birthday_points'] > 0) {
+               if (getConfig('birthday_points') > 0) {
                        // Prepare array for loading template
                        $content = array(
                                'age'    => $AGE,
-                               'points' => $_CONFIG['birthday_points'],
+                               'points' => TRANSLATE_COMMA(getConfig('birthday_points')),
                                'check'  => "",
                        );
 
                        for ($idx = 0; $idx < 4; $idx++) {
-                               $content['check'] .= GEN_RANDOM_CODE("8", rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
+                               $content['check'] .= GEN_RANDOM_CODE("8", mt_rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
                        }
 
                        // Insert row into database
-                       $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_birthday (userid, points, chk_value) VALUES ('%s', '%s', '%s' )",
-                        array(bigintval($uid), $_CONFIG['birthday_points'], $content['check']), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_birthday` (userid, points, chk_value) VALUES ('%s','%s','%s' )",
+                               array(bigintval($uid), getConfig('birthday_points'), $content['check']), __FILE__, __LINE__);
 
                        // Load email template with confirmation link
                        $msg = LOAD_EMAIL_TEMPLATE("member_birthday_confirm", $content, bigintval($uid));
@@ -96,11 +96,11 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                }
 
                // Send email
-               SEND_EMAIL($email, HAPPY_BIRTHDAY, $msg);
+               SEND_EMAIL($uid, HAPPY_BIRTHDAY, $msg);
 
                // Remember him that he has received a birthday mail
-               $result_bd = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET birthday_sent=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
-                array(bigintval($uid)), __FILE__, __LINE__);
+               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET birthday_sent=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+                       array(bigintval($uid)), __FILE__, __LINE__);
        }
 
        // Free memory