X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=0744b6b32c535c3083d4084007623ebc4d669a5a;hb=739139fb13eae88204e355202bffe20ee5fc7d40;hp=fa219af1ddf03cc49cf037efaff26383406507a1;hpb=79cab07c8937729e73bfacd4977bd5a203a7d950;p=mailer.git
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index fa219af1dd..0744b6b32c 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -1,7 +1,7 @@
0
+ u.`rallye_id`=%s AND r.counter > 0
ORDER BY
u.refs DESC",
array(bigintval($rallye)), __FUNCTION__, __LINE__);
@@ -244,9 +248,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);
@@ -267,8 +271,8 @@ LIMIT 1",
$DATA['userid'][] = $userid;
$DATA['ref'][] = $cnt;
$DATA['cpoints'][] = $content['curr_points'];
- $DATA['min_users'] = $content['min_users'];
- $DATA['min_prices'] = $content['min_prices'];
+ $min_users = $content['min_users'];
+ $min_prices = $content['min_prices'];
} // END - while
// Free memory
@@ -285,27 +289,27 @@ LIMIT 1",
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
// Translate min_prices/users
- $DATA['min_prices'] = determineReferalRallyeMinimumPrices($content['min_prices']);
- $DATA['min_users'] = determineReferalRallyeMinimumUsers($content['min_users']);
+ $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+ $content['min_users'] = determineReferalRallyeMinimumUsers($min_users);
// Add footer
- $OUT .= loadTemplate('guest_rallye_footer', true);
+ $OUT .= loadTemplate('guest_rallye_footer', true, $content);
// And finnally return the output
return $OUT;
@@ -346,7 +350,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
SQL_FREERESULT($result);
if ($notify == 'Y') {
- // Transfer all neccessary data to the global $content array
+ // Transfer all neccessary data to $content array
$content['start'] = generateDateTime($start, 2);
$content['end'] = generateDateTime($end , 2);
$content['now_t'] = generateDateTime(time(), 2);
@@ -364,7 +368,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
// Send notification to member
$message = loadEmailTemplate('member_rallye_notify', $content, $userid);
- sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
+ sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
} // END - if
// Check if line is already included...
@@ -491,7 +495,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
@@ -510,7 +514,7 @@ LIMIT 1",
}
// 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');
@@ -552,7 +556,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
@@ -685,21 +689,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;
@@ -733,14 +737,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
@@ -866,7 +870,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
@@ -880,7 +884,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