X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=4e03f7ecba9c6e2212103e1ee12d5bf12df7f1da;hp=9b2827786f45b9d157db11409accd34eed24f213;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=4f2414a0134da82027fce8a6c98696a207c8c8cc
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 9b2827786f..4e03f7ecba 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -1,7 +1,7 @@
$prices), $content['userid']);
- sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
+ $message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
+ sendEmail($content['userid'], getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
} // END - if
} // END - while
@@ -139,7 +144,7 @@ VALUES ('%s','%s','%s','%s')",
if ($notify == 'Y') $templ = 'admin_rallye_notify';
// Send email to admin
- sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, 0);
+ sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_NOTIFY', $title), $templ, $prices);
// Free memory
SQL_FREERESULT($result_user);
@@ -154,21 +159,23 @@ function addReferalRallyePrices ($rallye, $mode='email') {
} // END - switch
// Load prices
- $result_prices = SQL_QUERY("SELECT
+ $result_prices = SQL_QUERY_ESC("SELECT
`price_level`, `points`, `info`
FROM
`{?_MYSQL_PREFIX?}_rallye_prices`
WHERE
- `rallye_id`='".$rallye."'
+ `rallye_id`=%s
ORDER BY
`price_level` ASC",
- __FUNCTION__, __LINE__);
+ array($rallye), __FUNCTION__, __LINE__);
+
+ // Entries found?
if (SQL_NUMROWS($result_prices) > 0) {
// Load prices
if ($mode == "\n") $prices = "{--RALLYE_MEMBER_PRICES_ADDED--}:".$mode."------------------------------".$mode;
$prices = '';
while ($content = SQL_FETCHARRAY($result_prices)) {
- $prices .= $content['price_level'].getMessage('RALLYE_PRICE').": ";
+ $prices .= $content['price_level']. '{--RALLYE_PRICE--}: ';
if (!empty($content['info'])) {
$prices .= $content['info'];
} else {
@@ -181,7 +188,7 @@ ORDER BY
SQL_FREERESULT($result_prices);
} else {
// No prices???
- $prices = sprintf(getMessage('RALLYE_MEMBER_NO_PRICES'), $mode);
+ $prices = getMaskedMessage('RALLYE_MEMBER_NO_PRICES', $mode);
}
// Add last line for email mode
@@ -194,27 +201,33 @@ ORDER BY
//
function addReferalRallyeTopUsers ($rallye, $default=0) {
// First check how many prices are set
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY price_level",
array(bigintval($rallye)), __FUNCTION__, __LINE__);
$prices = SQL_NUMROWS($result);
SQL_FREERESULT($result);
// And load only limited users
$result = SQL_QUERY_ESC("SELECT
- u.userid, u.refs, u.curr_points FROM `{?_MYSQL_PREFIX?}_rallye_users` AS u
+ u.userid, u.refs, u.curr_points, rd.min_users, rd.min_prices
+FROM
+ `{?_MYSQL_PREFIX?}_rallye_users` AS u
LEFT JOIN
`{?_MYSQL_PREFIX?}_refsystem` AS r
ON
u.userid=r.userid
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_rallye_data` AS rd
+ON
+ u.rallye_id=rd.id
WHERE
- u.rallye_id=%s AND r.counter > 0
+ u.`rallye_id`=%s AND r.counter > 0
ORDER BY
u.refs DESC",
array(bigintval($rallye)), __FUNCTION__, __LINE__);
// Load users
$DATA = array(
- 'userid' => array(),
+ 'userid' => array(),
'ref' => array(),
'cpoints' => array()
);
@@ -237,9 +250,9 @@ WHERE
d.`status`='CONFIRMED' AND
p.ref_depth=1 AND
d.max_mails > 0 AND
- d.mails_confirmed >= %s
+ d.mails_confirmed >= {?ref_payout?}
LIMIT 1",
- array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCTION__, __LINE__);
+ array(bigintval($content['userid'])), __FUNCTION__, __LINE__);
// Get points
list($refpoints) = SQL_FETCHROW($result_ref);
@@ -247,19 +260,21 @@ LIMIT 1",
// Free result
SQL_FREERESULT($result_ref);
- if (empty($refpoints)) $refpoints = 0;
+ if (empty($refpoints)) $refpoints = '0';
// Init userid for list
- $_userid = '---';
+ $userid = '---';
// List only users with at least one ref!
//* DEBUG: */ print("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*
");
- if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_userid = $content['userid']; } else { $cnt = ''; }
+ if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $userid = $content['userid']; } else { $cnt = ''; }
// Save values to array
- $DATA['userid'][] = $_userid;
- $DATA['ref'][] = $cnt;
- $DATA['cpoints'][] = $content['curr_points'];
+ $DATA['userid'][] = $userid;
+ $DATA['ref'][] = $cnt;
+ $DATA['cpoints'][] = $content['curr_points'];
+ $min_users = $content['min_users'];
+ $min_prices = $content['min_prices'];
} // END - while
// Free memory
@@ -271,40 +286,43 @@ LIMIT 1",
// Generate table
$OUT = loadTemplate('guest_rallye_header', true);
$SW = 2;
- for ($idx = 0; $idx < $prices; $idx++) {
+ for ($idx = '0'; $idx < $prices; $idx++) {
if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
// Add row
$OUT .= "
- | ".($idx+1).". |
- ";
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ | ".($idx+1).". |
+ ";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= $DATA['userid'][$idx];
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= " |
- ";
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ | ";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= $DATA['ref'][$idx];
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= " |
| |
\n";
$SW = 3 - $SW;
} // END - for
+ // Add min_prices/users
+ $content['min_prices'] = bigintval($min_prices);
+ $content['min_users'] = bigintval($min_users);
+
// Add footer
- $OUT .= loadTemplate('guest_rallye_footer', true);
+ $OUT .= loadTemplate('guest_rallye_footer', true, $content);
// And finnally return the output
return $OUT;
}
// Run this function only when a new member has confirmed his email address!
-function addUserToReferalRallye ($userid) {
- global $DATA;
+function addUserToReferalRallye ($userid, $content = array()) {
$add = '';
// Updated extension?
- if (getExtensionVersion('rallye') >= '0.2.0') {
+ if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
$add .= ", `min_users`, `min_prices`";
} // END - if
@@ -321,9 +339,10 @@ WHERE
LIMIT 1", __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Init variables
- $min_users = 0; $min_prices = 0;
+ $min_users = '0'; $min_prices = '0';
+
// Load data
- if (getExtensionVersion('rallye') >= '0.2.0') {
+ if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
} else {
list($id, $title, $start, $end, $notify) = SQL_FETCHROW($result);
@@ -332,42 +351,48 @@ LIMIT 1", __FUNCTION__, __LINE__);
// Free result
SQL_FREERESULT($result);
+ if ($notify == 'Y') {
+ // Transfer all neccessary data to $content array
+ $content['start'] = generateDateTime($start, 2);
+ $content['end'] = generateDateTime($end , 2);
+ $content['now_t'] = generateDateTime(time(), 2);
+ $content['title'] = $title;
+ $content['id'] = $id; // id for the rallye details link
+ $content['ref'] = '0';
+ $content['refs'] = countSumTotalData($userid, 'user_data', 'userid', 'refid', true);
+
+ // Load prices
+ $content['prices'] = addReferalRallyePrices($id);
+
+ // Determine min_users/prices tring
+ $content['min_users'] = determineReferalRallyeMinimumUsers($min_users);
+ $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+
+ // Send notification to member
+ $message = loadEmailTemplate('member_rallye_notify', $content, $userid);
+ sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
+ } // END - if
+
// Check if line is already included...
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s AND `userid`=%s LIMIT 1",
- array(bigintval($id), bigintval($userid)), __FUNCTION__, __LINE__);
+ array(
+ bigintval($id),
+ bigintval($userid)
+ ), __FUNCTION__, __LINE__);
// Is this user added?
- if (SQL_NUMROWS($result) == 0) {
+ if (SQL_NUMROWS($result) < 1) {
// Add userid and his ref count to table
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_users` (`rallye_id`, `userid`, `refs`)
VALUES ('%s','%s',0)",
- array(bigintval($id), bigintval($userid)), __FUNCTION__, __LINE__);
+ array(
+ bigintval($id),
+ bigintval($userid)
+ ), __FUNCTION__, __LINE__);
} // END - if
// Free memory
SQL_FREERESULT($result);
-
- if ($notify == 'Y') {
- // Transfer all neccessary data to the global $DATA array
- $DATA['start'] = generateDateTime($start, 2);
- $DATA['end'] = generateDateTime($end , 2);
- $DATA['now_t'] = generateDateTime(time(), 2);
- $DATA['title'] = $title;
- $DATA['id'] = $id; // ID for the rallye details link
- $DATA['ref'] = 0;
- $DATA['refs'] = countSumTotalData($userid, 'user_data', 'userid', "refid", true);
-
- // Load prices
- $prices = addReferalRallyePrices($id);
-
- // Determine min_users/prices tring
- $DATA['min_users'] = determineReferalRallyeMinimumUsers($min_users);
- $DATA['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
-
- // Send notification to member
- $message = loadEmailTemplate('member_rallye_notify', array('prices' => $prices), $userid);
- sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
- } // END - if
} // END - if
}
@@ -385,7 +410,7 @@ function markReferalRallyesAsExpired ($result) {
$prices = getArrayFromReferalRallyeUsers($id);
// Init array
- $DATA = array(); $cnt = 0;
+ $DATA = array(); $cnt = '0';
$users = array();
$DATA['title'] = $title;
$DATA['start'] = generateDateTime($start, 1);
@@ -393,11 +418,11 @@ function markReferalRallyesAsExpired ($result) {
$DATA['now_t'] = generateDateTime(time(), 1);
// Just count...
- $total = 0;
+ $total = '0';
foreach($prices['userid'] as $key => $userid) {
// Check status
// active = 1: account is still confirmed
- // active = 0: account is deleted or locked
+ // active = '0': account is deleted or locked
$result = SQL_QUERY_ESC("SELECT
COUNT(`userid`) AS active
FROM
@@ -417,7 +442,7 @@ LIMIT 1",
} // END - if
} // END - foreach
- if (($total < $min_prices) || ($total == 0)) {
+ if (($total < $min_prices) || ($total == '0')) {
// Do not end this rallye!
unset($DATA);
return;
@@ -425,7 +450,7 @@ LIMIT 1",
// Expire rallye
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `expired`='Y' WHERE `id`=%s LIMIT 1",
- array(bigintval($id)), __FUNCTION__, __LINE__);
+ array(bigintval($id)), __FUNCTION__, __LINE__);
// Run array through (by userid is the most important 2nd-level-array)
foreach($prices['userid'] as $key => $userid) {
@@ -472,7 +497,7 @@ LIMIT 1",
// Load template
$message = loadEmailTemplate($template, $DATA, $userid);
- sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $message);
+ sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message);
} // END - if
// Count userid
@@ -484,14 +509,14 @@ LIMIT 1",
// Select template depending on notfication is switch on / off
if ($notify == 'Y') {
- $templ = "admin_rallye_expired";
+ $templ = 'admin_rallye_expired';
} elseif (is_array($users['userid'])) {
- $templ = "admin_rallye_expired_no";
+ $templ = 'admin_rallye_expired_no';
$cnt = getReferalRallyeUserDataFromArray($users);
}
// Send mail to admin
- sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0);
+ sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt);
// Add task
createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -533,7 +558,7 @@ function getArrayFromReferalRallyePrices ($rallye) {
);
// Load prices
- $result = SQL_QUERY_ESC("SELECT price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
+ $result = SQL_QUERY_ESC("SELECT price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY price_level",
array(bigintval($rallye)), __FUNCTION__, __LINE__);
// Transfer elements
@@ -553,7 +578,7 @@ function getArrayFromReferalRallyePrices ($rallye) {
//
function getArrayFromReferalRallyeUsers ($rallye) {
// Fix zero points to 0.00000
- if (getConfig('ref_payout') == 0) setConfigEntry('ref_payout', '0.00000');
+ if (getConfig('ref_payout') == '0') setConfigEntry('ref_payout', '0.00000');
// Init multi array
$users = array(
@@ -595,7 +620,7 @@ LIMIT 1",
SQL_FREERESULT($result_ref);
// Fix empty refpoints
- if (empty($refpoints)) $refpoints = 0;
+ if (empty($refpoints)) $refpoints = '0';
// Store calculated new refs to array
$users['userid'][] = $content['userid'];
@@ -642,14 +667,14 @@ function addReferalRallyeWinners ($rallye, $default=0) {
// Generate table
$OUT = loadTemplate('guest_rallye_expired_header', true);
$SW = 2;
- for ($idx = 0; $idx < $prices; $idx++) {
+ for ($idx = '0'; $idx < $prices; $idx++) {
// Check status
// active = 1: account is still confirmed
- // active = 0: account is deleted or locked
+ // active = '0': account is deleted or locked
$active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
- if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == 0) || ($active == 0) || ("".round($DATA['cpoints'][$idx])."" == 0) || (empty($DATA['cpoints'][$idx]))) {
+ if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == '0') || ($active == '0') || ("".round($DATA['cpoints'][$idx])."" == '0') || (empty($DATA['cpoints'][$idx]))) {
// Allow valid and active users with at least one ref to get points
$DATA['ref'][$idx] = '---';
$DATA['userid'][$idx] = '---';
@@ -666,21 +691,21 @@ function addReferalRallyeWinners ($rallye, $default=0) {
// Add row
$add = '';
$OUT .= "
- | ".($idx+1).". |
- ";
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ | ".($idx+1).". |
+ ";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= $DATA['userid'][$idx];
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= " |
- ";
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ | ";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= $DATA['ref'][$idx];
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= " |
- ";
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ | ";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= $DATA['infos'][$idx];
- if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "";
+ if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '';
$OUT .= " |
| | |
\n";
$SW = 3 - $SW;
@@ -714,14 +739,14 @@ WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'",
$content['now_time'] = generateDateTime(time(), 1);
// Send mail to admin
- sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), 'admin_rallye_purged', $content, 0);
+ sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $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",
array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
- addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s LIMIT 1",
+ addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s LIMIT 1",
array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
- addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s LIMIT 1",
+ addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s LIMIT 1",
array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
// Add task
@@ -754,21 +779,21 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
$read = substr($read, 7, strpos($read, '.') - 7);
// Accept only template names between 1 and 255 chars length
- if ((strlen($read) < 256) && (!empty($read))) $ral[] = $read;
- } // END - while
+ if ((strlen($read) < 256) && (!empty($read))) {
+ // Valid entry found!
+ $ral[$read] = $read;
+ } else {
+ // Log invalid
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("WARNING: Template %s not used.", $read));
+ }
+ } // END - foreach
// Do we have found templates which we can link with the new rallye?
if (!empty($ral[0])) {
// Generate selection box for all found templates
- // @TODO Rewrite this to our API function
- $OUT = "\n";
+ $OUT = '';
} else {
// No rallye templates found
$OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
@@ -778,16 +803,16 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
return $OUT;
}
-//
-function getReferalRallyeRefsCount ($userid, $old = 0) {
+// @TODO Please document this function
+function getReferalRallyeRefsCount ($currUserid, $old = '0') {
// Check current refs
- if (getExtensionVersion('cache') >= '0.1.2') {
+ if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
// Get refs from cache
- $cnt = 0;
+ $cnt = '0';
foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) {
// Do we have a ref for this user?
//* DEBUG: */ print("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}
");
- if (($userid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
+ if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
//* DEBUG: */ print("userid matches!
");
foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) {
if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
@@ -821,15 +846,28 @@ function getReferalRallyeRefsCount ($userid, $old = 0) {
} // END - if
} else {
// Load current refs from database
- $result_ref = SQL_QUERY_ESC("SELECT SUM(s.counter) AS cnt
-FROM `{?_MYSQL_PREFIX?}_refsystem` AS s
-LEFT JOIN `{?_MYSQL_PREFIX?}_refdepths` AS d
-ON s.level=d.level
-WHERE s.userid=%s AND s.level=1", array(bigintval($userid)), __FUNCTION__, __LINE__);
+ $result_ref = SQL_QUERY_ESC("SELECT
+ SUM(s.counter) AS cnt
+FROM
+ `{?_MYSQL_PREFIX?}_refsystem` AS s
+LEFT JOIN
+ `{?_MYSQL_PREFIX?}_refdepths` AS d
+ON
+ s.level=d.level
+WHERE
+ s.userid=%s AND
+ s.level=1",
+ array(
+ bigintval($userid)
+ ), __FUNCTION__, __LINE__);
+
+ // Load count @TODO Can't we rewrite this to our API?
list($cnt) = SQL_FETCHROW($result_ref);
+
+ // Free result
SQL_FREERESULT($result_ref);
if (empty($cnt)) {
- $cnt = 0;
+ $cnt = '0';
} else {
$cnt -= $old;
}
@@ -847,7 +885,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
if ($min_users > 0) {
// Rallye ends when X members are totally in your exchange
- $return = sprintf(getMessage('RALLYE_END_USERS'), $min_users);
+ $return = getMaskedMessage('RALLYE_END_USERS', $min_users);
} // END - if
// Return
@@ -861,7 +899,7 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
if ($min_prices > 0) {
// Rallye ends when X members are totally in your exchange
- $return = sprintf(getMessage('RALLYE_END_PRICES'), $min_prices);
+ $return = getMaskedMessage('RALLYE_END_PRICES', $min_prices);
} // END - if
// Return