X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=4e03f7ecba9c6e2212103e1ee12d5bf12df7f1da;hp=fa219af1ddf03cc49cf037efaff26383406507a1;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=79cab07c8937729e73bfacd4977bd5a203a7d950
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index fa219af1dd..4e03f7ecba 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -1,7 +1,7 @@
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 {
@@ -182,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
@@ -195,7 +201,7 @@ 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);
@@ -214,7 +220,7 @@ LEFT JOIN
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__);
@@ -244,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);
@@ -267,8 +273,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 +291,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']);
+ // 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;
@@ -316,7 +322,7 @@ 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
@@ -336,7 +342,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
$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);
@@ -346,7 +352,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 +370,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 +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
@@ -510,7 +516,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 +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
@@ -685,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;
@@ -733,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
@@ -773,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');
@@ -797,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';
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)) {
@@ -840,12 +846,25 @@ 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';
@@ -866,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
@@ -880,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