X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Frallye_functions.php;h=aa4859a4e11e4af579e86f6420a64193dca288e9;hb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;hp=25146a04db8888ff1d71beaadb4afb2eb446c15f;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c;p=mailer.git

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 25146a04db..aa4859a4e1 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -65,7 +65,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 
 	if ($min_users == 0) {
 		// Rallye ends without user limitation
-		$DATA['min_users'] = RALLYE_END_NO_USER_LIMITATION;
+		$DATA['min_users'] = getMessage('RALLYE_END_NO_USER_LIMITATION');
 	} else {
 		// Rallye ends when X members are totally in your exchange
 		$DATA['min_users'] = RALLYE_END_USERS_1." ".$min_users." ".RALLYE_END_USERS_2;
@@ -73,7 +73,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
 
 	if ($min_prices == 0) {
 		// Rallye ends without user limitation
-		$DATA['min_prices'] = RALLYE_END_NO_PRICE_LIMITATION;
+		$DATA['min_prices'] = getMessage('RALLYE_END_NO_PRICE_LIMITATION');
 	} else {
 		// Rallye ends when X members are totally in your exchange
 		$DATA['min_prices'] = RALLYE_END_PRICES_1." ".$min_prices." ".RALLYE_END_PRICES_2;
@@ -514,10 +514,8 @@ function RALLYE_LOAD_PRICES_ARRAY($rallye)
 
 //
 function RALLYE_LOAD_USERS_ARRAY ($rallye) {
-	global $_CONFIG;
-
 	// Fix zero points to 0.00000
-	if (getConfig('ref_payout') == "0") $_CONFIG['ref_payout'] = "0.00000";
+	if (getConfig('ref_payout') == "0") setConfigEntry('ref_payout', "0.00000");
 
 	// Init multi array
 	$users = array(
@@ -683,7 +681,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
 
 		// Add task
 		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)
-VALUES ('NEW','RALLYE_PURGED','".RALLYE_ADMIN_PURGED.": %s','".RALLYE_ADMIN_PURGED_TEXT."',UNIX_TIMESTAMP())",
+VALUES ('NEW','RALLYE_PURGED','{--RALLYE_ADMIN_PURGED--}: %s','{--RALLYE_ADMIN_PURGED_TEXT--}',UNIX_TIMESTAMP())",
 			array($title), __FILE__, __LINE__);
 	}
 
@@ -714,23 +712,20 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 	closedir($dir);
 
 	// Do we have found templates which we can link with the new rallye?
-	if (!empty($ral[0]))
-	{
+	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)
-		{
+  <option value=\"\">{--SELECT_NONE--}</option>\n";
+		foreach ($ral as $rallye) {
 		     $OUT .= "  <option value=\"".$rallye."\"";
-			if ($default == $rallye) $OUT .= " selected default";
+			if ($default == $rallye) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$rallye."</option>\n";
 		}
 		$OUT .= "</select>\n";
-	}
-	 else
-	{
+	} else {
 		// No rallye templates found
-		$OUT = RALLYE_NO_TEMPLATES_FOUND;
+		$OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
 	}
 
 	// Return selection
@@ -738,21 +733,19 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 }
 //
 function RALLYE_GET_REFCOUNT($uid, $old=0) {
-	global $cacheArray;
-
 	// Check current refs
 	if (GET_EXT_VERSION("cache") >= "0.1.2") {
 		// Get refs from cache
 		$cnt = 0;
-		foreach ($cacheArray['refsystem']['userid'] as $id => $u_id) {
+		foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $uid) {
 			// Do we have a ref for this user?
-			//* 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 "id={$id},uid={$uid},uid={$uid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />\n";
+			if (($uid == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
 				//* DEBUG: */ echo "uid matches!<br />\n";
-				foreach ($cacheArray['ref_depths']['level'] as $level) {
-					if (($level == $cacheArray['refsystem']['level'][$id]) && ($level == 1)) {
+				foreach ($GLOBALS['cache_array']['ref_depths']['level'] as $level) {
+					if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
 						// Level does exist so abort here
-						$cnt = $cacheArray['refsystem']['counter'][$id];
+						$cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
 						//* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
 						break;
 					} elseif ($level > 1) {
@@ -766,7 +759,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 			}
 		}
 		//* DEBUG: */ echo "<pre>";
-		//* DEBUG: */ print_r($cacheArray['refsystem']);
+		//* DEBUG: */ print_r($GLOBALS['cache_array']['refsystem']);
 		//* DEBUG: */ echo "</pre>";
 		//* DEBUG: */ die();