X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=5aa0a1805cea0b682293eea8f3e348534ede309d;hb=9553dbc9eed40bfa2beffa79813f2d5cd21fa8ac;hp=acb09444c5c049133c79d66149084909a22c21c2;hpb=82d72ce0fd29e2714e62bd11997272eaf6110fd6;p=mailer.git
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index acb09444c5..5aa0a1805c 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -177,8 +177,8 @@ WHERE
function addReferalRallyePrices ($rallye, $mode = 'email') {
// Output mode
switch($mode) {
- case 'email': $mode = "\n"; break;
- case 'html' : $mode = "
\n"; break;
+ case 'email': $mode = "\n"; break;
+ case 'html' : $mode = '
'; break;
} // END - switch
// Load prices
@@ -193,7 +193,7 @@ ORDER BY
array($rallye), __FUNCTION__, __LINE__);
// Entries found?
- if (SQL_NUMROWS($result_prices) > 0) {
+ if (!SQL_HASZERONUMS($result_prices)) {
// Load prices
if ($mode == "\n") $prices = '{--RALLYE_MEMBER_PRICES_ADDED--}:' . $mode . '------------------------------' . $mode;
@@ -292,8 +292,12 @@ LIMIT 1",
$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 = ''; }
+ //* DEBUG: */ debugOutput('*'.$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints.'*');
+ if (($cnt > 0) && ($refpoints > $content['curr_points'])) {
+ $userid = $content['userid'];
+ } else {
+ $cnt = '';
+ }
// Save values to array
$DATA['userid'][] = $userid;
@@ -311,11 +315,7 @@ LIMIT 1",
// Generate table
$OUT = '';
- $SW = 2;
for ($idx = '0'; $idx < $prices; $idx++) {
- if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---';
- if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
-
// Prepare marking of default (maybe current user's) id
$start = ''; $end = '';
if (($DATA['userid'][$idx] == $default) && ($default > 0)) {
@@ -325,18 +325,16 @@ LIMIT 1",
// Prepare content
$content = array(
- 'sw' => $SW,
'idx' => ($idx + 1),
'start' => $start,
'end' => $end,
'userid' => $DATA['userid'][$idx],
'ref' => $DATA['ref'][$idx],
- 'info' => ''
+ 'infos' => ''
);
// Load row template and switch color
$OUT .= loadTemplate('guest_rallye_row', true, $content);
- $SW = 3 - $SW;
} // END - for
// Add min_prices/users
@@ -470,7 +468,7 @@ function markReferalRallyesAsExpired ($result) {
$prices['active'][$key] = $active;
// Allow valid and active users with at least one ref to get points
- if (($userid > 0) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0)) {
+ if ((isValidUserId($userid)) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0)) {
$total++;
} // END - if
} // END - foreach
@@ -488,7 +486,7 @@ function markReferalRallyesAsExpired ($result) {
// Run array through (by userid is the most important 2nd-level-array)
foreach($prices['userid'] as $key => $userid) {
// Allow valid and active users with at least one ref to get points
- if (($userid > 0) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0)) {
+ if ((isValidUserId($userid)) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0)) {
// Transfer data to array for the mail template
$DATA['level'] = $prices['level'][$key];
$DATA['points'] = $prices['points'][$key];
@@ -530,7 +528,7 @@ function markReferalRallyesAsExpired ($result) {
// Load template
$message = loadEmailTemplate($template, $DATA, $userid);
- sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message);
+ sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJECT', $DATA['level']), $message);
} // END - if
// Count userid
@@ -549,9 +547,9 @@ function markReferalRallyesAsExpired ($result) {
}
// Send mail to admin
- sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt);
+ sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJECT', $title), $templ, $cnt);
- // Add task
+ // Add task (we ignore the task id here)
createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
}
@@ -694,9 +692,7 @@ LIMIT 1",
// We only need to check one element in $users, see above while() block
if (isset($users['userid'][$k])) {
$prices['userid'][$k] = $users['userid'][$k];
- if (empty($prices['userid'][$k])) $prices['userid'][$k] = '---';
- $prices['ref'][$k] = $users['ref'][$k];
- if (empty($prices['ref'][$k])) $prices['ref'][$k] = '---';
+ $prices['ref'][$k] = $users['ref'][$k];
$prices['cpoints'][$k] = $users['cpoints'][$k];
} // END - if
} // END - foreach
@@ -708,24 +704,20 @@ 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) {
// First check how many prices are set
- $result_prices = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC",
- array(bigintval($rallye)), __FUNCTION__, __LINE__);
- $prices = SQL_NUMROWS($result_prices);
- SQL_FREERESULT($result_prices);
+ $prices = countSumTotalData(bigintval($rallye), 'rallye_prices', 'id', 'rallye_id', true);
// Load data
$DATA = getArrayFromReferalRallyeUsers($rallye);
// Generate table
- $OUT = ''; $SW = 2;
+ $OUT = '';
for ($idx = '0'; $idx < $prices; $idx++) {
// Check status
// active = 1: account is still confirmed
// 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] = '---';
@@ -748,7 +740,6 @@ function addReferalRallyeWinners ($rallye, $default=0) {
// Prepare content
$content = array(
- 'sw' => $SW,
'idx' => ($idx + 1),
'userid' => $DATA['userid'][$idx],
'ref' => $DATA['ref'][$idx],
@@ -759,7 +750,6 @@ function addReferalRallyeWinners ($rallye, $default=0) {
// Load row template
$OUT .= loadTemplate('guest_rallye_row', true, $content);
- $SW = 3 - $SW;
} // END - for
// Prepare content
@@ -786,7 +776,7 @@ WHERE
`expired`='Y'",
array($EXPIRE), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result_rallye) > 0) {
+ if (!SQL_HASZERONUMS($result_rallye)) {
// Init SQLs
initSqls();
@@ -798,7 +788,7 @@ WHERE
$content['now_time'] = generateDateTime(time(), 1);
// Send mail to admin
- sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $content['title']), 'admin_rallye_purged', $content);
+ sendAdminNotification(getMaskedMessage('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",
@@ -808,7 +798,7 @@ WHERE
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
+ // Add task (we ignore the task id here
createNewTask('{--RALLYE_ADMIN_PURGED--}: ' . $content['title'], '{--RALLYE_ADMIN_PURGED_TEXT--}', 'RALLYE_PURGED');
} // END - while
@@ -850,12 +840,12 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
// Do we have found templates which we can link with the new rallye?
if (!empty($ral[0])) {
// Generate selection box for all found templates
- $OUT = '