Next wave of lesser getMessage() usage and more EL

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

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index 9836603297d60c0ad571a153c4b1f9ed5798319c..e2a95fd4710ba79c525a817945410cca9486676c 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 ((getOutputMode() != 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());
 
 // Shall I include only active members?
-$add = "%s"; $value = '';
+$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 = " 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,7 +86,6 @@ 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?
@@ -117,8 +116,8 @@ if (SQL_NUMROWS($result_birthday) > 0) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
-}
+       SQL_FREERESULT($result_birthday);
+} // END - if
 
 // [EOF]
 ?>