X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=56230b9022fba02148d2d21f6bcd3c7a1981015b;hp=795a5bc5c28940bfce9b0a3456c252afd5bddd70;hb=ec9f020e34a9f2029a2ea0969564dda015beca8a;hpb=8cef2a4631919672cbbfd484f6e198e1f21b087d

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 795a5bc5c2..56230b9022 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -108,7 +108,7 @@ LIMIT 1",
 
 			// Add userid and his ref count to table
 			$result_ref = SQL_QUERY_ESC("SELECT 
-	SUM(p.points) AS points
+	SUM(p.points) AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
@@ -444,9 +444,6 @@ function markReferalRallyesAsExpired ($result) {
 	// Free result
 	SQL_FREERESULT($result);
 
-	// Load users array (!) with assigned prices
-	$prices = getArrayFromReferalRallyeUsers($id);
-
 	// Init array
 	$DATA = array();
 	$count = '0';
@@ -456,13 +453,16 @@ function markReferalRallyesAsExpired ($result) {
 	$DATA['end']    = generateDateTime($end  , 1);
 	$DATA['now_t']  = generateDateTime(time(), 1);
 
+	// Load users array (!) with assigned prices
+	$prices = getArrayFromReferalRallyeUsers($id);
+
 	// Just count...
 	$total = '0';
 	foreach ($prices['userid'] as $key => $userid) {
 		// Check status
 		//   active = 1: account is still confirmed
 		//   active = 0: account is deleted or locked
-		$active = countSumTotalData($DATA['userid'][$idx], 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
+		$active = countSumTotalData($userid, 'user_data', 'userid', 'userid', true, " AND `status`='CONFIRMED'");
 
 		$prices['active'][$key] = $active;
 
@@ -645,7 +645,7 @@ function getArrayFromReferalRallyeUsers ($rallye) {
 
 		// Points of ref's
 		$result_ref = SQL_QUERY_ESC("SELECT
-	SUM(p.points) AS points
+	SUM(p.points) AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_points` AS p
 LEFT JOIN
@@ -828,7 +828,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
 
 		// Accept only template names between 1 and 255 chars length
 		if ((strlen($read) < 256) && (!empty($read))) {
-			// Valid entry found!
+			// Valid entry found
 			$ral[$read] = $read;
 		} else {
 			// Log invalid
@@ -952,11 +952,5 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
 	return $return;
 }
 
-// Filter for extra-autpurge
-function FILTER_RALLYE_EXTRA_AUTOPURGE () {
-	// Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!)
-	purgeExpiredReferalRallyes();
-}
-
 // [EOF]
 ?>