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 0a57a3aeffb57972aa87a76bf9e3587fce421790..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                    *
@@ -49,19 +47,29 @@ if (!defined('__SECURITY')) {
        return;
 }
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
+
 if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
        // Load personal data
-       $result = SQL_QUERY('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() - {?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?}))
+       `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', __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        // Do we have some notifications to sent?
        if (!SQL_HASZERONUMS($result)) {
@@ -92,5 +100,8 @@ ORDER BY
        SQL_FREERESULT($result);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');
+
 // [EOF]
 ?>