X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=c1e37c5812e87b306a53df13640720eabea71802;hp=be5457cb612ef6583b562a5e7cddf0831762bb72;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hpb=aa63aed07428a99ea09002c8d072990677700080 diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index be5457cb61..c1e37c5812 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -53,17 +53,17 @@ function RALLYE_AUTOSTART_RALLYES ($result) { SQL_FREERESULT($result); // Set notified to Y - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET notified='Y' WHERE id=%s LIMIT 1", - array(bigintval($id)), __FUNCTION__, __LINE__); + 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__); + $result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC", __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"); + $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 @@ -83,8 +83,8 @@ function RALLYE_AUTOSTART_RALLYES ($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", - array(bigintval($id), bigintval($content['userid'])), __FUNCTION__, __LINE__); + $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 SQL_FREERESULT($result_ref); @@ -95,16 +95,16 @@ 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__); + array(getConfig('ref_payout'), bigintval($content['userid'])), __FUNCTION__, __LINE__); list($cpoints) = SQL_FETCHROW($result_ref); 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) 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,8 +114,8 @@ 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 = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $content['userid']); + sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message); } // END - if } // END - while @@ -124,7 +124,7 @@ VALUES ('%s','%s','%s','%s')", 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); @@ -170,8 +170,8 @@ function RALLYE_ADD_PRICES ($rallye, $mode='email') { // function RALLYE_ADD_TOPUSERS ($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", - array(bigintval($rallye)), __FUNCTION__, __LINE__); + $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); @@ -180,7 +180,7 @@ function RALLYE_ADD_TOPUSERS ($rallye, $default=0) { 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__); + array(bigintval($rallye)), __FUNCTION__, __LINE__); // Load users $DATA = array( @@ -207,7 +207,7 @@ LIMIT 1", array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCT // Init userid for list $_uid = '---'; // List only users with at least one ref! - //* DEBUG: */ echo "*".$cnt."/".$content['userid']."/".$content['curr_points']."/".$refpoints."*
\n"; + //* DEBUG: */ OUTPUT_HTML("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*
"); if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_uid = $content['userid']; } else { $cnt = ''; } // Save values to array @@ -223,7 +223,7 @@ LIMIT 1", array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCT array_pk_sort($DATA, array('ref', 'cpoints'), 0, 1, true); // Generate table - $OUT = LOAD_TEMPLATE("guest_rallye_header", true); + $OUT = LOAD_TEMPLATE('guest_rallye_header', true); $SW = 2; for ($idx = 0; $idx < $prices; $idx++) { if (empty($DATA['uid'][$idx])) $DATA['uid'][$idx] = '---'; @@ -277,15 +277,15 @@ 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($uid)), __FUNCTION__, __LINE__); // Is this user added? 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__); + array(bigintval($id), bigintval($uid)), __FUNCTION__, __LINE__); } // END - if // Free memory @@ -293,13 +293,13 @@ VALUES ('%s','%s','0')", 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['refs'] = GET_TOTAL_DATA($uid, 'user_data', 'userid', "refid", true); // Load prices $prices = RALLYE_ADD_PRICES($id); @@ -309,8 +309,8 @@ VALUES ('%s','%s','0')", $DATA['min_prices'] = RALLYE_DETERMINE_MIN_PRICES($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 = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid); + sendEmail($uid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message); } // END - if } // END - if } @@ -330,9 +330,9 @@ function RALLYE_EXPIRE_RALLYES ($result) { $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; @@ -340,10 +340,14 @@ function RALLYE_EXPIRE_RALLYES ($result) { // 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__); + $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__); list($active) = SQL_FETCHROW($result); SQL_FREERESULT($result); @@ -362,8 +366,8 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__); } // 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) { @@ -381,18 +385,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"); + ADD_POINTS_REFSYSTEM_DIRECT('rallye_winner' . $winnerLevel, $uid, $DATA['points']); } // END - if if ($notify == 'Y') { @@ -402,15 +406,15 @@ 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 = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid); + sendEmail($uid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $message); } // END - if // Count userid @@ -429,35 +433,31 @@ LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__); } // 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) { // Implode user ids - $uid_string = implode(",", $uids_array['uid']); + $uid_string = implode(',', $uids_array['uid']); // 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", + $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($uid_string, count($uids_array)), __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']), - $content['surname'], - $content['family'], - $content['email'], - $uids_array['poi'][$content['userid']] + translateGender($content['gender']), + $content['surname'], + $content['family'], + $content['email'], + $uids_array['poi'][$content['userid']] ); } // END - while @@ -476,7 +476,7 @@ 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__); + array(bigintval($rallye)), __FUNCTION__, __LINE__); // Transfer elements while ($content = SQL_FETCHARRAY($result)) { @@ -495,7 +495,7 @@ function RALLYE_LOAD_PRICES_ARRAY ($rallye) { // function RALLYE_LOAD_USERS_ARRAY ($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( @@ -505,8 +505,8 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) { ); // 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", - array(bigintval($rallye)), __FUNCTION__, __LINE__); + $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']); @@ -517,7 +517,7 @@ 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__); + array(getConfig('ref_payout'), bigintval($content['userid'])), __FUNCTION__, __LINE__); list($refpoints) = SQL_FETCHROW($result_ref); SQL_FREERESULT($result_ref); @@ -558,7 +558,7 @@ WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND // function RALLYE_LIST_WINNERS ($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", + $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); @@ -567,19 +567,16 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) { $DATA = RALLYE_LOAD_USERS_ARRAY($rallye); // Generate table - $OUT = LOAD_TEMPLATE("guest_rallye_expired_header", true); + $OUT = LOAD_TEMPLATE('guest_rallye_expired_header', true); $SW = 2; 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); + $active = GET_TOTAL_DATA($DATA['uid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'"); 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]))) { + 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] = '---'; @@ -590,7 +587,7 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) { $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 @@ -632,7 +629,7 @@ function RALLYE_DELETE_EXPIRED_RALLYES () { $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'", - array($EXPIRE), __FUNCTION__, __LINE__); + array($EXPIRE), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result_rallye) > 0) { // Init SQLs @@ -642,15 +639,15 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'", 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"); + $DATA['start'] = generateDateTime($content['start_time'], '1'); + $DATA['end'] = generateDateTime($content['end_time'] , '1'); + $DATA['now_t'] = 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", '', 0); // Purge whole rallye - ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1", + ADD_SQL(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", array(bigintval($content['id'])), __FUNCTION__, __LINE__, false)); @@ -658,10 +655,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'", 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,23 +667,25 @@ VALUES ('NEW','RALLYE_PURGED','{--RALLYE_ADMIN_PURGED--}: %s','{--RALLYE_ADMIN_P } // -function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") { +function RALLYE_TEMPLATE_SELECTION ($name = 'template', $default = '') { + // Init variables + $OUT = ''; + $ral = array(); + // Check templates directory - $OUT = ''; $ral = array(); - $basePath = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE()); - $dir = opendir($basePath) or mxchange_die(sprintf("Cannot open dir %s.", $basePath)); - while ($read = readdir($dir)) { - // If it is no dir (so a file) - if (!isDirectory($basePath.$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; - } // END - if - } // END - if + $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 - closedir($dir); // Do we have found templates which we can link with the new rallye? if (!empty($ral[0])) { @@ -713,21 +709,21 @@ function RALLYE_TEMPLATE_SELECTION ($name="template", $default="") { } // -function RALLYE_GET_REFCOUNT ($uid, $old=0) { +function RALLYE_GET_REFCOUNT ($uid, $old = 0) { // Check current refs if (GET_EXT_VERSION('cache') >= '0.1.2') { // Get refs from cache $cnt = 0; foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $uid) { // 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"; + //* DEBUG: */ OUTPUT_HTML("id={$id},uid={$uid},uid={$uid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}
"); if (($uid == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) { - //* DEBUG: */ echo "uid matches!
\n"; + //* DEBUG: */ OUTPUT_HTML("uid matches!
"); foreach ($GLOBALS['cache_array']['ref_depths']['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: */ OUTPUT_HTML("*".$uid.'/'.$cnt."*
"); break; } elseif ($level > 1) { // Not interesting here... @@ -740,17 +736,17 @@ function RALLYE_GET_REFCOUNT ($uid, $old=0) { } // END - if } // END - foreach - //* DEBUG: */ echo "
";
-		//* DEBUG: */ print_r($GLOBALS['cache_array']['refsystem']);
-		//* DEBUG: */ echo "
"; - //* DEBUG: */ die(); + //* DEBUG: */ OUTPUT_HTML("
");
+		//* DEBUG: */ OUTPUT_HTML(print_r($GLOBALS['cache_array']['refsystem'], true));
+		//* DEBUG: */ OUTPUT_HTML("
"); + //* DEBUG: */ shutdown(); if ($cnt > 0) { // Count cache hits incrementConfigEntry('cache_hits'); // Remove old refs - //* DEBUG: */ echo "+".$cnt."/".$old."+
"; + //* DEBUG: */ OUTPUT_HTML('+'.$cnt.'/'.$old."+
"); $cnt -= $old; } // END - if } else { @@ -770,7 +766,7 @@ WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FUNCTION__, __LINE__ } // Return count - //* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*
"; + //* DEBUG: */ OUTPUT_HTML("*".$uid.'/'.$old.'/'.$cnt."*
"); return $cnt; }