X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbirthday_mails.php;h=ca8ac5241476cef9bda411007593917a24f076b5;hb=fc7f4d7fd71c718503c2af305276f5a374ae24da;hp=6758f0343ddbb83470d7b4c7bfe8516eba7b0a80;hpb=143e78d4231adddd9e706cbf55ec5dd8c1651890;p=mailer.git

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 6758f0343d..ca8ac52414 100644
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -35,13 +35,13 @@
 if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-} elseif ((!EXT_IS_ACTIVE("birthday")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "birthday");
+} elseif (!EXT_IS_ACTIVE("birthday")) {
 	return;
 }
 
 // Do not execute when script is in CSS mode
-if ($CSS == 1) return;
+global $CSS;
+if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 
 // Get current day (01 to 31), month (01 to 12) and year (4-digits year)
 $DAY   = date("d", time());
@@ -50,7 +50,7 @@ $YEAR  = date('Y', time());
 
 // Shall I include only active members?
 $ADD = "%s"; $VALUE = "";
-if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
+if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) {
 	$ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
 	$VALUE = $_CONFIG['ap_inactive_since'];
 }
@@ -58,7 +58,7 @@ if (($_CONFIG['birthday_active']) && (EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['
 // 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 < (UNIX_TIMESTAMP() - ".(ONE_DAY * 364).")".$ADD."
+WHERE status='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".($_CONFIG['one_day'] * 364).")".$ADD."
 ORDER BY userid",
  array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);
 
@@ -76,12 +76,12 @@ if (SQL_NUMROWS($result_birthday) > 0) {
 			// Prepare array for loading template
 			$content = array(
 				'age'    => $AGE,
-				'points' => $_CONFIG['birthday_points'],
+				'points' => TRANSLATE_COMMA($_CONFIG['birthday_points']),
 				'check'  => "",
 			);
 
 			for ($idx = 0; $idx < 4; $idx++) {
-				$content['check'] .= GEN_RANDOM_CODE("8", rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
+				$content['check'] .= GEN_RANDOM_CODE("8", mt_rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
 			}
 
 			// Insert row into database
@@ -96,7 +96,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
 		}
 
 		// Send email
-		SEND_EMAIL($email, HAPPY_BIRTHDAY, $msg);
+		SEND_EMAIL($uid, HAPPY_BIRTHDAY, $msg);
 
 		// Remember him that he has received a birthday mail
 		$result_bd = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET birthday_sent=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",