X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=b0fd3a9943681453f315d277b4a1bacc472cc6dd;hb=4cc62618b7a59c6641b057c34047b2dd531c16ad;hp=e4dff31d0279ebbfdcc2aef7a5053bafa1960232;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index e4dff31d02..b0fd3a9943 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;
@@ -311,11 +311,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 +321,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
@@ -530,7 +524,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 +543,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 +688,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
@@ -717,15 +709,14 @@ function addReferalRallyeWinners ($rallye, $default=0) {
$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 +739,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 +749,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 +775,7 @@ WHERE
`expired`='Y'",
array($EXPIRE), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result_rallye) > 0) {
+ if (!SQL_HASZERONUMS($result_rallye)) {
// Init SQLs
initSqls();
@@ -798,7 +787,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 +797,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