Several fixes/cleanups

[mailer.git] / inc / reset / reset_birthday.php

diff --git a/inc/reset/reset_birthday.php b/inc/reset/reset_birthday.php
index dfadfaca9f0908ec20e1f2c8826aed309d4b9be7..e793ee1ab5b2625779e9349cf390a92dfbdabb57 100644 (file)
--- a/inc/reset/reset_birthday.php
+++ b/inc/reset/reset_birthday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/24/2009 *
- * ===============                              Last change: 10/24/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 10/24/2009 *
+ * ===================                          Last change: 10/24/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_birthday.php                               *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,7 +56,7 @@ $year  = date('Y', time());
 // 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_TIMESTAP() - %s)";
+       $add = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
        $value = getConfig('ap_inactive_since');
 } // END - if
 
@@ -69,7 +70,8 @@ WHERE
        `birth_month`=%s AND
        `birthday_sent` < (UNIX_TIMESTAMP() - ".(getConfig('ONE_DAY') * 364).")
        ".$add."
-ORDER BY `userid` ASC",
+ORDER BY
+       `userid` ASC",
        array($day, $month, $value), __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result_birthday) > 0) {
@@ -85,17 +87,19 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                if (getConfig('birthday_points') > 0) {
                        // 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'] .= generateRandomCode("8", mt_rand(0, $month.$day), $content['userid'], ($age * ($idx + 1)));
+                       for ($idx = '0'; $idx < 4; $idx++) {
+                               $content['check'] .= generateRandomCode('8', mt_rand(0, $month.$day), $content['userid'], ($age * ($idx + 1)));
                        } // END - for
 
                        // Insert row into database
-                       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__);
+                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_birthday` (`userid`, `points`, `chk_value`) VALUES (%s,{?birthday_points?},'%s' )",
+                               array(
+                                       bigintval($content['userid']),
+                                       $content['check']
+                               ), __FILE__, __LINE__);
 
                        // Load email template with confirmation link
                        $message = loadEmailTemplate('member_birthday_confirm', $content, bigintval($content['userid']));
@@ -105,7 +109,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                }
 
                // Send email
-               sendEmail($content['email'], getMessage('HAPPY_BIRTHDAY'), $message);
+               sendEmail($content['email'], getMessage('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",
@@ -113,7 +117,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       SQL_FREERESULT($result_birthday);
 }
 
 // [EOF]