X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=c6ad2db0051b3fa74dd5c17d1ae7ffd089e5accb;hp=700d0ca4d0d14d5cbed3be5f882266c9f615cb18;hb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672;hpb=0f700bd2b9e033aad0990f42739cd75d41e372ff

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 700d0ca4d0..c6ad2db005 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -42,18 +42,18 @@ function RALLYE_AUTOSTART_RALLYES($result)
 {
 	// Global data array for LOAD_EMAIL_TEMPLATE()
 	$DATA = array();
-	global $DATA, $_CONFIG;
+	global $DATA;
 
 	// 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);
 	SQL_FREERESULT($result);
 
 	// Set notified to Y
-	$result_notified = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET notified='Y' WHERE id=%s LIMIT 1",
-	 array(bigintval($id)), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET notified='Y' WHERE id=%s LIMIT 1",
+		array(bigintval($id)), __FILE__, __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", __FILE__, __LINE__);
+	$result_user = SQL_QUERY("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
 
 	// Transfer all neccessary data to the global $DATA array
 	$DATA['uid_cnt']    = SQL_NUMROWS($result_user);
@@ -92,7 +92,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 
 		// 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($uid)), __FILE__, __LINE__);
+			array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_ref) == 0) {
 			// Free memory
 			SQL_FREERESULT($result_ref);
@@ -100,19 +100,19 @@ function RALLYE_AUTOSTART_RALLYES($result)
 			// 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
+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($_CONFIG['ref_payout'], bigintval($uid)), __FILE__, __LINE__);
+ array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
 			list($cpoints) = SQL_FETCHROW($result_ref);
 			SQL_FREERESULT($result_ref);
 
 			if (empty($cpoints)) $cpoints = "0.00000";
 
 			// Add info line
-			$result_ref = 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($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
+				array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
 			$un = true;
 		} // END - if
 
@@ -184,8 +184,6 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
 //
 function RALLYE_ADD_TOPUSERS($rallye,$default=0)
 {
-	global $_CONFIG;
-
 	// 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)), __FILE__, __LINE__);
@@ -213,10 +211,10 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
 
 		// 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
+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($uid), $_CONFIG['ref_payout']), __FILE__, __LINE__);
+LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 
@@ -251,14 +249,14 @@ LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout']), __FILE__, __LINE__);
 		$OUT .= "<TR>
   <TD class=\"switch_sw".$SW." bottom2\">&nbsp;&nbsp;".($idx+1).".</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['uid'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
 </TR>\n";
 		$SW = 3 - $SW;
@@ -302,7 +300,7 @@ function RALLYE_AUTOADD_USER($uid)
 		// Is this user added?
 		if (SQL_NUMROWS($result) == 0) {
 			// Add userid and his ref count to table
-			$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs)
+			SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs)
 VALUES ('%s','%s','0')",
  array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
 		} else {
@@ -348,7 +346,7 @@ VALUES ('%s','%s','0')",
 //
 function RALLYE_EXPIRE_RALLYES($result)
 {
-	global $DATA, $_CONFIG;
+	global $DATA;
 
 	// Load rallye data
 	list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
@@ -367,8 +365,7 @@ function RALLYE_EXPIRE_RALLYES($result)
 
 	// Just count...
 	$TOTAL = 0;
-	foreach($prices['uid'] as $key => $uid)
-	{
+	foreach($prices['uid'] as $key => $uid) {
 		// Check status
 		//   active = 1: account is still confirmed
 		//   active = 0: account is deleted or locked
@@ -382,38 +379,50 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 		$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 (($uid > 0) && ($prices['ref'][$key] > 0) && ($active == 1) && ($prices['cpoints'][$key] > 0)) {
 			$TOTAL++;
-		}
-	}
+		} // END - if
+	} // END - foreach
 
 	if (($TOTAL < $min_prices) || ($TOTAL == 0)) {
 		// Do not end this rallye!
 		unset($DATA);
 		return;
-	}
+	} // END - if
 
 	// Expire rallye
-	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET expired='Y' WHERE id=%s LIMIT 1",
-	 array(bigintval($id)), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET expired='Y' WHERE id=%s LIMIT 1",
+		array(bigintval($id)), __FILE__, __LINE__);
 
 	// Run array through (by uid is the most important 2nd-level-array)
-	foreach($prices['uid'] as $key => $uid)
-	{
+	foreach($prices['uid'] as $key => $uid) {
 		// 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 (($uid > 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];
 			$DATA['info']   = $prices['info'][$key];
 			$DATA['ref']    = $prices['ref'][$key];
 
+			// Default is other
+			$winnerLevel = "other";
+
+			// Determine winner level
+			if ($DATA['level'] == 1) {
+				// The winner!
+				$winnerLevel = "_gold";
+			} elseif ($DATA['level'] == 2) {
+				// The vice winner!
+				$winnerLevel = "_silver";
+			} elseif ($DATA['level'] == 3) {
+				// The bronce winner
+				$winnerLevel = "_bronce";
+			}
+
 			if ($DATA['points'] > 0) {
 				// Add points directly to user's account
-				ADD_POINTS_REFSYSTEM($uid, $DATA['points'], false, "0", false, "direct");
-			}
+				ADD_POINTS_REFSYSTEM("rallye_winner" . $winnerLevel, $uid, $DATA['points'], false, "0", false, "direct");
+			} // END - if
 
 			if ($notify == "Y") {
 				// Prepare infos for the mail template
@@ -426,17 +435,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 				}
 
 				// Add suffix to template name
-				$template = "member_rallye_expired";
-				if ($DATA['level'] == 1) {
-					// The winner!
-					$template .= "_gold";
-				} elseif ($DATA['level'] == 2) {
-					// The vice winner!
-					$template .= "_silver";
-				} elseif ($DATA['level'] == 3) {
-					// The bronce winner
-					$template .= "_bronce";
-				}
+				$template = "member_rallye_expired".$winnerLevel;
 
 				// Load template
 				$msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid);
@@ -447,8 +446,8 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 			$cnt++;
 			$users['uid'][$uid] = $uid;
 			$users['poi'][$uid] = $DATA['infos'];
-		}
-	}
+		} // END - if
+	} // END - foreach
 
 	// Select template depending on notfication is switch on / off
 	if ($notify == "Y") {
@@ -459,11 +458,10 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 	}
 
 	// Send mail to admin
-	die("OK!");
 	SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
 
 	// Add task
-	$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
+	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), __FILE__, __LINE__);
 
@@ -476,7 +474,7 @@ function RALLYE_LOAD_USER_DATA($uids_array)
 	$uid_string = implode(",", $uids_array['uid']);
 
 	// 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 LIMIT %s",
 	 array($uid_string, count($uids_array)), __FILE__, __LINE__);
 	$ret = "";
 	while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
@@ -513,13 +511,13 @@ function RALLYE_LOAD_PRICES_ARRAY($rallye)
 	// Return array
 	return $prices;
 }
+
 //
-function RALLYE_LOAD_USERS_ARRAY($rallye)
-{
+function RALLYE_LOAD_USERS_ARRAY ($rallye) {
 	global $_CONFIG;
 
 	// Fix zero points to 0.00000
-	if ($_CONFIG['ref_payout'] == "0") $_CONFIG['ref_payout'] = "0.00000";
+	if (getConfig('ref_payout') == "0") $_CONFIG['ref_payout'] = "0.00000";
 
 	// Init multi array
 	$users = array(
@@ -530,19 +528,18 @@ 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)), __FILE__, __LINE__);
-	while(list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user))
-	{
+		array(bigintval($rallye)), __FILE__, __LINE__);
+	while (list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user)) {
 		// Load current ref count
 		$cnt = RALLYE_GET_REFCOUNT($uid, $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
+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($_CONFIG['ref_payout'], bigintval($uid)), __FILE__, __LINE__);
+			array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 
@@ -564,21 +561,23 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
 	$prices = RALLYE_LOAD_PRICES_ARRAY($rallye);
 
 	// Merge users into prices
-	foreach ($prices['level'] as $k => $lvl)
-	{
-		$prices['uid'][$k]  = $users['uid'][$k];
-		if (empty($prices['uid'][$k])) $prices['uid'][$k]  = "---";
-		$prices['ref'][$k] = $users['ref'][$k];
-		if (empty($prices['ref'][$k])) $prices['ref'][$k] = "---";
-		$prices['cpoints'][$k] = $users['cpoints'][$k];
-	}
+	foreach ($prices['level'] as $k => $lvl) {
+		// 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]  = "---";
+			$prices['ref'][$k] = $users['ref'][$k];
+			if (empty($prices['ref'][$k])) $prices['ref'][$k] = "---";
+			$prices['cpoints'][$k] = $users['cpoints'][$k];
+		} // END - if
+	} // END - foreach
 
 	// Return completed array
 	return $prices;
 }
+
 //
-function RALLYE_LIST_WINNERS($rallye,$default=0)
-{
+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",
 	 array(bigintval($rallye)), __FILE__, __LINE__);
@@ -596,7 +595,7 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 		// 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",
+		$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])), __FILE__, __LINE__);
 		list($active) = SQL_FETCHROW($result_active);
 		SQL_FREERESULT($result_active);
@@ -624,19 +623,19 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 		$OUT .= "<TR>
   <TD class=\"switch_sw".$SW." bottom2".$ADD."\">&nbsp;&nbsp;".($idx+1).".</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['uid'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
   <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['infos'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</TD>
 </TR>\n";
 		$SW = 3 - $SW;
@@ -650,10 +649,10 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 //
 function RALLYE_DELETE_EXPIRED_RALLYES()
 {
-	global $DATA, $_CONFIG;
+	global $DATA;
 
 	// Check for expired rallyes
-	$EXPIRE = $_CONFIG['one_day'] * 3; // @TODO The hard-coded value...
+	$EXPIRE = getConfig('one_day') * 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'",
@@ -674,18 +673,18 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
 			SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_PURGED.": ".$title, "admin_rallye_purged", "", 0);
 
 			// Purge whole rallye
-			$result_purge = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
-			$result_purge = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
-			$result_purge = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
+				array(bigintval($id)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s LIMIT 1",
+				array(bigintval($id)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s LIMIT 1",
+				array(bigintval($id)), __FILE__, __LINE__);
 		}
 
 		// Add task
-		$result_task = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
+		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($title), __FILE__, __LINE__);
+			array($title), __FILE__, __LINE__);
 	}
 
 	// Free memory
@@ -718,15 +717,15 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 	if (!empty($ral[0]))
 	{
 		// Generate selection box for all found templates
-		$OUT  = "<SELECT name=\"".$name."\" size=\"1\" class=\"admin_select\">
-  <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+		$OUT  = "<select name=\"".$name."\" size=\"1\" class=\"admin_select\">
+  <option value=\"\">".SELECT_NONE."</option>\n";
 		foreach ($ral as $rallye)
 		{
-		     $OUT .= "  <OPTION value=\"".$rallye."\"";
+		     $OUT .= "  <option value=\"".$rallye."\"";
 			if ($default == $rallye) $OUT .= " selected default";
-			$OUT .= ">".$rallye."</OPTION>\n";
+			$OUT .= ">".$rallye."</option>\n";
 		}
-		$OUT .= "</SELECT>\n";
+		$OUT .= "</select>\n";
 	}
 	 else
 	{
@@ -739,21 +738,21 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 }
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0) {
-	global $_CONFIG, $cacheArray;
+	global $cacheArray;
 
 	// Check current refs
 	if (GET_EXT_VERSION("cache") >= "0.1.2") {
 		// Get refs from cache
 		$cnt = 0;
-		foreach ($cacheArray['ref_system']['userid'] as $id => $u_id) {
+		foreach ($cacheArray['refsystem']['userid'] as $id => $u_id) {
 			// Do we have a ref for this user?
-			//* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['ref_system']['level'][$id]}<br />\n";
-			if (($u_id == $uid) && ($cacheArray['ref_system']['level'][$id] == 1)) {
+			//* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['refsystem']['level'][$id]}<br />\n";
+			if (($u_id == $uid) && ($cacheArray['refsystem']['level'][$id] == 1)) {
 				//* DEBUG: */ echo "uid matches!<br />\n";
 				foreach ($cacheArray['ref_depths']['level'] as $level) {
-					if (($level == $cacheArray['ref_system']['level'][$id]) && ($level == 1)) {
+					if (($level == $cacheArray['refsystem']['level'][$id]) && ($level == 1)) {
 						// Level does exist so abort here
-						$cnt = $cacheArray['ref_system']['counter'][$id];
+						$cnt = $cacheArray['refsystem']['counter'][$id];
 						//* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
 						break;
 					} elseif ($level > 1) {
@@ -766,14 +765,14 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 				if ($cnt > 0) break;
 			}
 		}
-		//* DEBUG: */ echo "<PRE>";
-		//* DEBUG: */ print_r($cacheArray['ref_system']);
-		//* DEBUG: */ echo "</PRE>";
+		//* DEBUG: */ echo "<pre>";
+		//* DEBUG: */ print_r($cacheArray['refsystem']);
+		//* DEBUG: */ echo "</pre>";
 		//* DEBUG: */ die();
 
 		if ($cnt > 0) {
 			// Count cache hits
-			if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+			incrementConfigEntry('cache_hits');
 
 			// Remove old refs
 			//* DEBUG: */ echo "+".$cnt."/".$old."+<br />";
@@ -788,12 +787,9 @@ ON s.level=d.level
 WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FILE__, __LINE__);
 		list($cnt) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
-		if (empty($cnt))
-		{
+		if (empty($cnt)) {
 			$cnt = 0;
-		}
-		 else
-		{
+		} else {
 			$cnt -= $old;
 		}
 	}
@@ -802,5 +798,12 @@ WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FILE__, __LINE__);
 	//* DEBUG: */ echo "*".$uid."/".$old."/".$cnt."*<br />";
 	return $cnt;
 }
+
+// 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();
+}
+
 //
 ?>