X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=a804da7563d1e80b28f2df205824d6d45ace3657;hp=22ddd6cb3d03af37173fbb65bfd981b95dfad69c;hb=d92a340159ca45047eafc111fcac64933a7babeb;hpb=2d55583e262436e3c7baee24fcbe5c224a748770 diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 22ddd6cb3d..a804da7563 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 +140,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 +182,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 +195,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 +244,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 +257,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,13 +285,13 @@ LIMIT 1", if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---'; // Add row $OUT .= " -   ".($idx+1).". - "; +   ".($idx+1).". + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['userid'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " - "; + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['ref'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; @@ -291,8 +300,12 @@ LIMIT 1", $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; @@ -351,7 +364,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... @@ -431,7 +444,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) { @@ -478,7 +491,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 @@ -490,14 +503,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'); @@ -539,7 +552,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 @@ -672,18 +685,18 @@ function addReferalRallyeWinners ($rallye, $default=0) { // Add row $add = ''; $OUT .= " -   ".($idx+1).". - "; +   ".($idx+1).". + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['userid'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " - "; + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['ref'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " - "; + "; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['infos'][$idx]; if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; @@ -720,14 +733,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 @@ -853,7 +866,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 @@ -867,7 +880,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