More rewrites to make use of (cached) wrapper functions

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

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 9e8a052dccc126bfde96ba5b91467520d0cdbf60..16001ed8566ee68602f37c140d76cd35bbf6c660 100644 (file)
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.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: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_profile.php                                *
@@ -19,6 +19,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 *
@@ -40,41 +41,38 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
+} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+       // Do not execute when script is in CSS mode or no daily reset
+       return;
 } elseif (!isExtensionActive('profile')) {
+       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
        return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || (!isResetModeEnabled())) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
        // 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))
+       (`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() - %s))
+       (`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
                        $content['joined'] = generateDateTime($content['joined'], 0);
 
-                       if (round($content['last_update']) == 0) {
+                       if (round($content['last_update']) == '0') {
                                // Has never changed his accont
-                               $content['last_update'] = getMessage('PROFILE_NEVER_CHANGED');
+                               $content['last_update'] = '{--PROFILE_NEVER_CHANGED--}';
                        } else {
                                // Has changed his account
                                $content['last_update'] = generateDateTime($content['last_update'], 0);
@@ -82,7 +80,7 @@ ORDER BY
 
                        // Load email template and send mail away
                        $message = loadEmailTemplate('profile-updte', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('PROFILE_OUTDATED'), $message);
+                       sendEmail($content['email'], '{--PROFILE_OUTDATED--}', $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",