More rewrites to make use of (cached) wrapper functions

[mailer.git] / inc / reset / reset_birthday.php

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index 26670089d63dee92265d78ba6d868bfd2c73d827..9f02208566e3b5e628f51b0fb316f3383b2f00dc 100644 (file)
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/24/2009 *
- * ===================                          Last change: 10/24/2009 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_birthday.php                               *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,24 +40,23 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+       // Do not execute when script is in CSS mode
+       return;
 } elseif (!isExtensionActive('birthday')) {
+       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }
 
-// Do not execute when script is in CSS mode
-if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // Get current day (01 to 31), month (01 to 12) and year (4-digits year)
-$day   = date('d', time());
-$month = date('m', time());
-$year  = date('Y', time());
+$day   = getDay();
+$month = getMonth();
+$year  = getYear();
 
 // Shall I include only active members?
-$add = "%s"; $value = '';
-if ((getConfig('birthday_active')) && (isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
-       $add = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
-       $value = getConfig('ap_inactive_since');
+$add = '%s'; $value = '';
+if ((getConfig('birthday_active')) && (isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
+       $add = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
 } // END - if
 
 // Only confirmed members shall receive birthday mails...
@@ -67,7 +67,7 @@ WHERE
        `status`='CONFIRMED' AND
        `birth_day`=%s AND
        `birth_month`=%s AND
-       `birthday_sent` < (UNIX_TIMESTAMP() - ".(getConfig('ONE_DAY') * 364).")
+       `birthday_sent` < (UNIX_TIMESTAMP() - ({?ONE_DAY?} * 364))
        ".$add."
 ORDER BY
        `userid` ASC",
@@ -86,12 +86,11 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                if (getConfig('birthday_points') > 0) {
                        // Add more entries to the array
                        $content['age']    = $age;
-                       $content['points'] = translateComma(getConfig('birthday_points'));
                        $content['check']  = '';
 
                        // @TODO 4 is hard-coded here, should we move it out in config?
                        for ($idx = '0'; $idx < 4; $idx++) {
-                               $content['check'] .= generateRandomCode("8", mt_rand(0, $month.$day), $content['userid'], ($age * ($idx + 1)));
+                               $content['check'] .= generateRandomCode('8', mt_rand(0, $month.$day), $content['userid'], ($age * ($idx + 1)));
                        } // END - for
 
                        // Insert row into database
@@ -109,7 +108,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                }
 
                // Send email
-               sendEmail($content['email'], getMessage('HAPPY_BIRTHDAY'), $message);
+               sendEmail($content['email'], '{--HAPPY_BIRTHDAY_SUBJECT--}', $message);
 
                // Remember him that he has received a birthday mail
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `birthday_sent`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
@@ -117,8 +116,8 @@ if (SQL_NUMROWS($result_birthday) > 0) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
-}
+       SQL_FREERESULT($result_birthday);
+} // END - if
 
 // [EOF]
 ?>