X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=ca7e60fb54485d1b44931d4c2fcb8de472c457bd;hp=4e03f7ecba9c6e2212103e1ee12d5bf12df7f1da;hb=537df432292cb0aa63070479258e3e84b182a28b;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 4e03f7ecba..ca7e60fb54 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -51,11 +51,17 @@ function autostartReferalRallyes ($result) { SQL_FREERESULT($result); // Set notified to Y - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `notified`='Y' WHERE `id`=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_rallye_data` +SET + `notified`='Y' +WHERE + `id`=%s +LIMIT 1", array(bigintval($id)), __FUNCTION__, __LINE__); // Transfer all neccessary data to the $content array - $content['userid_cnt'] = countSumTotalData('CONFIRMED','user_data','userid','status',true); + $content['userid_cnt'] = getTotalConfirmedUser(); $content['start'] = generateDateTime($start, 2); $content['end'] = generateDateTime($end , 2); $content['now_t'] = generateDateTime(time(), 2); @@ -70,7 +76,14 @@ function autostartReferalRallyes ($result) { $content['prices'] = addReferalRallyePrices($id); // Query all users - $result_user = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC", __FUNCTION__, __LINE__); + $result_user = SQL_QUERY("SELECT + `userid` +FROM + `{?_MYSQL_PREFIX?}_user_data` +WHERE + `status`='CONFIRMED' +ORDER BY + `userid` ASC", __FUNCTION__, __LINE__); // Let's begin with the userids... while ($row = SQL_FETCHARRAY($result_user)) { @@ -84,7 +97,14 @@ function autostartReferalRallyes ($result) { if (empty($cnt)) $cnt = '0'; // Added prevent some unknown troubles... :-? // Check if line is already included... - $result_ref = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s AND `userid`=%s LIMIT 1", + $result_ref = SQL_QUERY_ESC("SELECT + `id` +FROM + `{?_MYSQL_PREFIX?}_rallye_users` +WHERE + `rallye_id`=%s AND + `userid`=%s +LIMIT 1", array(bigintval($id), bigintval($content['userid'])), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result_ref) == 0) { // Free memory @@ -104,8 +124,8 @@ WHERE d.max_mails > 0 AND d.mails_confirmed >= {?ref_payout?} AND p.ref_depth=1 AND - p.points > 0 - AND d.userid=%s", + p.points > 0 AND + d.userid=%s", array(bigintval($content['userid'])), __FUNCTION__, __LINE__); // Get points @@ -117,8 +137,11 @@ WHERE if (empty($cpoints)) $cpoints = '0.00000'; // Add info line - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_users` (`rallye_id`, `userid`, `refs`, `curr_points`) -VALUES (%s, %s, %s, %s)", + SQL_QUERY_ESC("INSERT INTO + `{?_MYSQL_PREFIX?}_rallye_users` +(`rallye_id`, `userid`, `refs`, `curr_points`) + VALUES +(%s, %s, %s, %s)", array( bigintval($id), bigintval($content['userid']), @@ -151,11 +174,11 @@ VALUES (%s, %s, %s, %s)", } // -function addReferalRallyePrices ($rallye, $mode='email') { +function addReferalRallyePrices ($rallye, $mode = 'email') { // Output mode switch($mode) { case 'email': $mode = "\n"; break; - case 'html' : $mode = "
\n"; break; + case 'html' : $mode = '
'; break; } // END - switch // Load prices @@ -170,9 +193,10 @@ 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; + if ($mode == "\n") $prices = '{--RALLYE_MEMBER_PRICES_ADDED--}:' . $mode . '------------------------------' . $mode; + $prices = ''; while ($content = SQL_FETCHARRAY($result_prices)) { $prices .= $content['price_level']. '{--RALLYE_PRICE--}: '; @@ -200,11 +224,11 @@ ORDER BY // function addReferalRallyeTopUsers ($rallye, $default=0) { + // Init variables + $min_users = 0; $min_prices = 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", - array(bigintval($rallye)), __FUNCTION__, __LINE__); - $prices = SQL_NUMROWS($result); - SQL_FREERESULT($result); + $prices = countSumTotalData($rallye, 'rallye_prices', 'id', 'rallye_id', true); // And load only limited users $result = SQL_QUERY_ESC("SELECT @@ -220,18 +244,20 @@ 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__); // Load users $DATA = array( - 'userid' => array(), - 'ref' => array(), - 'cpoints' => array() + 'userid' => array(), + 'ref' => array(), + 'cpoints' => array() ); + // Load all users while ($content = SQL_FETCHARRAY($result)) { // Get current refs $cnt = getReferalRallyeRefsCount($content['userid'], $content['refs']); @@ -266,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; @@ -284,37 +314,36 @@ LIMIT 1", array_pk_sort($DATA, array('ref', 'cpoints'), 0, 1, true); // Generate table - $OUT = loadTemplate('guest_rallye_header', true); - $SW = 2; + $OUT = ''; for ($idx = '0'; $idx < $prices; $idx++) { - if (empty($DATA['userid'][$idx])) $DATA['userid'][$idx] = '---'; - if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---'; - // Add row - $OUT .= " - ".($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 .= " -\n"; - $SW = 3 - $SW; + // Prepare marking of default (maybe current user's) id + $start = ''; $end = ''; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) { + $start = ''; + $end = ''; + } // END - if + + // Prepare content + $content = array( + 'idx' => ($idx + 1), + 'start' => $start, + 'end' => $end, + 'userid' => $DATA['userid'][$idx], + 'ref' => $DATA['ref'][$idx], + 'infos' => '' + ); + + // Load row template and switch color + $OUT .= loadTemplate('guest_rallye_row', true, $content); } // END - for // Add min_prices/users + $content['rows'] = $OUT; $content['min_prices'] = bigintval($min_prices); $content['min_users'] = bigintval($min_users); - // Add footer - $OUT .= loadTemplate('guest_rallye_footer', true, $content); - // And finnally return the output - return $OUT; + return loadTemplate('guest_rallye', true, $content); } // Run this function only when a new member has confirmed his email address! @@ -323,7 +352,7 @@ function addUserToReferalRallye ($userid, $content = array()) { // Updated extension? if (isExtensionInstalledAndNewer('rallye', '0.2.0')) { - $add .= ", `min_users`, `min_prices`"; + $add .= ', `min_users`, `min_prices`'; } // END - if // Check for an auto-add rallye @@ -374,7 +403,14 @@ LIMIT 1", __FUNCTION__, __LINE__); } // 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", + $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) @@ -383,8 +419,11 @@ LIMIT 1", __FUNCTION__, __LINE__); // Is this user added? 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)", + SQL_QUERY_ESC("INSERT INTO + `{?_MYSQL_PREFIX?}_rallye_users` +(`rallye_id`, `userid`, `refs`) + VALUES +(%s,%s,0)", array( bigintval($id), bigintval($userid) @@ -410,7 +449,8 @@ function markReferalRallyesAsExpired ($result) { $prices = getArrayFromReferalRallyeUsers($id); // Init array - $DATA = array(); $cnt = '0'; + $DATA = array(); + $cnt = '0'; $users = array(); $DATA['title'] = $title; $DATA['start'] = generateDateTime($start, 1); @@ -422,17 +462,8 @@ function markReferalRallyesAsExpired ($result) { foreach($prices['userid'] as $key => $userid) { // Check status // active = 1: account is still confirmed - // active = '0': account is deleted or locked - $result = SQL_QUERY_ESC("SELECT - COUNT(`userid`) AS active -FROM - `{?_MYSQL_PREFIX?}_user_data` -WHERE - `userid`=%s AND `status`='CONFIRMED' -LIMIT 1", - array(bigintval($userid)), __FUNCTION__, __LINE__); - list($active) = SQL_FETCHROW($result); - SQL_FREERESULT($result); + // active = 0: account is deleted or locked + $active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'"); $prices['active'][$key] = $active; @@ -497,7 +528,7 @@ LIMIT 1", // 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 @@ -516,9 +547,9 @@ LIMIT 1", } // 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'); } @@ -531,8 +562,20 @@ function getReferalRallyeUserDataFromArray ($userIds) { $ret = ''; // Load users - $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN(%s) AND `status`='CONFIRMED' ORDER BY `userid` ASC LIMIT %s", - array($userid_string, count($userIds)), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + `userid`, `gender`, `surname`, `family`, `email` +FROM + `{?_MYSQL_PREFIX?}_user_data` +WHERE + `userid` IN(%s) AND + `status`='CONFIRMED' +ORDER BY + `userid` ASC +LIMIT %s", + array( + $userid_string, + count($userIds) + ), __FUNCTION__, __LINE__); while ($content = SQL_FETCHARRAY($result)) { // Construct the message masked and add it $ret .= sprintf("%s %s %s (%s) - %s\n", @@ -558,8 +601,15 @@ 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", - array(bigintval($rallye)), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + `price_level`, `points`, `info` +FROM + `{?_MYSQL_PREFIX?}_rallye_prices` +WHERE + `rallye_id`=%s +ORDER BY + `price_level` ASC", + array(bigintval($rallye)), __FUNCTION__, __LINE__); // Transfer elements while ($content = SQL_FETCHARRAY($result)) { @@ -582,7 +632,7 @@ function getArrayFromReferalRallyeUsers ($rallye) { // Init multi array $users = array( - 'userid' => array(), + 'userid' => array(), 'ref' => array(), 'cpoints' => array(), ); @@ -623,7 +673,7 @@ LIMIT 1", if (empty($refpoints)) $refpoints = '0'; // Store calculated new refs to array - $users['userid'][] = $content['userid']; + $users['userid'][] = $content['userid']; $users['ref'][] = abs($cnt - $content['refs']); $users['cpoints'][] = $refpoints - $content['curr_points']; } // END - while @@ -632,7 +682,7 @@ LIMIT 1", SQL_FREERESULT($result_user); // Sort array for refs (descending) - array_pk_sort($users, array("ref", "cpoints"), 0, 1, true); + array_pk_sort($users, array('ref', 'cpoints'), 0, 1, true); // Load prices array (!) $prices = getArrayFromReferalRallyePrices($rallye); @@ -642,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 @@ -653,28 +701,23 @@ LIMIT 1", return $prices; } -// +// @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 = loadTemplate('guest_rallye_expired_header', true); - $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 = 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] = '---'; @@ -688,46 +731,52 @@ function addReferalRallyeWinners ($rallye, $default=0) { $DATA['infos'][$idx] = $DATA['points'][$idx] . ' {?POINTS?}'; } - // Add row - $add = ''; - $OUT .= " - ".($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 .= ''; - $OUT .= " -\n"; - $SW = 3 - $SW; + // Prepare marking of default (maybe current user's) id + $start = ''; $end = ''; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) { + $start = ''; + $end = ''; + } // END - if + + // Prepare content + $content = array( + 'idx' => ($idx + 1), + 'userid' => $DATA['userid'][$idx], + 'ref' => $DATA['ref'][$idx], + 'infos' => $DATA['infos'][$idx], + 'start' => $start, + 'end' => $end + ); + + // Load row template + $OUT .= loadTemplate('guest_rallye_row', true, $content); } // END - for - // Add footer - $OUT .= loadTemplate('guest_rallye_expired_footer', true); + // Prepare content + $content = array( + 'rows' => $OUT, + 'min_users' => '???', + 'min_prices' => '???' + ); - // And finnally return the output - return $OUT; + // Load main template and finnally return the output + return loadTemplate('guest_rallye', true, $content); } // function purgeExpiredReferalRallyes () { // Check for expired rallyes $EXPIRE = 3; // @TODO The hard-coded value... - $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time -FROM `{?_MYSQL_PREFIX?}_rallye_data` -WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'", + $result_rallye = SQL_QUERY_ESC("SELECT + `id`, `title`, `start_time`, `end_time` +FROM + `{?_MYSQL_PREFIX?}_rallye_data` +WHERE + `end_time` <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND + `expired`='Y'", array($EXPIRE), __FUNCTION__, __LINE__); - if (SQL_NUMROWS($result_rallye) > 0) { + if (!SQL_HASZERONUMS($result_rallye)) { // Init SQLs initSqls(); @@ -739,7 +788,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'", $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", @@ -749,7 +798,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'", 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 @@ -796,7 +845,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { $OUT .= ''; } else { // No rallye templates found - $OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND'); + $OUT = '{--RALLYE_NO_TEMPLATES_FOUND--}'; } // Return selection @@ -811,14 +860,14 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') { $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]}
"); + //* DEBUG: */ debugOutput('id='.$id.',userid='.$userid.',userid='.$userid.',old='.$old.',level='.$GLOBALS['cache_array']['refsystem']['level'][$id]); if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) { - //* DEBUG: */ print("userid matches!
"); + //* DEBUG: */ debugOutput('userid matches!'); foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) { if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) { // Level does exist so abort here $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id]; - //* DEBUG: */ print("*".$userid.'/'.$cnt."*
"); + //* DEBUG: */ debugOutput('*'.$userid.'/'.$cnt.'*'); break; } elseif ($level > 1) { // Not interesting here... @@ -831,9 +880,7 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') { } // END - if } // END - foreach - //* DEBUG: */ print("
");
-		//* DEBUG: */ print(print_r($GLOBALS['cache_array']['refsystem'], true));
-		//* DEBUG: */ print("
"); + //* DEBUG: */ debugOutput('
'.print_r($GLOBALS['cache_array']['refsystem'], true).'
'); //* DEBUG: */ shutdown(); if ($cnt > 0) { @@ -841,7 +888,7 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') { incrementStatsEntry('cache_hits'); // Remove old refs - //* DEBUG: */ print('+'.$cnt.'/'.$old."+
"); + //* DEBUG: */ debugOutput('+'.$cnt.'/'.$old.'+'); $cnt -= $old; } // END - if } else { @@ -874,14 +921,14 @@ WHERE } // Return count - //* DEBUG: */ print("*".$userid.'/'.$old.'/'.$cnt."*
"); + //* DEBUG: */ debugOutput('*'.$userid.'/'.$old.'/'.$cnt.'*'); return $cnt; } // Determines the right language string for min_users function determineReferalRallyeMinimumUsers ($min_users) { // Rallye ends without user limitation is the default - $return = getMessage('RALLYE_END_NO_USER_LIMITATION'); + $return = '{--RALLYE_END_NO_USER_LIMITATION--}'; if ($min_users > 0) { // Rallye ends when X members are totally in your exchange @@ -895,7 +942,7 @@ function determineReferalRallyeMinimumUsers ($min_users) { // Determines the right language string for min_prices function determineReferalRallyeMinimumPrices ($min_prices) { // Rallye ends without user limitation is the default - $return = getMessage('RALLYE_END_NO_PRICE_LIMITATION'); + $return = '{--RALLYE_END_NO_PRICE_LIMITATION--}'; if ($min_prices > 0) { // Rallye ends when X members are totally in your exchange