X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=c8662e6dc74bf3777a0ebafd432555c4e0270ee1;hp=cd86573a4c55f3f8630d33fcc4d8412b995103af;hb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;hpb=76b1b077bda73310c536f658d3a9bb5e12232f39

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index cd86573a4c..c8662e6dc7 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -54,7 +55,7 @@ function autostartReferalRallyes ($result) {
 		array(bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Transfer all neccessary data to the $content array
-	$content['userid_cnt'] = countSumTotalData('CONFIRMED','user_data','userid','status',true);
+	$content['userid_cnt'] = getTotalConfirmedUser();
 	$content['start']      = generateDateTime($start, 2);
 	$content['end']        = generateDateTime($end  , 2);
 	$content['now_t']      = generateDateTime(time(), 2);
@@ -72,7 +73,10 @@ function autostartReferalRallyes ($result) {
 	$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 = merge_array($content, SQL_FETCHARRAY($result_user))) {
+	while ($row = SQL_FETCHARRAY($result_user)) {
+		// Merge both arrays
+		$content = merge_array($content, $row);
+
 		$un = false;
 
 		// Get refs by userid
@@ -82,7 +86,7 @@ function autostartReferalRallyes ($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($content['userid'])), __FUNCTION__, __LINE__);
-		if (SQL_NUMROWS($result_ref) == '0') {
+		if (SQL_NUMROWS($result_ref) == 0) {
 			// Free memory
 			SQL_FREERESULT($result_ref);
 
@@ -131,7 +135,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 +144,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);
 
 	// Free memory
 	SQL_FREERESULT($result_user);
@@ -155,21 +159,23 @@ function addReferalRallyePrices ($rallye, $mode='email') {
 	} // END - switch
 
 	// Load prices
-	$result_prices = SQL_QUERY("SELECT
+	$result_prices = SQL_QUERY_ESC("SELECT
 	`price_level`, `points`, `info`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_prices`
 WHERE
-	`rallye_id`='".$rallye."'
+	`rallye_id`=%s
 ORDER BY
 	`price_level` ASC",
-		__FUNCTION__, __LINE__);
+		array($rallye), __FUNCTION__, __LINE__);
+
+	// Entries found?
 	if (SQL_NUMROWS($result_prices) > 0) {
 		// Load prices
 		if ($mode == "\n") $prices = "{--RALLYE_MEMBER_PRICES_ADDED--}:".$mode."------------------------------".$mode;
 		$prices = '';
 		while ($content = SQL_FETCHARRAY($result_prices)) {
-			$prices .= $content['price_level'].getMessage('RALLYE_PRICE').": ";
+			$prices .= $content['price_level']. '{--RALLYE_PRICE--}: ';
 			if (!empty($content['info'])) {
 				$prices .= $content['info'];
 			} else {
@@ -182,7 +188,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
@@ -285,24 +291,24 @@ LIMIT 1",
 		if (empty($DATA['ref'][$idx])) $DATA['ref'][$idx] = '---';
 		// Add row
 		$OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom\">&nbsp;&nbsp;".($idx+1).".</td>
+  <td class=\"switch_sw".$SW." bottom\">".($idx+1).".</td>
   <td align=\"center\" class=\"switch_sw".$SW." bottom\">";
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
 		$OUT .= $DATA['userid'][$idx];
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
 		$OUT .= "</td>
   <td align=\"center\" class=\"switch_sw".$SW." bottom\">";
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
 		$OUT .= "</td>
 </tr>\n";
 		$SW = 3 - $SW;
 	} // END - for
 
-	// Translate min_prices/users
-	$content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
-	$content['min_users']  = determineReferalRallyeMinimumUsers($min_users);
+	// Add min_prices/users
+	$content['min_prices'] = bigintval($min_prices);
+	$content['min_users']  = bigintval($min_users);
 
 	// Add footer
 	$OUT .= loadTemplate('guest_rallye_footer', true, $content);
@@ -316,7 +322,7 @@ function addUserToReferalRallye ($userid, $content = array()) {
 	$add = '';
 
 	// Updated extension?
-	if (getExtensionVersion('rallye') >= '0.2.0') {
+	if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
 		$add .= ", `min_users`, `min_prices`";
 	} // END - if
 
@@ -336,7 +342,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 		$min_users = '0'; $min_prices = '0';
 
 		// Load data
-		if (getExtensionVersion('rallye') >= '0.2.0') {
+		if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
 			list($id, $title, $start, $end, $notify, $min_users, $min_prices) = SQL_FETCHROW($result);
 		} else {
 			list($id, $title, $start, $end, $notify) = SQL_FETCHROW($result);
@@ -346,7 +352,7 @@ LIMIT 1", __FUNCTION__, __LINE__);
 		SQL_FREERESULT($result);
 
 		if ($notify == 'Y') {
-			// Transfer all neccessary data to the global $content array
+			// Transfer all neccessary data to $content array
 			$content['start'] = generateDateTime($start, 2);
 			$content['end']   = generateDateTime($end  , 2);
 			$content['now_t'] = generateDateTime(time(), 2);
@@ -364,7 +370,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 +497,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 +516,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);
 
 	// Add task
 	createNewTask('{--RALLYE_ADMIN_EXPIRED--}: ' . $title, '{--RALLYE_ADMIN_EXPIRED_TEXT--}', 'RALLYE_EXPIRED');
@@ -685,21 +691,21 @@ function addReferalRallyeWinners ($rallye, $default=0) {
 		// Add row
 		$add = '';
 		$OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom".$add."\">&nbsp;&nbsp;".($idx+1).".</td>
+  <td class=\"switch_sw".$SW." bottom".$add."\">".($idx+1).".</td>
   <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
 		$OUT .= $DATA['userid'][$idx];
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
 		$OUT .= "</td>
   <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
 		$OUT .= "</td>
   <td align=\"center\" class=\"switch_sw".$SW." bottom".$add."\">";
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '<strong>';
 		$OUT .= $DATA['infos'][$idx];
-		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		if (($DATA['userid'][$idx] == $default) && ($default > 0)) $OUT .= '</strong>';
 		$OUT .= "</td>
 </tr>\n";
 		$SW = 3 - $SW;
@@ -733,7 +739,7 @@ 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);
 
 			// Purge whole rallye
 			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
@@ -773,21 +779,21 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
 		$read = substr($read, 7, strpos($read, '.') - 7);
 
 		// Accept only template names between 1 and 255 chars length
-		if ((strlen($read) < 256) && (!empty($read))) $ral[] = $read;
-	} // END - while
+		if ((strlen($read) < 256) && (!empty($read))) {
+			// Valid entry found!
+			$ral[$read] = $read;
+		} else {
+			// Log invalid
+			logDebugMessage(__FUNCTION__, __LINE__, sprintf("WARNING: Template %s not used.", $read));
+		}
+	} // END - foreach
 
 	// Do we have found templates which we can link with the new rallye?
 	if (!empty($ral[0])) {
 		// Generate selection box for all found templates
-		// @TODO Rewrite this to our API function
-		$OUT  = "<select name=\"".$name."\" size=\"1\" class=\"admin_select\">
-  <option value=\"\">{--SELECT_NONE--}</option>\n";
-		foreach ($ral as $rallye) {
-			$OUT .= "  <option value=\"".$rallye."\"";
-			if ($default == $rallye) $OUT .= ' selected="selected"';
-			$OUT .= ">".$rallye."</option>\n";
-		} // END - foreach
-		$OUT .= "</select>\n";
+		$OUT  = '<select name="' . $name . '" size="1" class="admin_select">';
+		$OUT .= generateOptionList('/ARRAY/', array_keys($ral), array_values($ral), $default, '', 'none');
+		$OUT .= '</select>';
 	} else {
 		// No rallye templates found
 		$OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
@@ -797,16 +803,16 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
 	return $OUT;
 }
 
-//
-function getReferalRallyeRefsCount ($userid, $old = '0') {
+// @TODO Please document this function
+function getReferalRallyeRefsCount ($currUserid, $old = '0') {
 	// Check current refs
-	if (getExtensionVersion('cache') >= '0.1.2') {
+	if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
 		// Get refs from cache
 		$cnt = '0';
 		foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) {
 			// Do we have a ref for this user?
 			//* DEBUG: */ print("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />");
-			if (($userid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
+			if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
 				//* DEBUG: */ print("userid matches!<br />");
 				foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) {
 					if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
@@ -840,12 +846,25 @@ function getReferalRallyeRefsCount ($userid, $old = '0') {
 		} // END - if
 	} else {
 		// Load current refs from database
-		$result_ref = SQL_QUERY_ESC("SELECT SUM(s.counter) AS cnt
-FROM `{?_MYSQL_PREFIX?}_refsystem` AS s
-LEFT JOIN `{?_MYSQL_PREFIX?}_refdepths` AS d
-ON s.level=d.level
-WHERE s.userid=%s AND s.level=1", array(bigintval($userid)), __FUNCTION__, __LINE__);
+		$result_ref = SQL_QUERY_ESC("SELECT
+	SUM(s.counter) AS cnt
+FROM
+	`{?_MYSQL_PREFIX?}_refsystem` AS s
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_refdepths` AS d
+ON
+	s.level=d.level
+WHERE
+	s.userid=%s AND
+	s.level=1",
+			array(
+				bigintval($userid)
+			), __FUNCTION__, __LINE__);
+
+		// Load count @TODO Can't we rewrite this to our API?
 		list($cnt) = SQL_FETCHROW($result_ref);
+
+		// Free result
 		SQL_FREERESULT($result_ref);
 		if (empty($cnt)) {
 			$cnt = '0';
@@ -866,7 +885,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 +899,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