X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=a1038eb205cfacf51738223d712f8dcded9fc204;hp=32a205e40c1df9e1c5c9e5b98e6de2082a07c64e;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 32a205e40c..a1038eb205 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -17,7 +17,7 @@ * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * - * Copyright (c) 2003 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -38,73 +38,88 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; - require($INC); -} + die(); +} // END - if -// -function RALLYE_AUTOSTART_RALLYES ($result) { - // Global data array for LOAD_EMAIL_TEMPLATE() +// Auto-start referal rallyes +function autostartReferalRallyes ($result) { + // Global data array for loadEmailTemplate() global $DATA; $DATA = array(); // Load all rallyes (usally we have only one rallye active per time! list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result); + + // Free 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__); - // Do a snapshot off all user refs - $result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY userid", __FUNCTION__, __LINE__); - - // Transfer all neccessary data to the global $DATA array - $DATA['uid_cnt'] = SQL_NUMROWS($result_user); - $DATA['start'] = MAKE_DATETIME($start, "2"); - $DATA['end'] = MAKE_DATETIME($end , "2"); - $DATA['now_t'] = MAKE_DATETIME(time(), "2"); + // Transfer all neccessary data to the $DATA array + $DATA['userid_cnt'] = countSumTotalData('CONFIRMED','user_data','userid','status',true); + $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['id'] = $id; // id for the rallye details link // Determine min_users and min_prices - $DATA['min_users'] = RALLYE_DETERMINE_MIN_USERS($min_users); - $DATA['min_prices'] = RALLYE_DETERMINE_MIN_PRICES($min_prices); + $DATA['min_users'] = determineReferalRallyeMinimumUsers($min_users); + $DATA['min_prices'] = determineReferalRallyeMinimumPrices($min_prices); // Load prices - $prices = RALLYE_ADD_PRICES($id); + $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__); // Let's begin with the userids... while ($content = SQL_FETCHARRAY($result_user)) { $un = false; // Get refs by userid - $cnt = RALLYE_GET_REFCOUNT($content['userid']); - if (empty($cnt)) $cnt = 0; // Added prevent some unknown troubles... :-? + $cnt = getReferalRallyeRefsCount($content['userid']); + 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) { + if (SQL_NUMROWS($result_ref) == '0') { // Free memory SQL_FREERESULT($result_ref); // Add userid and his ref count to table - $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points) -FROM `{!_MYSQL_PREFIX!}_user_points` AS p -LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d -ON p.userid=d.userid -WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s", - array(getConfig('ref_payout'), bigintval($content['userid'])), __FUNCTION__, __LINE__); + $result_ref = SQL_QUERY_ESC("SELECT + SUM(p.points) AS points +FROM + `{?_MYSQL_PREFIX?}_user_points` AS p +LEFT JOIN + `{?_MYSQL_PREFIX?}_user_data` AS d +ON + p.userid=d.userid +WHERE + d.`status`='CONFIRMED' AND + d.max_mails > 0 AND + d.mails_confirmed >= {?ref_payout?} AND + p.ref_depth=1 AND + p.points > 0 + AND d.userid=%s", + array(bigintval($content['userid'])), __FUNCTION__, __LINE__); + + // Get points list($cpoints) = SQL_FETCHROW($result_ref); + + // Free result SQL_FREERESULT($result_ref); - if (empty($cpoints)) $cpoints = "0.00000"; + if (empty($cpoints)) $cpoints = '0.00000'; // Add info line - SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs, curr_points) + 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']), bigintval($cnt), $cpoints), __FUNCTION__, __LINE__); + array(bigintval($id), bigintval($content['userid']), bigintval($cnt), $cpoints), __FUNCTION__, __LINE__); $un = true; } // END - if @@ -114,31 +129,40 @@ VALUES ('%s','%s','%s','%s')", // Shall I notify this member? if (($notify == 'Y') && ($un)) { // Load email template and send it to the user - $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $content['userid']); - SEND_EMAIL($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg); + $message = loadEmailTemplate('member_rallye_notify', array('prices' => $prices), $content['userid']); + sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message); } // END - if } // END - while // Choose the right admin template - $templ = "admin_rallye_no_notify"; - if ($notify == 'Y') $templ = "admin_rallye_notify"; + $templ = 'admin_rallye_no_notify'; + if ($notify == 'Y') $templ = 'admin_rallye_notify'; // Send email to admin - SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, "0"); + sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, 0); // Free memory SQL_FREERESULT($result_user); } + // -function RALLYE_ADD_PRICES ($rallye, $mode='email') { +function addReferalRallyePrices ($rallye, $mode='email') { // Output mode switch($mode) { case 'email': $mode = "\n"; break; case 'html' : $mode = "
\n"; break; - } + } // END - switch // Load prices - $result_prices = SQL_QUERY("SELECT price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id='".$rallye."' ORDER BY price_level", __FUNCTION__, __LINE__); + $result_prices = SQL_QUERY("SELECT + `price_level`, `points`, `info` +FROM + `{?_MYSQL_PREFIX?}_rallye_prices` +WHERE + `rallye_id`='".$rallye."' +ORDER BY + `price_level` ASC", + __FUNCTION__, __LINE__); if (SQL_NUMROWS($result_prices) > 0) { // Load prices if ($mode == "\n") $prices = "{--RALLYE_MEMBER_PRICES_ADDED--}:".$mode."------------------------------".$mode; @@ -148,9 +172,9 @@ function RALLYE_ADD_PRICES ($rallye, $mode='email') { if (!empty($content['info'])) { $prices .= $content['info']; } else { - $prices .= $content['points']." {!POINTS!}"; + $prices .= $content['points'] . ' {?POINTS?}'; } - $prices .= "".$mode; + $prices .= '' . $mode; } // END - if // Free memory @@ -161,113 +185,145 @@ function RALLYE_ADD_PRICES ($rallye, $mode='email') { } // Add last line for email mode - if ($mode == "\n") $prices .= "------------------------------"; + if ($mode == "\n") $prices .= '------------------------------'; // Return price list return $prices; } // -function RALLYE_ADD_TOPUSERS ($rallye, $default=0) { +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 DISTINCT u.userid, u.refs, u.curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` AS u -LEFT JOIN `{!_MYSQL_PREFIX!}_refsystem` AS r -ON u.userid=r.userid -WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC", + $result = SQL_QUERY_ESC("SELECT + u.userid, u.refs, u.curr_points FROM `{?_MYSQL_PREFIX?}_rallye_users` AS u +LEFT JOIN + `{?_MYSQL_PREFIX?}_refsystem` AS r +ON + u.userid=r.userid +WHERE + u.rallye_id=%s AND r.counter > 0 +ORDER BY + u.refs DESC", array(bigintval($rallye)), __FUNCTION__, __LINE__); // Load users $DATA = array( - 'uid' => array(), + 'userid' => array(), 'ref' => array(), 'cpoints' => array() ); while ($content = SQL_FETCHARRAY($result)) { // Get current refs - $cnt = RALLYE_GET_REFCOUNT($content['userid'], $content['refs']); + $cnt = getReferalRallyeRefsCount($content['userid'], $content['refs']); // Points of ref's - $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM `{!_MYSQL_PREFIX!}_user_points` AS p -LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d -ON p.userid=d.userid -WHERE d.userid=%s AND d.`status`='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s -LIMIT 1", array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCTION__, __LINE__); + $result_ref = SQL_QUERY_ESC("SELECT + p.points +FROM + `{?_MYSQL_PREFIX?}_user_points` AS p +LEFT JOIN + `{?_MYSQL_PREFIX?}_user_data` AS d +ON + p.userid=d.userid +WHERE + d.userid=%s AND + d.`status`='CONFIRMED' AND + p.ref_depth=1 AND + d.max_mails > 0 AND + d.mails_confirmed >= %s +LIMIT 1", + array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCTION__, __LINE__); + + // Get points list($refpoints) = SQL_FETCHROW($result_ref); + + // Free result SQL_FREERESULT($result_ref); - if (empty($refpoints)) $refpoints = 0; + if (empty($refpoints)) $refpoints = '0'; // Init userid for list - $_uid = "---"; + $_userid = '---'; + // List only users with at least one ref! - //* DEBUG: */ echo "*".$cnt."/".$content['userid']."/".$content['curr_points']."/".$refpoints."*
\n"; - if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_uid = $content['userid']; } else { $cnt = ''; } + //* DEBUG: */ print("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*
"); + if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_userid = $content['userid']; } else { $cnt = ''; } // Save values to array - $DATA['uid'][] = $_uid; + $DATA['userid'][] = $_userid; $DATA['ref'][] = $cnt; $DATA['cpoints'][] = $content['curr_points']; - } + } // END - while // Free memory SQL_FREERESULT($result); // Sort whole array - array_pk_sort($DATA, array("ref", "cpoints"), 0, 1, true); + array_pk_sort($DATA, array('ref', 'cpoints'), 0, 1, true); // Generate table - $OUT = LOAD_TEMPLATE("guest_rallye_header", true); + $OUT = loadTemplate('guest_rallye_header', true); $SW = 2; - for ($idx = 0; $idx < $prices; $idx++) - { - if (empty($DATA['uid'][$idx])) $DATA['uid'][$idx] = "---"; - if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = "---"; + 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['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; - $OUT .= $DATA['uid'][$idx]; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + $OUT .= $DATA['userid'][$idx]; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " "; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['ref'][$idx]; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " \n"; $SW = 3 - $SW; - } + } // END - for + // Add footer - $OUT .= LOAD_TEMPLATE("guest_rallye_footer", true); + $OUT .= loadTemplate('guest_rallye_footer', true); // And finnally return the output return $OUT; } + // Run this function only when a new member has confirmed his email address! -function RALLYE_AUTOADD_USER ($uid) { +function addUserToReferalRallye ($userid) { global $DATA; $add = ''; // Updated extension? - if (GET_EXT_VERSION('rallye') >= '0.2.0') { - $add .= ", min_users, min_prices"; + if (getExtensionVersion('rallye') >= '0.2.0') { + $add .= ", `min_users`, `min_prices`"; } // END - if // Check for an auto-add rallye - $result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify".$add." FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FUNCTION__, __LINE__); + $result = SQL_QUERY("SELECT + `id`, `title`, `start_time`, `end_time`, `send_notify`".$add." +FROM + `{?_MYSQL_PREFIX?}_rallye_data` +WHERE + `is_active`='Y' AND + `notified`='Y' AND + `auto_add_new_user`='Y' AND + `expired`='N' +LIMIT 1", __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Init variables - $min_users = 0; $min_prices = 0; + $min_users = '0'; $min_prices = '0'; // Load data - if (GET_EXT_VERSION('rallye') >= '0.2.0') { + if (getExtensionVersion('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); @@ -277,98 +333,104 @@ function RALLYE_AUTOADD_USER ($uid) { SQL_FREERESULT($result); // 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($uid)), __FUNCTION__, __LINE__); + $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__); // Is this user added? - if (SQL_NUMROWS($result) == 0) { + if (SQL_NUMROWS($result) == '0') { // 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($uid)), __FUNCTION__, __LINE__); - } else { - // Free memory - SQL_FREERESULT($result); - } + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_users` (`rallye_id`, `userid`, `refs`) +VALUES ('%s','%s',0)", + 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'] = MAKE_DATETIME($start, "2"); - $DATA['end'] = MAKE_DATETIME($end , "2"); - $DATA['now_t'] = MAKE_DATETIME(time(), "2"); + $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'] = GET_TOTAL_DATA($uid, "user_data", 'userid', "refid", true); + $DATA['id'] = $id; // id for the rallye details link + $DATA['ref'] = '0'; + $DATA['refs'] = countSumTotalData($userid, 'user_data', 'userid', "refid", true); // Load prices - $prices = RALLYE_ADD_PRICES($id); + $prices = addReferalRallyePrices($id); // Determine min_users/prices tring - $DATA['min_users'] = RALLYE_DETERMINE_MIN_USERS($min_users); - $DATA['min_prices'] = RALLYE_DETERMINE_MIN_PRICES($min_prices); + $DATA['min_users'] = determineReferalRallyeMinimumUsers($min_users); + $DATA['min_prices'] = determineReferalRallyeMinimumPrices($min_prices); // Send notification to member - $msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid); - SEND_EMAIL($uid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg); + $message = loadEmailTemplate('member_rallye_notify', array('prices' => $prices), $userid); + sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message); } // END - if } // END - if } // -function RALLYE_EXPIRE_RALLYES ($result) { +function markReferalRallyesAsExpired ($result) { global $DATA; // Load rallye data list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result); + + // Free result SQL_FREERESULT($result); // Load users array (!) with assigned prices - $prices = RALLYE_LOAD_USERS_ARRAY($id); + $prices = getArrayFromReferalRallyeUsers($id); // Init array - $DATA = array(); $cnt = 0; + $DATA = array(); $cnt = '0'; $users = array(); $DATA['title'] = $title; - $DATA['start'] = MAKE_DATETIME($start, "1"); - $DATA['end'] = MAKE_DATETIME($end , "1"); - $DATA['now_t'] = MAKE_DATETIME(time(), "1"); + $DATA['start'] = generateDateTime($start, 1); + $DATA['end'] = generateDateTime($end , 1); + $DATA['now_t'] = generateDateTime(time(), 1); // Just count... - $total = 0; - foreach($prices['uid'] as $key => $uid) { + $total = '0'; + 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($uid)), __FUNCTION__, __LINE__); + // 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); $prices['active'][$key] = $active; // Allow valid and active users with at least one ref to get points - if (($uid > 0) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0)) { + if (($userid > 0) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0)) { $total++; } // END - if } // END - foreach - if (($total < $min_prices) || ($total == 0)) { + if (($total < $min_prices) || ($total == '0')) { // Do not end this rallye! unset($DATA); return; } // END - if // Expire rallye - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET expired='Y' WHERE id=%s LIMIT 1", - array(bigintval($id)), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `expired`='Y' WHERE `id`=%s LIMIT 1", + array(bigintval($id)), __FUNCTION__, __LINE__); - // Run array through (by uid is the most important 2nd-level-array) - foreach($prices['uid'] as $key => $uid) { + // Run array through (by userid is the most important 2nd-level-array) + foreach($prices['userid'] as $key => $userid) { // Allow valid and active users with at least one ref to get points - if (($uid > 0) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0)) { + if (($userid > 0) && ($prices['ref'][$key] > 0) && ($prices['active'][$key] == 1) && ($prices['cpoints'][$key] > 0)) { // Transfer data to array for the mail template $DATA['level'] = $prices['level'][$key]; $DATA['points'] = $prices['points'][$key]; @@ -381,18 +443,18 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__); // Determine winner level if ($DATA['level'] == 1) { // The winner! - $winnerLevel = "_gold"; + $winnerLevel = '_gold'; } elseif ($DATA['level'] == 2) { // The vice winner! - $winnerLevel = "_silver"; + $winnerLevel = '_silver'; } elseif ($DATA['level'] == 3) { // The bronce winner - $winnerLevel = "_bronce"; + $winnerLevel = '_bronce'; } if ($DATA['points'] > 0) { // Add points directly to user's account - ADD_POINTS_REFSYSTEM("rallye_winner" . $winnerLevel, $uid, $DATA['points'], false, "0", false, "direct"); + addPointsDirectly('rallye_winner' . $winnerLevel, $userid, $DATA['points']); } // END - if if ($notify == 'Y') { @@ -402,62 +464,58 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__); $DATA['infos'] = $DATA['info']; } else { // Take points - $DATA['infos'] = $DATA['points']." {!POINTS!}"; + $DATA['infos'] = $DATA['points'] . ' {?POINTS?}'; } // Add suffix to template name - $template = "member_rallye_expired".$winnerLevel; + $template = 'member_rallye_expired' . $winnerLevel; // Load template - $msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid); - SEND_EMAIL($uid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $msg); + $message = loadEmailTemplate($template, $DATA, $userid); + sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $message); } // END - if // Count userid $cnt++; - $users['uid'][$uid] = $uid; - $users['poi'][$uid] = $DATA['infos']; + $users['userid'][$userid] = $userid; + $users['poi'][$userid] = $DATA['infos']; } // END - if } // END - foreach // Select template depending on notfication is switch on / off if ($notify == 'Y') { $templ = "admin_rallye_expired"; - } elseif (is_array($users['uid'])) { + } elseif (is_array($users['userid'])) { $templ = "admin_rallye_expired_no"; - $cnt = RALLYE_LOAD_USER_DATA($users); + $cnt = getReferalRallyeUserDataFromArray($users); } // Send mail to admin - SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0); + sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0); // Add task - SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created) -VALUES ('NEW','RALLYE_EXPIRED','{--RALLYE_ADMIN_EXPIRED--}: %s','{--RALLYE_ADMIN_EXPIRED_TEXT--}',UNIX_TIMESTAMP())", - array($title), __FUNCTION__, __LINE__); - - // All work done here... + createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED'); } // -function RALLYE_LOAD_USER_DATA ($uids_array) { +function getReferalRallyeUserDataFromArray ($userIds) { // Implode user ids - $uid_string = implode(",", $uids_array['uid']); + $userid_string = implode(',', $userIds['userid']); // Init result string $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 LIMIT %s", - array($uid_string, count($uids_array)), __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", - TRANSLATE_GENDER($content['gender']), + translateGender($content['gender']), $content['surname'], $content['family'], $content['email'], - $uids_array['poi'][$content['userid']] + $userIds['poi'][$content['userid']] ); } // END - while @@ -466,7 +524,7 @@ function RALLYE_LOAD_USER_DATA ($uids_array) { } // -function RALLYE_LOAD_PRICES_ARRAY ($rallye) { +function getArrayFromReferalRallyePrices ($rallye) { // Init multi array $prices = array( 'level' => array(), @@ -475,8 +533,8 @@ function RALLYE_LOAD_PRICES_ARRAY ($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", + array(bigintval($rallye)), __FUNCTION__, __LINE__); // Transfer elements while ($content = SQL_FETCHARRAY($result)) { @@ -493,42 +551,57 @@ function RALLYE_LOAD_PRICES_ARRAY ($rallye) { } // -function RALLYE_LOAD_USERS_ARRAY ($rallye) { +function getArrayFromReferalRallyeUsers ($rallye) { // Fix zero points to 0.00000 - if (getConfig('ref_payout') == "0") setConfigEntry('ref_payout', "0.00000"); + if (getConfig('ref_payout') == '0') setConfigEntry('ref_payout', '0.00000'); // Init multi array $users = array( - 'uid' => array(), + 'userid' => array(), 'ref' => array(), 'cpoints' => array(), ); - // Load users uid old points earned - $result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid", + // Load users userid old points earned + $result_user = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC", array(bigintval($rallye)), __FUNCTION__, __LINE__); while ($content = SQL_FETCHARRAY($result_user)) { // Load current ref count - $cnt = RALLYE_GET_REFCOUNT($content['userid'], $content['refs']); + $cnt = getReferalRallyeRefsCount($content['userid'], $content['refs']); // Points of ref's - $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points) -FROM `{!_MYSQL_PREFIX!}_user_points` AS p -LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d -ON p.userid=d.userid -WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s", - array(getConfig('ref_payout'), bigintval($content['userid'])), __FUNCTION__, __LINE__); + $result_ref = SQL_QUERY_ESC("SELECT + SUM(p.points) AS points +FROM + `{?_MYSQL_PREFIX?}_user_points` AS p +LEFT JOIN + `{?_MYSQL_PREFIX?}_user_data` AS d +ON + p.userid=d.userid +WHERE + d.`status`='CONFIRMED' AND + d.max_mails > 0 AND + d.mails_confirmed >= {?ref_payout?} AND + p.ref_depth=1 AND + p.points > 0 AND + d.userid=%s +LIMIT 1", + array(bigintval($content['userid'])), __FUNCTION__, __LINE__); + + // Get points list($refpoints) = SQL_FETCHROW($result_ref); + + // Free result SQL_FREERESULT($result_ref); // Fix empty refpoints - if (empty($refpoints)) $refpoints = 0; + if (empty($refpoints)) $refpoints = '0'; // Store calculated new refs to array - $users['uid'][] = $content['userid']; + $users['userid'][] = $content['userid']; $users['ref'][] = abs($cnt - $content['refs']); $users['cpoints'][] = $refpoints - $content['curr_points']; - } + } // END - while // Free memory SQL_FREERESULT($result_user); @@ -537,16 +610,16 @@ WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND array_pk_sort($users, array("ref", "cpoints"), 0, 1, true); // Load prices array (!) - $prices = RALLYE_LOAD_PRICES_ARRAY($rallye); + $prices = getArrayFromReferalRallyePrices($rallye); // Merge users into prices - foreach ($prices['level'] as $k => $lvl) { + foreach ($prices['level'] as $k => $level) { // We only need to check one element in $users, see above while() block - if (isset($users['uid'][$k])) { - $prices['uid'][$k] = $users['uid'][$k]; - if (empty($prices['uid'][$k])) $prices['uid'][$k] = "---"; + 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] = "---"; + if (empty($prices['ref'][$k])) $prices['ref'][$k] = '---'; $prices['cpoints'][$k] = $users['cpoints'][$k]; } // END - if } // END - foreach @@ -556,41 +629,38 @@ WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND } // -function RALLYE_LIST_WINNERS ($rallye, $default=0) { +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", - array(bigintval($rallye)), __FUNCTION__, __LINE__); + $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); // Load data - $DATA = RALLYE_LOAD_USERS_ARRAY($rallye); + $DATA = getArrayFromReferalRallyeUsers($rallye); // Generate table - $OUT = LOAD_TEMPLATE("guest_rallye_expired_header", true); + $OUT = loadTemplate('guest_rallye_expired_header', true); $SW = 2; - for ($idx = 0; $idx < $prices; $idx++) { + for ($idx = '0'; $idx < $prices; $idx++) { // Check status // active = 1: account is still confirmed - // active = 0: account is deleted or locked - $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1", - array(bigintval($DATA['uid'][$idx])), __FUNCTION__, __LINE__); - list($active) = SQL_FETCHROW($result_active); - SQL_FREERESULT($result_active); - - if (empty($DATA['uid'][$idx])) $DATA['uid'][$idx] = "---"; - if ((empty($DATA['ref'][$idx])) || ($DATA['ref'][$idx] == 0) || ($active == 0) || ("".round($DATA['cpoints'][$idx])."" == "0") || (empty($DATA['cpoints'][$idx]))) { + // 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]))) { // Allow valid and active users with at least one ref to get points - $DATA['ref'][$idx] = "---"; - $DATA['uid'][$idx] = "---"; - } + $DATA['ref'][$idx] = '---'; + $DATA['userid'][$idx] = '---'; + } // END - if if (!empty($DATA['info'][$idx])) { // Take direct infos $DATA['infos'][$idx] = $DATA['info'][$idx]; } else { // Take ppints - $DATA['infos'][$idx] = $DATA['points'][$idx]." {!POINTS!}"; + $DATA['infos'][$idx] = $DATA['points'][$idx] . ' {?POINTS?}'; } // Add row @@ -598,70 +668,64 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) { $OUT .= "   ".($idx+1).". "; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; - $OUT .= $DATA['uid'][$idx]; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + $OUT .= $DATA['userid'][$idx]; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " "; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['ref'][$idx]; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " "; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= $DATA['infos'][$idx]; - if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= ""; + if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= ""; $OUT .= " \n"; $SW = 3 - $SW; - } + } // END - for // Add footer - $OUT .= LOAD_TEMPLATE("guest_rallye_expired_footer", true); + $OUT .= loadTemplate('guest_rallye_expired_footer', true); // And finnally return the output return $OUT; } // -function RALLYE_DELETE_EXPIRED_RALLYES () { - global $DATA; - +function purgeExpiredReferalRallyes () { // Check for expired rallyes - $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value... + $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() - %s) AND expired='Y'", +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) { // Init SQLs - INIT_SQLS(); + initSqls(); // Expire found rallyes and notify admin while ($content = SQL_FETCHARRAY($result_rallye)) { // Prepare data for mail template - $DATA['title'] = $content['title']; - $DATA['start'] = MAKE_DATETIME($content['start_time'], "1"); - $DATA['end'] = MAKE_DATETIME($content['end_time'] , "1"); - $DATA['now_t'] = MAKE_DATETIME(time(), "1"); + $content['start_time'] = generateDateTime($content['start_time'], 1); + $content['end_time'] = generateDateTime($content['end_time'] , 1); + $content['now_time'] = generateDateTime(time(), 1); // Send mail to admin - SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), "admin_rallye_purged", '', 0); + sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), 'admin_rallye_purged', $content, 0); // Purge whole rallye - ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1", + addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1", array(bigintval($content['id'])), __FUNCTION__, __LINE__, false)); - ADD_SQL(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)); - ADD_SQL(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 - // @TODO Rewrite this to a function - ADD_SQL(SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created) -VALUES ('NEW','RALLYE_PURGED','{--RALLYE_ADMIN_PURGED--}: %s','{--RALLYE_ADMIN_PURGED_TEXT--}',UNIX_TIMESTAMP())", - array($content['title']), __FUNCTION__, __LINE__, false)); + createNewTask('{--RALLYE_ADMIN_PURGED--}: ' . $content['title'], '{--RALLYE_ADMIN_PURGED_TEXT--}', 'RALLYE_PURGED'); } // END - while // Run all SQLs @@ -673,24 +737,25 @@ VALUES ('NEW','RALLYE_PURGED','{--RALLYE_ADMIN_PURGED--}: %s','{--RALLYE_ADMIN_P } // -function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") { +function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { + // Init variables + $OUT = ''; + $ral = array(); + // Check templates directory - $OUT = ''; $ral = array(); - $BASE = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE()); - $dir = opendir($BASE); - while ($read = readdir($dir)) { - // If it is no dir (so a file) - if (!isDirectory($BASE.$read)) { - // Accept only templates matching with rallye_????.tpl.xx - if (eregi("^rallye_.*\.tpl", $read)) - { - $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; - } - } - } - closedir($dir); + $basePath = sprintf("templates/%s/html/rallye/", getLanguage()); + + // Read the directory + $templates = getArrayFromDirectory($basePath, 'rallye_', false, true, array(), '.tpl'); + + // And walk through + foreach ($templates as $read) { + // Cut prefix and extension away + $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 // Do we have found templates which we can link with the new rallye? if (!empty($ral[0])) { @@ -699,10 +764,10 @@ function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") { $OUT = "\n"; } else { // No rallye templates found @@ -714,68 +779,69 @@ function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") { } // -function RALLYE_GET_REFCOUNT ($uid, $old=0) { +function getReferalRallyeRefsCount ($userid, $old = '0') { // Check current refs - if (GET_EXT_VERSION('cache') >= '0.1.2') { + if (getExtensionVersion('cache') >= '0.1.2') { // Get refs from cache - $cnt = 0; - foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $uid) { + $cnt = '0'; + foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) { // Do we have a ref for this user? - //* DEBUG: */ echo "id={$id},uid={$uid},uid={$uid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}
\n"; - if (($uid == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) { - //* DEBUG: */ echo "uid matches!
\n"; - foreach ($GLOBALS['cache_array']['ref_depths']['level'] as $level) { + //* 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)) { + //* DEBUG: */ print("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: */ echo "*".$uid."/".$cnt."*
"; + //* DEBUG: */ print("*".$userid.'/'.$cnt."*
"); break; } elseif ($level > 1) { // Not interesting here... break; } - } + } // END - foreach // Abort also here! if ($cnt > 0) break; - } - } - //* DEBUG: */ echo "
";
-		//* DEBUG: */ print_r($GLOBALS['cache_array']['refsystem']);
-		//* DEBUG: */ echo "
"; - //* DEBUG: */ die(); + } // END - if + } // END - foreach + + //* DEBUG: */ print("
");
+		//* DEBUG: */ print(print_r($GLOBALS['cache_array']['refsystem'], true));
+		//* DEBUG: */ print("
"); + //* DEBUG: */ shutdown(); if ($cnt > 0) { // Count cache hits - incrementConfigEntry('cache_hits'); + incrementStatsEntry('cache_hits'); // Remove old refs - //* DEBUG: */ echo "+".$cnt."/".$old."+
"; + //* DEBUG: */ print('+'.$cnt.'/'.$old."+
"); $cnt -= $old; } // END - if } else { // Load current refs from database - $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt -FROM `{!_MYSQL_PREFIX!}_refsystem` AS s -LEFT JOIN `{!_MYSQL_PREFIX!}_refdepths` AS d + $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($uid)), __FUNCTION__, __LINE__); +WHERE s.userid=%s AND s.level=1", array(bigintval($userid)), __FUNCTION__, __LINE__); list($cnt) = SQL_FETCHROW($result_ref); SQL_FREERESULT($result_ref); if (empty($cnt)) { - $cnt = 0; + $cnt = '0'; } else { $cnt -= $old; } } // Return count - //* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*
"; + //* DEBUG: */ print("*".$userid.'/'.$old.'/'.$cnt."*
"); return $cnt; } // Determines the right language string for min_users -function RALLYE_DETERMINE_MIN_USERS ($min_users) { +function determineReferalRallyeMinimumUsers ($min_users) { // Rallye ends without user limitation is the default $return = getMessage('RALLYE_END_NO_USER_LIMITATION'); @@ -789,7 +855,7 @@ function RALLYE_DETERMINE_MIN_USERS ($min_users) { } // Determines the right language string for min_prices -function RALLYE_DETERMINE_MIN_PRICES ($min_prices) { +function determineReferalRallyeMinimumPrices ($min_prices) { // Rallye ends without user limitation is the default $return = getMessage('RALLYE_END_NO_PRICE_LIMITATION'); @@ -805,8 +871,8 @@ function RALLYE_DETERMINE_MIN_PRICES ($min_prices) { // Filter for extra-autpurge function FILTER_RALLYE_EXTRA_AUTOPURGE () { // Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!) - RALLYE_DELETE_EXPIRED_RALLYES(); + purgeExpiredReferalRallyes(); } -// +// [EOF] ?>