X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_birthday.php;h=3eeee01dfda03c5aa609eae9e3a8f6e7ad3b5354;hb=19188207e6802b82a134b340408cfa34b9b3a80f;hp=ea3f2a4905672546d318b388adcc9366e279d76e;hpb=995488beda665a1fc3de65df95f2d1ae236d1245;p=mailer.git

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index ea3f2a4905..3eeee01dfd 100644
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
 	// Do not execute when script is in CSS mode
 	return;
 } elseif (!isExtensionActive('birthday')) {
@@ -49,15 +49,14 @@ if (!defined('__SECURITY')) {
 }
 
 // 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'], '{--MEMBER_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",