New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

[mailer.git] / inc / profile-updte.php

diff --git a/inc/profile-updte.php b/inc/profile-updte.php
index dbb6d06256f883ff2079cdb56d57b234bdedf0c2..ca85ac4d330235dbe37dbe2434ab6932020adbb6 100644 (file)
--- a/inc/profile-updte.php
+++ b/inc/profile-updte.php
@@ -39,41 +39,43 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
-if ((getConfig('send_prof_update') == "Y") && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
-       // Load personal data              0      1     2      3        4          5         6
-       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, last_update, joined
+if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
+       // Load personal data              0      1        2          3
+       $result = SQL_QUERY_ESC("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))
-ORDER BY userid", array(getConfig('profile_update'), getConfig('resend_profile_update'), getConfig('profile_update')), __FILE__, __LINE__);
+ORDER BY `userid` ASC", array(getConfig('profile_update'), getConfig('resend_profile_update'), getConfig('profile_update')), __FILE__, __LINE__);
 
        // Do we have some notifications to sent?
        if (SQL_NUMROWS($result) > 0) {
                // We need to send-out notifications...
-               while ($DATA = SQL_FETCHROW($result)) {
-                       $DATA[6] = MAKE_DATETIME($DATA[6], "0");
-                       if (round($DATA[5]) == "0") {
+               while ($content = SQL_FETCHARRAY($result)) {
+                       // Translate timestamp
+                       $content['joined'] = generateDateTime($content['joined'], '0');
+
+                       if (round($content['last_update']) == '0') {
                                // Has never changed his accont
-                               $DATA[5] = PROFILE_NEVER_CHANGED;
+                               $content['last_update'] = getMessage('PROFILE_NEVER_CHANGED');
                        } else {
                                // Has changed his account
-                               $DATA[5] = MAKE_DATETIME($DATA[5], "0");
+                               $content['last_update'] = generateDateTime($content['last_update'], '0');
                        }
 
                        // Load email template and send mail away
-                       $msg = LOAD_EMAIL_TEMPLATE("profile-updte", "", bigintval($DATA[0]));
-                       SEND_EMAIL($DATA[1], PROFILE_OUTDATED, $msg);
+                       $msg = LOAD_EMAIL_TEMPLATE("profile-updte", '', bigintval($content['userid']));
+                       sendEmail($content['email'], getMessage('PROFILE_OUTDATED'), $msg);
 
                        // Update profile data
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_profile_sent=UNIX_TIMESTAMP(), notified='Y' WHERE userid=%s LIMIT 1",
-                               array(bigintval($DATA[0])), __FILE__, __LINE__);
+                       array(bigintval($content['userid'])), __FILE__, __LINE__);
                } // END - while
        } // END - if