X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=84f371605d47b34125f8c82a26a401a991681401;hb=498867478820a2eecb1da991a682ad31fae90c55;hp=2199fbb9b2cf9d5dd4e999d726f295194db9192d;hpb=c6ec27ca8614f750c629f523d0651454ba70a951;p=mailer.git

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 2199fbb9b2..84f371605d 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                             *
@@ -80,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
@@ -131,7 +131,7 @@ VALUES (%s, %s, %s, %s)",
 		if (($notify == 'Y') && ($un)) {
 			// Load email template and send it to the user
 			$message = loadEmailTemplate('member_rallye_notify', $content, $content['userid']);
-			sendEmail($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
+			sendEmail($content['userid'], getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
 		} // END - if
 	} // END - while
 
@@ -140,7 +140,7 @@ VALUES (%s, %s, %s, %s)",
 	if ($notify == 'Y') $templ = 'admin_rallye_notify';
 
 	// Send email to admin
-	sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, 0);
+	sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_NOTIFY', $title), $templ, $prices, 0);
 
 	// Free memory
 	SQL_FREERESULT($result_user);
@@ -182,7 +182,7 @@ ORDER BY
 		SQL_FREERESULT($result_prices);
 	} else {
 		// No prices???
-		$prices = sprintf(getMessage('RALLYE_MEMBER_NO_PRICES'), $mode);
+		$prices = getMaskedMessage('RALLYE_MEMBER_NO_PRICES', $mode);
 	}
 
 	// Add last line for email mode
@@ -195,7 +195,7 @@ 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);
@@ -214,7 +214,7 @@ LEFT JOIN
 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__);
@@ -244,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);
@@ -285,13 +285,13 @@ LIMIT 1",
 		if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
 		// Add row
 		$OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom2\">&nbsp;&nbsp;".($idx+1).".</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">";
+  <td class=\"switch_sw".$SW." bottom\">&nbsp;&nbsp;".($idx+1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom\">";
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['userid'][$idx];
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">";
+  <td align=\"center\" class=\"switch_sw".$SW." bottom\">";
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
@@ -364,7 +364,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 
 			// Send notification to member
 			$message = loadEmailTemplate('member_rallye_notify', $content, $userid);
-			sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $message);
+			sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_NOTIFY', $title), $message);
 		} // END - if
 
 		// Check if line is already included...
@@ -491,7 +491,7 @@ LIMIT 1",
 
 				// Load template
 				$message = loadEmailTemplate($template, $DATA, $userid);
-				sendEmail($userid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $message);
+				sendEmail($userid, getMaskedMessage('RALLYE_MEMBER_EXPIRED_SUBJ', $DATA['level']), $message);
 			} // END - if
 
 			// Count userid
@@ -510,7 +510,7 @@ LIMIT 1",
 	}
 
 	// Send mail to admin
-	sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0);
+	sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_EXPIRED_SUBJ', $title), $templ, $cnt, 0);
 
 	// Add task
 	createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -552,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
@@ -685,18 +685,18 @@ function addReferalRallyeWinners ($rallye, $default=0) {
 		// Add row
 		$add = '';
 		$OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom2".$add."\">&nbsp;&nbsp;".($idx+1).".</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$add."\">";
+  <td class=\"switch_sw".$SW." bottom".$add."\">&nbsp;&nbsp;".($idx+1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['userid'][$idx];
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$add."\">";
+  <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
 		$OUT .= "</td>
-  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$add."\">";
+  <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['infos'][$idx];
 		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
@@ -733,14 +733,14 @@ WHERE end_time <= (UNIX_TIMESTAMP() - {?ONE_DAY?} - %s) AND expired='Y'",
 			$content['now_time']    = generateDateTime(time(), 1);
 
 			// Send mail to admin
-			sendAdminNotification(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), 'admin_rallye_purged', $content, 0);
+			sendAdminNotification(getMaskedMessage('RALLYE_ADMIN_PURGED_SUBJ', $content['title']), 'admin_rallye_purged', $content, 0);
 
 			// 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
@@ -866,7 +866,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 
 	if ($min_users > 0) {
 		// Rallye ends when X members are totally in your exchange
-		$return = sprintf(getMessage('RALLYE_END_USERS'), $min_users);
+		$return = getMaskedMessage('RALLYE_END_USERS', $min_users);
 	} // END - if
 
 	// Return
@@ -880,7 +880,7 @@ function determineReferalRallyeMinimumPrices ($min_prices) {
 
 	if ($min_prices > 0) {
 		// Rallye ends when X members are totally in your exchange
-		$return = sprintf(getMessage('RALLYE_END_PRICES'), $min_prices);
+		$return = getMaskedMessage('RALLYE_END_PRICES', $min_prices);
 	} // END - if
 
 	// Return