Renamed function so it might be more understandable

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

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 94327060363f3190c4bf580898b34fa8f28c0c4a..5507e0aa42b391a4287186e17d43949035ff195c 100644 (file)
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -15,8 +15,6 @@
  * $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 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -41,7 +39,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((getOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
        // Do not execute when script is in CSS mode or no daily reset
        return;
 } elseif (!isExtensionActive('profile')) {
@@ -49,25 +47,32 @@ if (!defined('__SECURITY')) {
        return;
 }
 
-if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
+if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
        // Load personal data
-       $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `last_update`, `joined`
+       $result = SQL_QUERY("SELECT
+       `userid`, `email`, `last_update`, `joined`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       (`last_update` < (UNIX_TIMESTAMP() - %s) AND `last_update` != 0 AND `last_profile_sent` < (UNIX_TIMESTAMP() - %s))
-OR
-       (`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - %s))
+       `status`='CONFIRMED' AND (
+               (
+                       `last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
+                       `last_update` > 0 AND
+                       `last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?})
+               ) OR (
+                       `last_update` = 0 AND
+                       `last_profile_sent` = 0 AND
+                       `joined` < (UNIX_TIMESTAMP() - {?profile_update?})
+               )
+       )
 ORDER BY
-       `userid` ASC",
-               array(
-                       getConfig('profile_update'),
-                       getConfig('resend_profile_update'),
-                       getConfig('profile_update')
-               ), __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        // Do we have some notifications to sent?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // We need to send-out notifications...
                while ($content = SQL_FETCHARRAY($result)) {
                        // Translate timestamp
@@ -75,15 +80,15 @@ ORDER BY
 
                        if (round($content['last_update']) == '0') {
                                // Has never changed his accont
-                               $content['last_update'] = getMessage('PROFILE_NEVER_CHANGED');
+                               $content['last_update'] = '{--MEMBER_PROFILE_NEVER_CHANGED--}';
                        } else {
                                // Has changed his account
                                $content['last_update'] = generateDateTime($content['last_update'], 0);
                        }
 
                        // Load email template and send mail away
-                       $message = loadEmailTemplate('profile-updte', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('PROFILE_OUTDATED'), $message);
+                       $message = loadEmailTemplate('member_profile', $content, bigintval($content['userid']));
+                       sendEmail($content['email'], '{--MEMBER_PROFILE_OUTDATED_SUBJECT--}', $message);
 
                        // Update profile data
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_profile_sent`=UNIX_TIMESTAMP(), `notified`='Y' WHERE `userid`=%s LIMIT 1",
@@ -93,7 +98,10 @@ ORDER BY
 
        // Free result
        SQL_FREERESULT($result);
-}
+} // END - if
+
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
 
 // [EOF]
 ?>