X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_birthday.php;h=9f02208566e3b5e628f51b0fb316f3383b2f00dc;hb=d6a5c97084d5e8f253b3f020db29494ab549e52f;hp=5b6ccb8106183a9b41a3e167030273ee9a8020ab;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index 5b6ccb8106..9f02208566 100644
--- 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                               *
@@ -40,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...
@@ -68,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",
@@ -109,7 +108,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
 		}
 
 		// Send email
-		sendEmail($content['email'], getMessage('HAPPY_BIRTHDAY_SUBJECT'), $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]
 ?>