X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Frallye_functions.php;h=08e8cf341bb85762b7863687eec7111e746e4256;hb=27f65d023a3388a8bd85be8ee5991f776f541847;hp=9e096a317e5d761be0a2ac3de513272a537c1592;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97;p=mailer.git

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 9e096a317e..08e8cf341b 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -42,7 +42,7 @@ 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);
@@ -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__);
@@ -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);
@@ -513,9 +511,9 @@ 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
@@ -530,9 +528,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)), __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);
 
@@ -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__);
@@ -650,7 +649,7 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 //
 function RALLYE_DELETE_EXPIRED_RALLYES()
 {
-	global $DATA, $_CONFIG;
+	global $DATA;
 
 	// Check for expired rallyes
 	$EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
@@ -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) {
@@ -767,13 +766,13 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 			}
 		}
 		//* DEBUG: */ echo "<PRE>";
-		//* DEBUG: */ print_r($cacheArray['ref_system']);
+		//* DEBUG: */ print_r($cacheArray['refsystem']);
 		//* DEBUG: */ echo "</PRE>";
 		//* DEBUG: */ die();
 
 		if ($cnt > 0) {
 			// Count cache hits
-			if (getConfig('cache_hits') > 0) { $_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;
 		}
 	}