Convention applied to POINTS constant

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

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 1fa6a0c5a1caca6121a52ead2017b18877cc6f05..71a616909fae06d31aefc2e608b0a800ac51ff4c 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,7 +50,7 @@ $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 (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
        $ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
        $VALUE = $_CONFIG['ap_inactive_since'];
 }
@@ -96,7 +96,7 @@ 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",