X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=201b11db96ccf777313e6744022fc79cceabe1e5;hp=331687eb517ebb40f03c6822bddde0c91ee8a56a;hb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;hpb=6f89f62b93d13d53d21aba27793ed283e735f410

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 331687eb51..201b11db96 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/22/2004 *
- * ===============                              Last change: 08/24/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/22/2004 *
+ * ===================                          Last change: 08/24/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : rallye_functions.php                             *
@@ -43,10 +43,6 @@ if (!defined('__SECURITY')) {
 
 // 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);
 
@@ -57,26 +53,26 @@ function autostartReferalRallyes ($result) {
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `notified`='Y' WHERE `id`=%s LIMIT 1",
 		array(bigintval($id)), __FUNCTION__, __LINE__);
 
-	// 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
+	// Transfer all neccessary data to the $content array
+	$content['userid_cnt'] = countSumTotalData('CONFIRMED','user_data','userid','status',true);
+	$content['start']      = generateDateTime($start, 2);
+	$content['end']        = generateDateTime($end  , 2);
+	$content['now_t']      = generateDateTime(time(), 2);
+	$content['title']      = $title;
+	$content['id']         = $id;  // id for the rallye details link
 
 	// Determine min_users and min_prices
-	$DATA['min_users']  = determineReferalRallyeMinimumUsers($min_users);
-	$DATA['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+	$content['min_users']  = determineReferalRallyeMinimumUsers($min_users);
+	$content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
 
 	// Load prices
-	$prices = addReferalRallyePrices($id);
+	$content['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)) {
+	while ($content = merge_array($content, SQL_FETCHARRAY($result_user))) {
 		$un = false;
 
 		// Get refs by userid
@@ -84,7 +80,7 @@ function autostartReferalRallyes ($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",
+		$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
@@ -117,19 +113,24 @@ WHERE
 			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__);
+			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__);
 			$un = true;
 		} // END - if
 
 		// Ignored but for the template required refs (made before start of rallye)
-		$DATA['refs']  = $cnt;
+		$content['refs']  = $cnt;
 
 		// Shall I notify this member?
 		if (($notify == 'Y') && ($un)) {
 			// Load email template and send it to the user
-			$message = loadEmailTemplate('member_rallye_notify', array('prices' => $prices), $content['userid']);
+			$message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
 			sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
 		} // END - if
 	} // END - while
@@ -194,27 +195,33 @@ ORDER BY
 //
 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
-	u.userid, u.refs, u.curr_points FROM `{?_MYSQL_PREFIX?}_rallye_users` AS u
+	u.userid, u.refs, u.curr_points, rd.min_users, rd.min_prices
+FROM
+	`{?_MYSQL_PREFIX?}_rallye_users` AS u
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_refsystem` AS r
 ON
 	u.userid=r.userid
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_rallye_data` AS rd
+ON
+	u.rallye_id=rd.id
 WHERE
-	u.rallye_id=%s AND r.counter > 0
+	u.`rallye_id`=%s AND r.counter > 0
 ORDER BY
 	u.refs DESC",
 		array(bigintval($rallye)), __FUNCTION__, __LINE__);
 
 	// Load users
 	$DATA = array(
-		'userid'      => array(),
+		'userid'   => array(),
 		'ref'      => array(),
 		'cpoints'  => array()
 	);
@@ -237,9 +244,9 @@ WHERE
 	d.`status`='CONFIRMED' AND
 	p.ref_depth=1 AND
 	d.max_mails > 0 AND
-	d.mails_confirmed >= %s
+	d.mails_confirmed >= {?ref_payout?}
 LIMIT 1",
-			array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCTION__, __LINE__);
+			array(bigintval($content['userid'])), __FUNCTION__, __LINE__);
 
 		// Get points
 		list($refpoints) = SQL_FETCHROW($result_ref);
@@ -250,16 +257,18 @@ LIMIT 1",
 		if (empty($refpoints)) $refpoints = '0';
 
 		// Init userid for list
-		$_userid = '---';
+		$userid = '---';
 
 		// List only users with at least one ref!
 		//* DEBUG: */ print("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*<br />");
-		if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_userid = $content['userid']; } else { $cnt = ''; }
+		if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $userid = $content['userid']; } else { $cnt = ''; }
 
 		// Save values to array
-		$DATA['userid'][]     = $_userid;
-		$DATA['ref'][]     = $cnt;
-		$DATA['cpoints'][] = $content['curr_points'];
+		$DATA['userid'][]   = $userid;
+		$DATA['ref'][]      = $cnt;
+		$DATA['cpoints'][]  = $content['curr_points'];
+		$min_users  = $content['min_users'];
+		$min_prices = $content['min_prices'];
 	} // END - while
 
 	// Free memory
@@ -291,8 +300,12 @@ LIMIT 1",
 		$SW = 3 - $SW;
 	} // END - for
 
+	// Translate min_prices/users
+	$content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
+	$content['min_users']  = determineReferalRallyeMinimumUsers($min_users);
+
 	// Add footer
-	$OUT .= loadTemplate('guest_rallye_footer', true);
+	$OUT .= loadTemplate('guest_rallye_footer', true, $content);
 
 	// And finnally return the output
 	return $OUT;
@@ -321,6 +334,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Init variables
 		$min_users = '0'; $min_prices = '0';
+
 		// Load data
 		if (getExtensionVersion('rallye') >= '0.2.0') {
 			list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
@@ -331,21 +345,6 @@ LIMIT 1", __FUNCTION__, __LINE__);
 		// Free result
 		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($userid)), __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($userid)), __FUNCTION__, __LINE__);
-		} // END - if
-
-		// Free memory
-		SQL_FREERESULT($result);
-
 		if ($notify == 'Y') {
 			// Transfer all neccessary data to the global $content array
 			$content['start'] = generateDateTime($start, 2);
@@ -367,6 +366,27 @@ VALUES ('%s','%s',0)",
 			$message = loadEmailTemplate('member_rallye_notify', $content, $userid);
 			sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
 		} // END - if
+
+		// 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($userid)
+			), __FUNCTION__, __LINE__);
+
+		// Is this user added?
+		if (SQL_NUMROWS($result) < 1) {
+			// 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($userid)
+				), __FUNCTION__, __LINE__);
+		} // END - if
+
+		// Free memory
+		SQL_FREERESULT($result);
 	} // END - if
 }
 
@@ -424,7 +444,7 @@ LIMIT 1",
 
 	// Expire rallye
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `expired`='Y' WHERE `id`=%s LIMIT 1",
-	array(bigintval($id)), __FUNCTION__, __LINE__);
+		array(bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Run array through (by userid is the most important 2nd-level-array)
 	foreach($prices['userid'] as $key => $userid) {
@@ -483,9 +503,9 @@ LIMIT 1",
 
 	// Select template depending on notfication is switch on / off
 	if ($notify == 'Y') {
-		$templ = "admin_rallye_expired";
+		$templ = 'admin_rallye_expired';
 	} elseif (is_array($users['userid'])) {
-		$templ = "admin_rallye_expired_no";
+		$templ = 'admin_rallye_expired_no';
 		$cnt = getReferalRallyeUserDataFromArray($users);
 	}
 
@@ -532,7 +552,7 @@ function getArrayFromReferalRallyePrices ($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",
+	$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
@@ -718,9 +738,9 @@ WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'",
 			// Purge whole rallye
 			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
 				array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
-			addSql(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));
-			addSql(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