X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Frallye_functions.php;h=9eaa587fd4be24cd7505cdd03c88144a29211a9a;hp=c313fa7389e2e3e40b4285d7032054eb35fe8c0a;hb=2b388c21a07e07317ccb065d42ef7304cfca7718;hpb=3b7577d3b3e6522d8898ed1799031b6de696accc

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index c313fa7389..9eaa587fd4 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktion fuer rallye-Erweiterung       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -49,11 +54,11 @@ function RALLYE_AUTOSTART_RALLYES($result)
 	SQL_FREERESULT($result);
 
 	// Set notified to Y
-	SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET notified='Y' WHERE id=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET notified='Y' WHERE id=%s LIMIT 1",
+		array(bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Do a snapshot off all user refs
-	$result_user = SQL_QUERY("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+	$result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY userid", __FUNCTION__, __LINE__);
 
 	// Transfer all neccessary data to the global $DATA array
 	$DATA['uid_cnt']    = SQL_NUMROWS($result_user);
@@ -63,56 +68,44 @@ function RALLYE_AUTOSTART_RALLYES($result)
 	$DATA['title']      = $title;
 	$DATA['id']         = $id;  // ID for the rallye details link
 
-	if ($min_users == 0) {
-		// Rallye ends without user limitation
-		$DATA['min_users'] = 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;
-	}
-
-	if ($min_prices == 0) {
-		// Rallye ends without user limitation
-		$DATA['min_prices'] = 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;
-	}
+	// Determine min_users and min_prices
+	$DATA['min_users']  = RALLYE_DETERMINE_MIN_USERS($min_users);
+	$DATA['min_prices'] = RALLYE_DETERMINE_MIN_PRICES($min_prices);
 
 	// Load prices
 	$prices = RALLYE_ADD_PRICES($id);
 
 	// Let's begin with the userids...
-	while (list($uid) = SQL_FETCHROW($result_user)) {
+	while ($content = SQL_FETCHARRAY($result_user)) {
 		$un = false;
 
 		// Get refs by userid
-		$cnt = RALLYE_GET_REFCOUNT($uid);
+		$cnt = RALLYE_GET_REFCOUNT($content['userid']);
 		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",
-			array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
+		$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
 			SQL_FREERESULT($result_ref);
 
 			// Add userid and his ref count to table
 			$result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
-FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
- array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
+WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
+				array(getConfig('ref_payout'), bigintval($content['userid'])), __FUNCTION__, __LINE__);
 			list($cpoints) = SQL_FETCHROW($result_ref);
 			SQL_FREERESULT($result_ref);
 
 			if (empty($cpoints)) $cpoints = "0.00000";
 
 			// Add info line
-			SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_rallye_users (rallye_id, userid, refs, curr_points)
+			SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs, curr_points)
 VALUES ('%s','%s','%s','%s')",
-				array(bigintval($id), bigintval($uid), bigintval($cnt), $cpoints), __FILE__, __LINE__);
+				array(bigintval($id), bigintval($content['userid']), bigintval($cnt), $cpoints), __FUNCTION__, __LINE__);
 			$un = true;
 		} // END - if
 
@@ -122,8 +115,8 @@ VALUES ('%s','%s','%s','%s')",
 		// Shall I notify this member?
 		if (($notify == "Y") && ($un)) {
 			// Load email template and send it to the user
-			$msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid);
-			SEND_EMAIL($uid, RALLYE_MEMBER_NOTIFY.$title, $msg);
+			$msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $content['userid']);
+			SEND_EMAIL($content['userid'], sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg);
 		} // END - if
 	} // END - while
 
@@ -132,14 +125,13 @@ VALUES ('%s','%s','%s','%s')",
 	if ($notify == "Y") $templ = "admin_rallye_notify";
 
 	// Send email to admin
-	SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_NOTIFY.$title, $templ, $prices, "0");
+	SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_NOTIFY'), $title), $templ, $prices, "0");
 
 	// Free memory
 	SQL_FREERESULT($result_user);
 }
 //
-function RALLYE_ADD_PRICES($rallye,$mode="email")
-{
+function RALLYE_ADD_PRICES ($rallye, $mode="email") {
 	// Output mode
 	switch($mode) {
 		case "email": $mode = "\n";     break;
@@ -147,55 +139,49 @@ function RALLYE_ADD_PRICES($rallye,$mode="email")
 	}
 
 	// Load prices
-	$result_prices = SQL_QUERY("SELECT price_level, points, info FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id='".$rallye."' ORDER BY price_level", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_prices) > 0)
-	{
+	$result_prices = SQL_QUERY("SELECT price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id='".$rallye."' ORDER BY price_level", __FUNCTION__, __LINE__);
+	if (SQL_NUMROWS($result_prices) > 0) {
 		// Load prices
-		if ($mode == "\n") $prices = RALLYE_MEMBER_PRICES_ADDED.":".$mode."------------------------------".$mode;
+		if ($mode == "\n") $prices = "{--RALLYE_MEMBER_PRICES_ADDED--}:".$mode."------------------------------".$mode;
 		$prices = "";
-		while (list($level, $points, $info) = SQL_FETCHROW($result_prices))
-		{
-			$prices .= $level.RALLYE_PRICE.": ";
-			if (!empty($info))
-			{
-				$prices .= $info;
-			}
-			 else
-			{
-				$prices .= $points." ".POINTS;
+		while ($content = SQL_FETCHARRAY($result_prices)) {
+			$prices .= $content['price_level'].getMessage('RALLYE_PRICE').": ";
+			if (!empty($content['info'])) {
+				$prices .= $content['info'];
+			} else {
+				$prices .= $content['points']." {!POINTS!}";
 			}
 			$prices .= "".$mode;
-		}
+		} // END - if
 
 		// Free memory
 		SQL_FREERESULT($result_prices);
-	}
-	 else
-	{
+	} else {
 		// No prices???
-		$prices = RALLYE_MEMBER_NO_PRICES.$mode;
+		$prices = sprintf(getMessage('RALLYE_MEMBER_NO_PRICES'), $mode);
 	}
+
 	// Add last line for email mode
 	if ($mode == "\n") $prices .= "------------------------------";
 
 	// Return price list
 	return $prices;
 }
+
 //
-function RALLYE_ADD_TOPUSERS($rallye,$default=0)
-{
+function RALLYE_ADD_TOPUSERS ($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",
-	 array(bigintval($rallye)), __FILE__, __LINE__);
+	$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 DISTINCT u.userid, u.refs, u.curr_points FROM "._MYSQL_PREFIX."_rallye_users AS u
-LEFT JOIN "._MYSQL_PREFIX."_refsystem AS r
+	$result = SQL_QUERY_ESC("SELECT DISTINCT u.userid, u.refs, u.curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` AS u
+LEFT JOIN `{!_MYSQL_PREFIX!}_refsystem` AS r
 ON u.userid=r.userid
 WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
- array(bigintval($rallye)), __FILE__, __LINE__);
+		array(bigintval($rallye)), __FUNCTION__, __LINE__);
 
 	// Load users
 	$DATA = array(
@@ -204,17 +190,16 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
 		'cpoints'  => array()
 	);
 
-	while(list($uid, $refs, $cpoints) = SQL_FETCHROW($result))
-	{
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Get current refs
-		$cnt = RALLYE_GET_REFCOUNT($uid, $refs);
+		$cnt = RALLYE_GET_REFCOUNT($content['userid'], $content['refs']);
 
 		// Points of ref's
-		$result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
+		$result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
-LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
+WHERE d.userid=%s AND d.`status`='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
+LIMIT 1", array(bigintval($content['userid']), getConfig('ref_payout')), __FUNCTION__, __LINE__);
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 
@@ -223,13 +208,13 @@ LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 		// Init userid for list
 		$_uid = "---";
 		// List only users with at least one ref!
-		//* DEBUG: */ echo "*".$cnt."/".$uid."/".$cpoints."/".$refpoints."*<br />\n";
-		if (($cnt > 0) && ($refpoints > $cpoints)) { $_uid = $uid; } else { $cnt = ""; }
+		//* DEBUG: */ echo "*".$cnt."/".$content['userid']."/".$content['curr_points']."/".$refpoints."*<br />\n";
+		if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $_uid = $content['userid']; } else { $cnt = ""; }
 
 		// Save values to array
 		$DATA['uid'][]     = $_uid;
 		$DATA['ref'][]     = $cnt;
-		$DATA['cpoints'][] = $cpoints;
+		$DATA['cpoints'][] = $content['curr_points'];
 	}
 
 	// Free memory
@@ -246,19 +231,19 @@ LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 		if (empty($DATA['uid'][$idx])) $DATA['uid'][$idx] = "---";
 		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\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		$OUT .= "<tr>
+  <td class=\"switch_sw".$SW." bottom2\">&nbsp;&nbsp;".($idx+1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['uid'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
-		$OUT .= "</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		$OUT .= "</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2\">";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
-		$OUT .= "</TD>
-</TR>\n";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		$OUT .= "</td>
+</tr>\n";
 		$SW = 3 - $SW;
 	}
 	// Add footer
@@ -268,8 +253,7 @@ LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
 	return $OUT;
 }
 // Run this function only when a new member has confirmed his email address!
-function RALLYE_AUTOADD_USER($uid)
-{
+function RALLYE_AUTOADD_USER ($uid) {
 	global $DATA;
 	$ADD = "";
 
@@ -279,7 +263,7 @@ function RALLYE_AUTOADD_USER($uid)
 	} // END - if
 
 	// Check for an auto-add rallye
-	$result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify".$ADD." FROM "._MYSQL_PREFIX."_rallye_data WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT id, title, start_time, end_time, send_notify".$ADD." FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE is_active='Y' AND notified='Y' AND auto_add_new_user='Y' AND expired='N' LIMIT 1", __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Init variables
 		$min_users = 0; $min_prices = 0;
@@ -294,15 +278,15 @@ function RALLYE_AUTOADD_USER($uid)
 		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($uid)), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s AND userid=%s LIMIT 1",
+			array(bigintval($id), bigintval($uid)), __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)
+			SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_users` (rallye_id, userid, refs)
 VALUES ('%s','%s','0')",
- array(bigintval($id), bigintval($uid)), __FILE__, __LINE__);
+ array(bigintval($id), bigintval($uid)), __FUNCTION__, __LINE__);
 		} else {
 			// Free memory
 			SQL_FREERESULT($result);
@@ -321,25 +305,13 @@ VALUES ('%s','%s','0')",
 			// Load prices
 			$prices = RALLYE_ADD_PRICES($id);
 
-			if ($min_users == 0) {
-				// Rallye ends without user limitation
-				$DATA['min_users'] = 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;
-			}
-
-			if ($min_prices == 0) {
-				// Rallye ends without user limitation
-				$DATA['min_prices'] = 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;
-			}
+			// Determine min_users/prices tring
+			$DATA['min_users']  = RALLYE_DETERMINE_MIN_USERS($min_users);
+			$DATA['min_prices'] = RALLYE_DETERMINE_MIN_PRICES($min_prices);
 
 			// Send notification to member
 			$msg = LOAD_EMAIL_TEMPLATE("member_rallye_notify", array('prices' => $prices), $uid);
-			SEND_EMAIL($uid, RALLYE_MEMBER_NOTIFY.$title, $msg);
+			SEND_EMAIL($uid, sprintf(getMessage('RALLYE_MEMBER_NOTIFY'), $title), $msg);
 		} // END - if
 	} // END - if
 }
@@ -370,9 +342,9 @@ function RALLYE_EXPIRE_RALLYES($result)
 		//   active = 1: account is still confirmed
 		//   active = 0: account is deleted or locked
 		$result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
-FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%s AND status='CONFIRMED'
-LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE userid=%s AND `status`='CONFIRMED'
+LIMIT 1", array(bigintval($uid)), __FUNCTION__, __LINE__);
 		list($active) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
@@ -391,8 +363,8 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 	} // END - if
 
 	// Expire rallye
-	SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET expired='Y' WHERE id=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_data` SET expired='Y' WHERE id=%s LIMIT 1",
+		array(bigintval($id)), __FUNCTION__, __LINE__);
 
 	// Run array through (by uid is the most important 2nd-level-array)
 	foreach($prices['uid'] as $key => $uid) {
@@ -431,7 +403,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 					$DATA['infos'] = $DATA['info'];
 				} else {
 					// Take points
-					$DATA['infos'] = $DATA['points']." ".POINTS;
+					$DATA['infos'] = $DATA['points']." {!POINTS!}";
 				}
 
 				// Add suffix to template name
@@ -439,7 +411,7 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
 				// Load template
 				$msg = LOAD_EMAIL_TEMPLATE($template, $DATA, $uid);
-				SEND_EMAIL($uid, RALLYE_MEMBER_EXPIRED.": ".$DATA['level']." "._RALLYE_PRICE, $msg);
+				SEND_EMAIL($uid, sprintf(getMessage('RALLYE_MEMBER_EXPIRED_SUBJ'), $DATA['level']), $msg);
 			} // END - if
 
 			// Count userid
@@ -458,36 +430,44 @@ LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 	}
 
 	// Send mail to admin
-	SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_EXPIRED.": ".$title, $templ, $cnt, 0);
+	SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_EXPIRED_SUBJ'), $title), $templ, $cnt, 0);
 
 	// Add task
-	SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (status, task_type, subject, text, task_created)
-VALUES ('NEW','RALLYE_EXPIRED','".RALLYE_ADMIN_EXPIRED.": %s','".RALLYE_ADMIN_EXPIRED_TEXT."',UNIX_TIMESTAMP())",
- array($title), __FILE__, __LINE__);
+	SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)
+VALUES ('NEW','RALLYE_EXPIRED','{--RALLYE_ADMIN_EXPIRED--}: %s','{--RALLYE_ADMIN_EXPIRED_TEXT--}',UNIX_TIMESTAMP())",
+		array($title), __FUNCTION__, __LINE__);
 
 	// All work done here...
 }
+
 //
-function RALLYE_LOAD_USER_DATA($uids_array)
-{
+function RALLYE_LOAD_USER_DATA ($uids_array) {
 	// Implode user ids
 	$uid_string = implode(",", $uids_array['uid']);
 
-	// Load users
-	$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
-	 array($uid_string, count($uids_array)), __FILE__, __LINE__);
+	// Init result string
 	$ret = "";
-	while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
-	{
-		$ret .= TRANSLATE_GENDER($gender)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
-	}
+
+	// Load users
+	$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND `status`='CONFIRMED' ORDER BY userid LIMIT %s",
+		array($uid_string, count($uids_array)), __FUNCTION__, __LINE__);
+	while ($content = SQL_FETCHARRAY($result)) {
+		// Construct the message masked and add it
+		$ret .= sprintf("%s %s %s (%s) - %s\n",
+			TRANSLATE_GENDER($content['gender']),
+			$content['surname'],
+			$content['family'],
+			$content['email'],
+			$uids_array['poi'][$content['userid']]
+		);
+	} // END - while
 
 	// Return result
 	return substr($ret, 0, -1);
 }
+
 //
-function RALLYE_LOAD_PRICES_ARRAY($rallye)
-{
+function RALLYE_LOAD_PRICES_ARRAY ($rallye) {
 	// Init multi array
 	$prices = array(
 		'level'  => array(),
@@ -496,14 +476,15 @@ function RALLYE_LOAD_PRICES_ARRAY($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",
-	 array(bigintval($rallye)), __FILE__, __LINE__);
-	while(list($level, $points, $info) = SQL_FETCHROW($result))
-	{
-		$prices['level'][]  = $level;
-		$prices['points'][] = $points;
-		$prices['info'][]   = $info;
-	}
+	$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
+	while ($content = SQL_FETCHARRAY($result)) {
+		$prices['level'][]  = $content['price_level'];
+		$prices['points'][] = $content['points'];
+		$prices['info'][]   = $content['info'];
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
@@ -511,13 +492,11 @@ function RALLYE_LOAD_PRICES_ARRAY($rallye)
 	// Return array
 	return $prices;
 }
-//
-function RALLYE_LOAD_USERS_ARRAY($rallye)
-{
-	global $_CONFIG;
 
+//
+function RALLYE_LOAD_USERS_ARRAY ($rallye) {
 	// 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(
@@ -527,29 +506,29 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
 	);
 
 	// Load users                          uid    old  points earned
-	$result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s ORDER BY userid",
-	 array(bigintval($rallye)), __FILE__, __LINE__);
-	while(list($uid, $refs, $cpoints) = SQL_FETCHROW($result_user))
-	{
+	$result_user = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{!_MYSQL_PREFIX!}_rallye_users` WHERE rallye_id=%s ORDER BY userid",
+		array(bigintval($rallye)), __FUNCTION__, __LINE__);
+	while ($content = SQL_FETCHARRAY($result_user)) {
 		// Load current ref count
-		$cnt = RALLYE_GET_REFCOUNT($uid, $refs);
+		$cnt = RALLYE_GET_REFCOUNT($content['userid'], $content['refs']);
 
 		// Points of ref's
 		$result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
-FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_points` AS p
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON p.userid=d.userid
-WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
-			array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
+WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
+			array(getConfig('ref_payout'), bigintval($content['userid'])), __FUNCTION__, __LINE__);
 		list($refpoints) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 
+		// Fix empty refpoints
 		if (empty($refpoints)) $refpoints = 0;
 
 		// Store calculated new refs to array
-		$users['uid'][]     = $uid;
-		$users['ref'][]     = abs($cnt - $refs);
-		$users['cpoints'][] = $refpoints - $cpoints;
+		$users['uid'][]     = $content['userid'];
+		$users['ref'][]     = abs($cnt - $content['refs']);
+		$users['cpoints'][] = $refpoints - $content['curr_points'];
 	}
 
 	// Free memory
@@ -562,24 +541,26 @@ WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p
 	$prices = RALLYE_LOAD_PRICES_ARRAY($rallye);
 
 	// Merge users into prices
-	foreach ($prices['level'] as $k => $lvl)
-	{
-		$prices['uid'][$k]  = $users['uid'][$k];
-		if (empty($prices['uid'][$k])) $prices['uid'][$k]  = "---";
-		$prices['ref'][$k] = $users['ref'][$k];
-		if (empty($prices['ref'][$k])) $prices['ref'][$k] = "---";
-		$prices['cpoints'][$k] = $users['cpoints'][$k];
-	}
+	foreach ($prices['level'] as $k => $lvl) {
+		// We only need to check one element in $users, see above while() block
+		if (isset($users['uid'][$k])) {
+			$prices['uid'][$k]  = $users['uid'][$k];
+			if (empty($prices['uid'][$k])) $prices['uid'][$k]  = "---";
+			$prices['ref'][$k] = $users['ref'][$k];
+			if (empty($prices['ref'][$k])) $prices['ref'][$k] = "---";
+			$prices['cpoints'][$k] = $users['cpoints'][$k];
+		} // END - if
+	} // END - foreach
 
 	// Return completed array
 	return $prices;
 }
+
 //
-function RALLYE_LIST_WINNERS($rallye,$default=0)
-{
+function RALLYE_LIST_WINNERS ($rallye, $default=0) {
 	// First check how many prices are set
-	$result_prices = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s ORDER BY price_level",
-	 array(bigintval($rallye)), __FILE__, __LINE__);
+	$result_prices = 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_prices);
 	SQL_FREERESULT($result_prices);
 
@@ -594,8 +575,8 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 		// Check status
 		//   active = 1: account is still confirmed
 		//   active = 0: account is deleted or locked
-		$result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-		 array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
+		$result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+		 array(bigintval($DATA['uid'][$idx])), __FUNCTION__, __LINE__);
 		list($active) = SQL_FETCHROW($result_active);
 		SQL_FREERESULT($result_active);
 
@@ -614,29 +595,29 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 		 else
 		{
 			// Take ppints
-			$DATA['infos'][$idx] = $DATA['points'][$idx]." ".POINTS;
+			$DATA['infos'][$idx] = $DATA['points'][$idx]." {!POINTS!}";
 		}
 
 		// 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."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		$OUT .= "<tr>
+  <td class=\"switch_sw".$SW." bottom2".$ADD."\">&nbsp;&nbsp;".($idx+1).".</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['uid'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
-		$OUT .= "</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		$OUT .= "</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['ref'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
-		$OUT .= "</TD>
-  <TD align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<STRONG>";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		$OUT .= "</td>
+  <td align=\"center\" class=\"switch_sw".$SW." bottom2".$ADD."\">";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "<strong>";
 		$OUT .= $DATA['infos'][$idx];
-		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</STRONG>";
-		$OUT .= "</TD>
-</TR>\n";
+		if (($DATA['uid'][$idx] == $default) && ($default > 0)) $OUT .= "</strong>";
+		$OUT .= "</td>
+</tr>\n";
 		$SW = 3 - $SW;
 	}
 	// Add footer
@@ -645,46 +626,51 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
 	// And finnally return the output
 	return $OUT;
 }
+
 //
-function RALLYE_DELETE_EXPIRED_RALLYES()
-{
+function RALLYE_DELETE_EXPIRED_RALLYES () {
 	global $DATA;
 
 	// Check for expired rallyes
 	$EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
 	$result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time
-FROM "._MYSQL_PREFIX."_rallye_data
+FROM `{!_MYSQL_PREFIX!}_rallye_data`
 WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
-		array($EXPIRE), __FILE__, __LINE__);
+		array($EXPIRE), __FUNCTION__, __LINE__);
+
+	if (SQL_NUMROWS($result_rallye) > 0) {
+		// Init SQLs
+		INIT_SQLS();
 
-	if (SQL_NUMROWS($result_rallye) > 0)
-	{
 		// Expire found rallyes and notify admin
-		while(list($id, $title, $start, $end) = SQL_FETCHROW($result_rallye))
-		{
+		while ($content = SQL_FETCHARRAY($result_rallye)) {
 			// Prepare data for mail template
-			$DATA['title']  = $title;
-			$DATA['start']  = MAKE_DATETIME($start, "1");
-			$DATA['end']    = MAKE_DATETIME($end  , "1");
+			$DATA['title']  = $content['title'];
+			$DATA['start']  = MAKE_DATETIME($content['start_time'], "1");
+			$DATA['end']    = MAKE_DATETIME($content['end_time']  , "1");
 			$DATA['now_t']  = MAKE_DATETIME(time(), "1");
 
 			// Send mail to admin
-			SEND_ADMIN_NOTIFICATION(RALLYE_ADMIN_PURGED.": ".$title, "admin_rallye_purged", "", 0);
+			SEND_ADMIN_NOTIFICATION(sprintf(getMessage('RALLYE_ADMIN_PURGED_SUBJ'), $content['title']), "admin_rallye_purged", "", 0);
 
 			// Purge whole rallye
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
-				array(bigintval($id)), __FILE__, __LINE__);
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s LIMIT 1",
-				array(bigintval($id)), __FILE__, __LINE__);
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s LIMIT 1",
-				array(bigintval($id)), __FILE__, __LINE__);
-		}
-
-		// 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())",
-			array($title), __FILE__, __LINE__);
-	}
+			ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE id=%s LIMIT 1",
+				array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
+			ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s LIMIT 1",
+				array(bigintval($content['id'])), __FUNCTION__, __LINE__, false));
+			ADD_SQL(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
+			// @TODO Rewrite this to a function
+			ADD_SQL(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())",
+				array($content['title']), __FUNCTION__, __LINE__, false));
+		} // END - while
+
+		// Run all SQLs
+		runFilterChain('run_sqls');
+	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_rallye);
@@ -694,13 +680,11 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
 {
 	// Check templates directory
 	$OUT = ""; $ral = array();
-	$BASE = sprintf("%stemplates/%s/html/rallye/", PATH, GET_LANGUAGE());
+	$BASE = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE());
 	$dir = opendir($BASE);
-	while ($read = readdir($dir))
-	{
+	while ($read = readdir($dir)) {
 		// If it is no dir (so a file)
-		if (!is_dir($BASE.$read))
-		{
+		if (!isDirectory($BASE.$read)) {
 			// Accept only templates matching with rallye_????.tpl.xx
 			if (eregi("^rallye_.*\.tpl", $read))
 			{
@@ -713,45 +697,40 @@ 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
-		$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 default";
-			$OUT .= ">".$rallye."</OPTION>\n";
+		// @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";
 		}
-		$OUT .= "</SELECT>\n";
-	}
-	 else
-	{
+		$OUT .= "</select>\n";
+	} else {
 		// No rallye templates found
-		$OUT = RALLYE_NO_TEMPLATES_FOUND;
+		$OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
 	}
 
 	// Return selection
 	return $OUT;
 }
 //
-function RALLYE_GET_REFCOUNT($uid, $old=0) {
-	global $cacheArray;
-
+function RALLYE_GET_REFCOUNT ($uid, $old=0) {
 	// Check current refs
 	if (GET_EXT_VERSION("cache") >= "0.1.2") {
 		// Get refs from cache
 		$cnt = 0;
-		foreach ($cacheArray['ref_system']['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['ref_system']['level'][$id]}<br />\n";
-			if (($u_id == $uid) && ($cacheArray['ref_system']['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['ref_system']['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['ref_system']['counter'][$id];
+						$cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
 						//* DEBUG: */ echo "*".$uid."/".$cnt."*<br />";
 						break;
 					} elseif ($level > 1) {
@@ -764,9 +743,9 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 				if ($cnt > 0) break;
 			}
 		}
-		//* DEBUG: */ echo "<PRE>";
-		//* DEBUG: */ print_r($cacheArray['ref_system']);
-		//* DEBUG: */ echo "</PRE>";
+		//* DEBUG: */ echo "<pre>";
+		//* DEBUG: */ print_r($GLOBALS['cache_array']['refsystem']);
+		//* DEBUG: */ echo "</pre>";
 		//* DEBUG: */ die();
 
 		if ($cnt > 0) {
@@ -780,10 +759,10 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 	} else {
 		// Load current refs from database
 		$result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(s.counter) AS cnt
-FROM "._MYSQL_PREFIX."_refsystem AS s
-LEFT JOIN "._MYSQL_PREFIX."_refdepths AS d
+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($uid)), __FILE__, __LINE__);
+WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FUNCTION__, __LINE__);
 		list($cnt) = SQL_FETCHROW($result_ref);
 		SQL_FREERESULT($result_ref);
 		if (empty($cnt)) {
@@ -798,6 +777,34 @@ WHERE s.userid=%s AND s.level=1", array(bigintval($uid)), __FILE__, __LINE__);
 	return $cnt;
 }
 
+// Determines the right language string for min_users
+function RALLYE_DETERMINE_MIN_USERS ($min_users) {
+	// Rallye ends without user limitation is the default
+	$return = getMessage('RALLYE_END_NO_USER_LIMITATION');
+
+	if ($min_users > 0) {
+		// Rallye ends when X members are totally in your exchange
+		$return = sprintf(getMessage('RALLYE_END_USERS'), $min_users);
+	} // END - if
+
+	// Return
+	return $return;
+}
+
+// Determines the right language string for min_prices
+function RALLYE_DETERMINE_MIN_PRICES ($min_prices) {
+	// Rallye ends without user limitation is the default
+	$return = getMessage('RALLYE_END_NO_PRICE_LIMITATION');
+
+	if ($min_prices > 0) {
+		// Rallye ends when X members are totally in your exchange
+		$return = sprintf(getMessage('RALLYE_END_PRICES'), $min_prices);
+	} // END - if
+
+	// Return
+	return $return;
+}
+
 // Filter for extra-autpurge
 function FILTER_RALLYE_EXTRA_AUTOPURGE () {
 	// Check expired rallyes (hard-coded 3 days limit for displaying expired rallyes!)