X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmails%2Fbirthday_mails.php;h=408dec534c89af3122e9ab18311293320da00a99;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hp=0a69e1c09ed01ac7e256086bee540e18f3fe7885;hpb=cca98f57dff720b174d21d071cee8303462485d7;p=mailer.git

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 0a69e1c09e..408dec534c 100644
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -40,8 +40,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-global $CSS;
-if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled())) return;
 
 // Get current day (01 to 31), month (01 to 12) and year (4-digits year)
 $DAY   = date("d", time());
@@ -57,51 +56,50 @@ if ((getConfig('birthday_active')) && (EXT_IS_ACTIVE("autopurge")) && (getConfig
 
 // 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() - ".(getConfig('one_day') * 364).")".$ADD."
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `status`='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(getConfig('one_day') * 364).")".$ADD."
 ORDER BY userid",
  array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result_birthday) > 0) {
 	// Start sending out birthday mails
-	while (list($uid, $email, $byear) = SQL_FETCHROW($result_birthday)) {
+	while ($content = SQL_FETCHARRAY($result_birthday)) {
 		// Calculate own timestamp for birthday and today
-		$BD  = $byear + 12 * $MONTH + 365 * $DAY;
+		$BD  = $content['birth_year'] + 12 * $MONTH + 365 * $DAY;
 		$NOW = $YEAR  + 12 * $MONTH + 365 * $DAY;
 
 		// Simply subtract both values and you got the age... :)
 		$AGE = $NOW - $BD;
 
 		if (getConfig('birthday_points') > 0) {
-			// Prepare array for loading template
-			$content = array(
-				'age'    => $AGE,
-				'points' => TRANSLATE_COMMA(getConfig('birthday_points')),
-				'check'  => "",
-			);
+			// Add more entries to the array
+			$content['age']    = $AGE;
+			$content['points'] = TRANSLATE_COMMA(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'] .= GEN_RANDOM_CODE("8", mt_rand(0, "$MONTH$DAY"), $uid, ($AGE*($idx+1)));
+				$content['check'] .= generateRandomCodde("8", mt_rand(0, "$MONTH$DAY"), $content['userid'], ($AGE*($idx+1)));
 			}
 
 			// Insert row into database
-			SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_user_birthday` (userid, points, chk_value) VALUES ('%s','%s','%s' )",
-				array(bigintval($uid), getConfig('birthday_points'), $content['check']), __FILE__, __LINE__);
+			SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_birthday` (userid, points, chk_value) VALUES ('%s','%s','%s' )",
+				array(bigintval($content['userid']), getConfig('birthday_points'), $content['check']), __FILE__, __LINE__);
 
 			// Load email template with confirmation link
-			$msg = LOAD_EMAIL_TEMPLATE("member_birthday_confirm", $content, bigintval($uid));
+			$msg = LOAD_EMAIL_TEMPLATE("member_birthday_confirm", $content, bigintval($content['userid']));
 		} else {
 			// Load default email template and fill in the age
-			$msg = LOAD_EMAIL_TEMPLATE("member_birthday", $AGE, $uid);
+			$msg = LOAD_EMAIL_TEMPLATE("member_birthday", $AGE, $content['userid']);
 		}
 
 		// Send email
-		SEND_EMAIL($uid, HAPPY_BIRTHDAY, $msg);
+		SEND_EMAIL($content['email'], getMessage('HAPPY_BIRTHDAY'), $msg);
 
 		// 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",
-			array(bigintval($uid)), __FILE__, __LINE__);
-	}
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET birthday_sent=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
+			array(bigintval($content['userid'])), __FILE__, __LINE__);
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);