Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

[mailer.git] / inc / daily / daily_profile.php

diff --git a/inc/daily/daily_profile.php b/inc/daily/daily_profile.php
index dac81b696fd8fb9bf12159621f599f236f969664..97a34f5ab52c1ac69683878a9a74bc4697c33e41 100644 (file)
--- a/inc/daily/daily_profile.php
+++ b/inc/daily/daily_profile.php
@@ -17,8 +17,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -53,42 +53,46 @@ if (!defined('__SECURITY')) {
 if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
        // Load personal data
        $result = SQL_QUERY("SELECT
-       `userid`, `email`, `last_update`, `joined`
+       `userid`,
+       `email`,
+       `last_update`,
+       `joined`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED' AND (
+       `status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND (
                (
-                       `last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
+                       (UNIX_TIMESTAMP() - `last_update`) >= {?profile_update?} AND
                        `last_update` > 0 AND
-                       `last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?})
+                       (UNIX_TIMESTAMP() - `last_profile_sent`) >= {?resend_profile_update?}
                ) OR (
                        `last_update` = 0 AND
                        `last_profile_sent` = 0 AND
-                       `joined` < (UNIX_TIMESTAMP() - {?profile_update?})
+                       (UNIX_TIMESTAMP() - `joined`) >= {?profile_update?}
                )
        )
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-       // Do we have some notifications to sent?
+       // Are there some notifications to sent?
        if (!SQL_HASZERONUMS($result)) {
                // We need to send-out notifications...
                while ($content = SQL_FETCHARRAY($result)) {
                        // Translate timestamp
-                       $content['joined'] = generateDateTime($content['joined'], 0);
+                       $content['joined'] = generateDateTime($content['joined'], '0');
 
                        if (round($content['last_update']) == '0') {
                                // Has never changed his accont
                                $content['last_update'] = '{--MEMBER_PROFILE_NEVER_CHANGED--}';
                        } else {
                                // Has changed his account
-                               $content['last_update'] = generateDateTime($content['last_update'], 0);
+                               $content['last_update'] = generateDateTime($content['last_update'], '0');
                        }
 
                        // Load email template and send mail away
                        $message = loadEmailTemplate('member_profile', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], '{--MEMBER_PROFILE_OUTDATED_SUBJECT--}', $message);
+                       sendEmail($content['userid'], '{--MEMBER_PROFILE_OUTDATED_SUBJECT--}', $message);
 
                        // Update profile data
                        SQL_QUERY_ESC("UPDATE