X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=0744b6b32c535c3083d4084007623ebc4d669a5a;hb=34c9e454ba6ecfd0257d59f206dabbd0baaf731a;hp=a1038eb205cfacf51738223d712f8dcded9fc204;hpb=d495bd859975d08ee459d03c9b1cd51dd9b9304d;p=mailer.git
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index a1038eb205..0744b6b32c 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);
@@ -181,7 +186,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 +199,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 +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);
@@ -250,16 +261,18 @@ LIMIT 1",
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
@@ -276,31 +289,34 @@ 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
+ $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;
}
// 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?
@@ -322,6 +338,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Init variables
$min_users = '0'; $min_prices = '0';
+
// Load data
if (getExtensionVersion('rallye') >= '0.2.0') {
list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
@@ -332,42 +349,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
}
@@ -425,7 +448,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 +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
@@ -484,14 +507,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 +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
@@ -666,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;
@@ -714,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
@@ -847,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
@@ -861,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