Better text here

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 99c029890f7c38938072886f53007913bd52c03a..faf162d6002a6e56648f2782dd70d44c0edcdb6d 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -117,11 +117,11 @@ ON
        p.userid=d.userid
 WHERE
        d.`status`='CONFIRMED' AND
-       d.max_mails > 0 AND
-       d.mails_confirmed >= {?ref_payout?} AND
-       p.ref_depth=1 AND
-       p.points > 0 AND
-       d.userid=%s",
+       d.`max_mails` > 0 AND
+       d.`mails_confirmed` >= {?ref_payout?} AND
+       p.`ref_depth`=1 AND
+       p.`points` > 0 AND
+       d.`userid`=%s",
                                array(bigintval($content['userid'])), __FUNCTION__, __LINE__);
 
                        // Get points
@@ -135,7 +135,7 @@ WHERE
                        // Add info line
                        SQL_QUERY_ESC("INSERT INTO
        `{?_MYSQL_PREFIX?}_rallye_users`
-(`rallye_id`, `userid`, `refs`, `curr_points`)
+(`rallye_id`,`userid`,`refs`,`curr_points`)
        VALUES
 (%s, %s, %s, %s)",
                                array(
@@ -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);
@@ -182,7 +182,7 @@ function addReferalRallyePrices ($rallye, $mode = 'email') {
 
        // Load prices
        $result_prices = SQL_QUERY_ESC("SELECT
-       `price_level`, `points`, `info`
+       `price_level`,`points`,`info`
 FROM
        `{?_MYSQL_PREFIX?}_rallye_prices`
 WHERE
@@ -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
@@ -222,7 +222,7 @@ ORDER BY
 }
 
 //
-function addReferalRallyeTopUsers ($rallye, $default=0) {
+function addReferalRallyeTopUsers ($mode, $rallye, $default=0) {
        // Init variables
        $min_users = 0; $min_prices = 0;
 
@@ -333,7 +333,7 @@ LIMIT 1",
                );
 
                // Load row template and switch color
-               $OUT .= loadTemplate('guest_rallye_row', true, $content);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $content);
        } // END - for
 
        // Add min_prices/users
@@ -342,7 +342,7 @@ LIMIT 1",
        $content['min_users']  = bigintval($min_users);
 
        // And finnally return the output
-       return loadTemplate('guest_rallye', true, $content);
+       return loadTemplate($mode . '_list_rallye', true, $content);
 }
 
 // Run this function only when a new member has confirmed his email address!
@@ -351,12 +351,12 @@ function addUserToReferalRallye ($userid, $content = array()) {
 
        // Updated extension?
        if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
-               $add .= ', `min_users`, `min_prices`';
+               $add .= ', `min_users`,`min_prices`';
        } // END - if
 
        // Check for an auto-add rallye
        $result = SQL_QUERY("SELECT
-       `id`, `title`, `start_time`, `end_time`, `send_notify`".$add."
+       `id`,`title`,`start_time`,`end_time`,`send_notify`".$add."
 FROM
        `{?_MYSQL_PREFIX?}_rallye_data`
 WHERE
@@ -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...
@@ -420,7 +420,7 @@ LIMIT 1",
                        // Add userid and his ref count to table
                        SQL_QUERY_ESC("INSERT INTO
        `{?_MYSQL_PREFIX?}_rallye_users`
-(`rallye_id`, `userid`, `refs`)
+(`rallye_id`,`userid`,`refs`)
        VALUES
 (%s,%s,0)",
                                array(
@@ -436,6 +436,7 @@ LIMIT 1",
 
 //
 function markReferalRallyesAsExpired ($result) {
+       // @TODO Deprecated variable and global statement, please try to rewrite this
        global $DATA;
 
        // Load rallye data
@@ -498,18 +499,19 @@ function markReferalRallyesAsExpired ($result) {
                        // Determine winner level
                        if ($DATA['level'] == 1) {
                                // The winner!
-                               $winnerLevel = '_gold';
+                               $winnerLevel = 'gold';
                        } elseif ($DATA['level'] == 2) {
                                // The vice winner!
-                               $winnerLevel = '_silver';
+                               $winnerLevel = 'silver';
                        } elseif ($DATA['level'] == 3) {
                                // The bronce winner
-                               $winnerLevel = '_bronce';
+                               $winnerLevel = 'bronce';
                        }
 
                        if ($DATA['points'] > 0) {
                                // Add points directly to user's account
-                               addPointsDirectly('rallye_winner' . $winnerLevel, $userid, $DATA['points']);
+                               initReferalSystem();
+                               addPointsThroughReferalSystem('rallye_winner:' . $winnerLevel, $userid, $DATA['points']);
                        } // END - if
 
                        if ($notify == 'Y') {
@@ -527,7 +529,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 +548,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');
@@ -562,7 +564,7 @@ function getReferalRallyeUserDataFromArray ($userIds) {
 
        // Load users
        $result = SQL_QUERY_ESC("SELECT
-       `userid`, `gender`, `surname`, `family`, `email`
+       `userid`,`gender`,`surname`,`family`,`email`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -601,7 +603,7 @@ function getArrayFromReferalRallyePrices ($rallye) {
 
        // Load prices
        $result = SQL_QUERY_ESC("SELECT
-       `price_level`, `points`, `info`
+       `price_level`,`points`,`info`
 FROM
        `{?_MYSQL_PREFIX?}_rallye_prices`
 WHERE
@@ -637,7 +639,7 @@ function getArrayFromReferalRallyeUsers ($rallye) {
        );
 
        // Load users                          userid    old   points earned
-       $result_user = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
+       $result_user = SQL_QUERY_ESC("SELECT `userid`,`refs`,`curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
        while ($content = SQL_FETCHARRAY($result_user)) {
                // Load current ref count
@@ -701,7 +703,7 @@ LIMIT 1",
 }
 
 // @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId()
-function addReferalRallyeWinners ($rallye, $default=0) {
+function addReferalRallyeWinners ($mode, $rallye, $default=0) {
        // First check how many prices are set
        $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
 
@@ -748,7 +750,7 @@ function addReferalRallyeWinners ($rallye, $default=0) {
                );
 
                // Load row template
-               $OUT .= loadTemplate('guest_rallye_row', true, $content);
+               $OUT .= loadTemplate($mode . '_list_rallye_row', true, $content);
        } // END - for
 
        // Prepare content
@@ -759,7 +761,7 @@ function addReferalRallyeWinners ($rallye, $default=0) {
        );
 
        // Load main template and finnally return the output
-       return loadTemplate('guest_rallye', true, $content);
+       return loadTemplate($mode . '_list_rallye', true, $content);
 }
 
 //
@@ -767,11 +769,11 @@ function purgeExpiredReferalRallyes () {
        // Check for expired rallyes
        $EXPIRE = 3; // @TODO The hard-coded value...
        $result_rallye = SQL_QUERY_ESC("SELECT
-       `id`, `title`, `start_time`, `end_time`
+       `id`,`title`,`start_time`,`end_time`
 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 +784,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 +933,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 +947,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