New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/profile-updte.php b/inc/profile-updte.php
index 74f3ee3a2da98669330af11520294b4e228a92ff..042f44c740ff20ac2fa71aa97ba6e8507957d1ff 100644 (file)
--- a/inc/profile-updte.php
+++ b/inc/profile-updte.php
@@ -52,26 +52,26 @@ 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 ($content = SQL_FETCHARRAY($result)) {
                        // Translate timestamp
-                       $content['joined'] = MAKE_DATETIME($content['joined'], "0");
+                       $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');
                        } else {
                                // Has changed his account
-                               $content['last_update'] = MAKE_DATETIME($content['last_update'], "0");
+                               $content['last_update'] = generateDateTime($content['last_update'], '0');
                        }
 
                        // Load email template and send mail away
                        $msg = LOAD_EMAIL_TEMPLATE("profile-updte", '', bigintval($content['userid']));
-                       SEND_EMAIL($content['email'], getMessage('PROFILE_OUTDATED'), $msg);
+                       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",