X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fbirthday_mails.php;h=4cc3ef182b9b4d84573a6519581c16616eacee38;hb=dd8fc196a7dc531588f421cf631147883a472466;hp=f843766557d0def1fd54188f51dff12684d23370;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c;p=mailer.git

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index f843766557..4cc3ef182b 100644
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Geburtstagsmails                       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,75 +38,73 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-} elseif (!EXT_IS_ACTIVE("birthday")) {
+} elseif (!EXT_IS_ACTIVE('birthday')) {
 	return;
 }
 
 // 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());
-$MONTH = date("m", time());
-$YEAR  = date('Y', time());
+$day   = date('d', time());
+$month = date('m', time());
+$year  = date('Y', time());
 
 // Shall I include only active members?
-$ADD = "%s"; $VALUE = "";
-if ((getConfig('birthday_active')) && (EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
-	$ADD = " AND last_online >= (UNIX_TIMESTAP() - %s)";
-	$VALUE = getConfig('ap_inactive_since');
+$add = "%s"; $value = '';
+if ((getConfig('birthday_active')) && (EXT_IS_ACTIVE('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
+	$add = " AND `last_online` >= (UNIX_TIMESTAP() - %s)";
+	$value = getConfig('ap_inactive_since');
 }
 
 // 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."
-ORDER BY userid",
- array($DAY, $MONTH, $VALUE), __FILE__, __LINE__);
+WHERE `status`='CONFIRMED' AND birth_day=%s AND birth_month=%s AND birthday_sent < (UNIX_TIMESTAMP() - ".(getConfig('one_day') * 364).")".$add."
+ORDER BY `userid` ASC",
+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;
-		$NOW = $YEAR  + 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;
+		$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'] = translateComma(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'] .= generateRandomCode("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__);
+			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);
+		sendEmail($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__);
-	}
+		array(bigintval($content['userid'])), __FILE__, __LINE__);
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);