- Rewrites to use more the userid than the actual email address when sending

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 99c029890f7c38938072886f53007913bd52c03a..b3fb7f1fa6d37a6dc6ab579a5efa9c32060b31dc 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -157,7 +157,7 @@ WHERE
                if (($notify == 'Y') && ($un)) {
                        // Load email template and send it to the user
                        $message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
-                       sendEmail($content['userid'], getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
+                       sendEmail($content['userid'], '{%message,RALLYE_MEMBER_NOTIFY=' . $title . '%}', $message);
                } // END - if
        } // END - while
 
@@ -166,7 +166,7 @@ WHERE
        if ($notify == 'Y') $templ = 'admin_rallye_notify';
 
        // Send email to admin
-       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_NOTIFY', $title), $templ, $prices);
+       sendAdminNotification('{%message,RALLYE_ADMIN_NOTIFY=' . $title . '%}', $templ, $prices);
 
        // Free memory
        SQL_FREERESULT($result_user);
@@ -211,7 +211,7 @@ ORDER BY
                SQL_FREERESULT($result_prices);
        } else {
                // No prices???
-               $prices = getMaskedMessage('RALLYE_MEMBER_NO_PRICES', $mode);
+               $prices = '{%message,RALLYE_MEMBER_NO_PRICES=' . $mode . '%}';
        }
 
        // Add last line for email mode
@@ -398,7 +398,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 
                        // Send notification to member
                        $message = loadEmailTemplate('member_rallye_notify', $content, $userid);
-                       sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
+                       sendEmail($userid, '{%message,RALLYE_MEMBER_NOTIFY=' . $title . '%}', $message);
                } // END - if
 
                // Check if line is already included...
@@ -527,7 +527,7 @@ function markReferalRallyesAsExpired ($result) {
 
                                // Load template
                                $message = loadEmailTemplate($template, $DATA, $userid);
-                               sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJECT', $DATA['level']), $message);
+                               sendEmail($userid, '{%message,RALLYE_MEMBER_EXPIRED_SUBJECT=' . $DATA['level'] . '%}', $message);
                        } // END - if
 
                        // Count userid
@@ -546,7 +546,7 @@ function markReferalRallyesAsExpired ($result) {
        }
 
        // Send mail to admin
-       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $count);
+       sendAdminNotification('{%message,RALLYE_ADMIN_EXPIRED_SUBJECT=' . $title . '%}', $templ, $count);
 
        // Add task (we ignore the task id here)
        createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -771,7 +771,7 @@ function purgeExpiredReferalRallyes () {
 FROM
        `{?_MYSQL_PREFIX?}_rallye_data`
 WHERE
-       `end_time` <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND
+       (UNIX_TIMESTAMP() - `end_time`) > ({?ONE_DAY?} * %s) AND
        `expired`='Y'",
                array($EXPIRE), __FUNCTION__, __LINE__);
 
@@ -782,12 +782,12 @@ WHERE
                // Expire found rallyes and notify admin
                while ($content = SQL_FETCHARRAY($result_rallye)) {
                        // Prepare data for mail template
-                       $content['start_time']  = generateDateTime($content['start_time'], 1);
-                       $content['end_time']    = generateDateTime($content['end_time']  , 1);
-                       $content['now_time']    = generateDateTime(time(), 1);
+                       $content['start_time'] = generateDateTime($content['start_time'], 1);
+                       $content['end_time']   = generateDateTime($content['end_time']  , 1);
+                       $content['now_time']   = generateDateTime(time(), 1);
 
                        // Send mail to admin
-                       sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJECT', $content['title']), 'admin_rallye_purged', $content);
+                       sendAdminNotification('{%message,RALLYE_ADMIN_PURGED_SUBJECT=' . $content['title'] . '%}', 'admin_rallye_purged', $content);
 
                        // Purge whole rallye
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
@@ -931,7 +931,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 
        if ($min_users > 0) {
                // Rallye ends when X members are totally in your exchange
-               $return = getMaskedMessage('RALLYE_END_USERS', $min_users);
+               $return = '{%message,RALLYE_END_USERS=' . $min_users . '%}';
        } // END - if
 
        // Return
@@ -945,7 +945,7 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
 
        if ($min_prices > 0) {
                // Rallye ends when X members are totally in your exchange
-               $return = getMaskedMessage('RALLYE_END_PRICES', $min_prices);
+               $return = '{%message,RALLYE_END_PRICES=' . $min_prices . '%}';
        } // END - if
 
        // Return