New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / mails / birthday_mails.php

diff --git a/inc/mails/birthday_mails.php b/inc/mails/birthday_mails.php
index 81a49e97a389673ab38672a291fe60e1ee6c9bd1..bb5b53496ffea036f066bdda263fb2385878ee23 100644 (file)
--- a/inc/mails/birthday_mails.php
+++ b/inc/mails/birthday_mails.php
@@ -48,43 +48,43 @@ if (!defined('__SECURITY')) {
 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 = '';
+$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 = " 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__);
+ORDER BY `userid` ASC",
+       array($day, $month, $value), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result_birthday) > 0) {
        // Start sending out birthday mails
        while ($content = SQL_FETCHARRAY($result_birthday)) {
                // Calculate own timestamp for birthday and today
-               $BD  = $content['birth_year'] + 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) {
                        // Add more entries to the array
-                       $content['age']    = $AGE;
-                       $content['points'] = TRANSLATE_COMMA(getConfig('birthday_points'));
+                       $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'] .= generateRandomCodde("8", mt_rand(0, "$MONTH$DAY"), $content['userid'], ($AGE*($idx+1)));
+                               $content['check'] .= generateRandomCodde("8", mt_rand(0, $month.$day), $content['userid'], ($age * ($idx + 1)));
                        }
 
                        // Insert row into database
@@ -95,11 +95,11 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                        $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, $content['userid']);
+                       $msg = LOAD_EMAIL_TEMPLATE("member_birthday", $age, $content['userid']);
                }
 
                // Send email
-               SEND_EMAIL($content['email'], getMessage('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",