More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

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

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 0d3e2ef4a2c3a20768587ef21c3bc02d91ab9f88..634e41d3ba91cc5fc292692bbc1af6b02cf5c0a7 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // 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("birthday")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("birthday")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "birthday");
        return;
 }
@@ -53,41 +50,37 @@ $YEAR  = date('Y', time());
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";
-if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_in_since'] > 0) && ($_CONFIG['ap_inactive'] == "Y"))
-{
-       $ADD = " AND last_online >= %d";
-       $VALUE = bigintval(time() - $_CONFIG['ap_in_since']);
+if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+       $ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
+       $VALUE = $_CONFIG['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 < ".(time() - (ONE_DAY*364)).$ADD."
+WHERE status='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(ONE_DAY * 364).")".$ADD."
 ORDER BY userid",
  array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result_birthday) > 0)
-{
+if (SQL_NUMROWS($result_birthday) > 0) {
        // Start sending out birthday mails
-       while (list($uid, $email, $byear) = SQL_FETCHROW($result_birthday))
-       {
+       while (list($uid, $email, $byear) = SQL_FETCHROW($result_birthday)) {
                // Calculate own timestamp for birthday and today
-               $BD  = $byear + 12*$MONTH + 365*$DAY;
-               $NOW = $YEAR  + 12*$MONTH + 365*$DAY;
+               $BD  = $byear + 12 * $MONTH + 365 * $DAY;
+               $NOW = $YEAR  + 12 * $MONTH + 365 * $DAY;
 
                // Simply subtract both values and you got the age... :)
                $AGE = $NOW - $BD;
 
-               if ($_CONFIG['birthday_points'] > 0)
-               {
+               if ($_CONFIG['birthday_points'] > 0) {
                        // Prepare array for loading template
                        $content = array(
                                'age'    => $AGE,
                                'points' => $_CONFIG['birthday_points'],
                                'check'  => "",
                        );
-                       for ($idx = 0; $idx < 4; $idx++)
-                       {
+
+                       for ($idx = 0; $idx < 4; $idx++) {
                                $content['check'] .= GEN_RANDOM_CODE("8", rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
                        }
 
@@ -97,9 +90,7 @@ if (SQL_NUMROWS($result_birthday) > 0)
 
                        // Load email template with confirmation link
                        $msg = LOAD_EMAIL_TEMPLATE("member_birthday_confirm", $content, bigintval($uid));
-               }
-                else
-               {
+               } else {
                        // Load default email template and fill in the age
                        $msg = LOAD_EMAIL_TEMPLATE("member_birthday", $AGE, $uid);
                }