X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=9469dcc38fb5f8822ecdd6a43087e77930580dfa;hp=7ef34bd3022dd9fe93ef404b695ea64d2487eba9;hb=a50f5113fe25ed5f125e3377914a5c0d84b4c1ae;hpb=80e2def8ef2125fd4d7d1312ee3993ab613f0846

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 7ef34bd302..9469dcc38f 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bestehende Rallyes auflisten                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,369 +37,374 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+addMenuDescription('admin', __FILE__);
 
-if (empty($_GET['sub'])) $_GET['sub'] = "";
-$MSG = "";
+if (!isGetRequestElementSet('sub')) setRequestGetElement('sub', '');
+$message = '';
 
 // Quick actions on a rallye
-if (isset($_GET['rallye']))
-{
-	// Activate / deactivate
-	$SQL = "";
-	if (isset($_GET['activate']))
-	{
-		switch ($_GET['activate'])
-		{
-		case "1": // Activate
-			$SQL = "UPDATE "._MYSQL_PREFIX."_rallye_data SET is_active='Y' WHERE id=%s AND is_active='N' LIMIT 1";
-			break;
-
-		case "0": // Deactivate
-			$SQL = "UPDATE "._MYSQL_PREFIX."_rallye_data SET is_active='N' WHERE id=%s AND is_active='Y' LIMIT 1";
-			break;
+if (isGetRequestElementSet('rallye')) {
+	// Init SQL queries
+	initSqls();
+
+	if (isGetRequestElementSet('activate')) {
+		// Activate / deactivate
+		switch (getRequestElement('activate')) {
+			case '1': // Activate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1",
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
+				);
+				break;
+
+			case '0': // Deactivate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1",
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
+				);
+				break;
 		}
-	}
+	} elseif (isGetRequestElementSet('notify')) {
+		// Automatic notification
+		switch (getRequestElement('notify')) {
+			case '1': // Activate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1",
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
+				);
+				break;
 
-	// Automatic notification
-	if (isset($_GET['notify']))
-	{
-		switch ($_GET['notify'])
-		{
-		case "1": // Activate
-			$SQL = "UPDATE "._MYSQL_PREFIX."_rallye_data SET send_notify='Y' WHERE id=%s AND send_notify='N' LIMIT 1";
-			break;
-
-		case "0": // Deactivate
-			$SQL = "UPDATE "._MYSQL_PREFIX."_rallye_data SET send_notify='N' WHERE id=%s AND send_notify='Y' LIMIT 1";
-			break;
+			case '0': // Deactivate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1",
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
+				);
+				break;
 		}
-	}
+	} elseif (isGetRequestElementSet('auto')) {
+		// Automatic adding of new members
+		switch (getRequestElement('auto')) {
+			case '1': // Activate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1",
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
+				);
+				break;
 
-	// Automatic adding of new members
-	if (isset($_GET['auto']))
-	{
-		switch ($_GET['auto'])
-		{
-		case "1": // Activate
-			$SQL = "UPDATE "._MYSQL_PREFIX."_rallye_data SET auto_add_new_user='Y' WHERE id=%s AND auto_add_new_user='N' LIMIT 1";
-			break;
-
-		case "0": // Deactivate
-			$SQL = "UPDATE "._MYSQL_PREFIX."_rallye_data SET auto_add_new_user='N' WHERE id=%s AND auto_add_new_user='Y' LIMIT 1";
-			break;
+			case '0': // Deactivate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1",
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
+				);
+				break;
 		}
 	}
 
 	// Run SQL command
-	if (!empty($SQL))
-	{
-		$result = SQL_QUERY_ESC($SQL, array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
-	}
-}
- elseif (isset($_POST['remove']))
-{
+	runFilterChain('run_sqls');
+} elseif (isPostRequestElementSet('remove')) {
 	// Delete rallyes
-	$SEL = SELECTION_COUNT($_POST['sel']);
-	if ($SEL > 0)
-	{
+	$SEL = countPostSelection();
+	if ($SEL > 0) {
+		// Init SQLs
+		initSqls();
+
 		// Delete selected rallyes and all it's data
-		foreach ($_POST['sel'] as $id => $sel)
-		{
+		foreach (postRequestElement('sel') as $id => $selected) {
 			// Remove selected rallye entirely...
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s",
-			 array(bigintval($id)), __FILE__, __LINE__);
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s",
-			 array(bigintval($id)), __FILE__, __LINE__);
-		}
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
+				array(bigintval($id)), __FILE__, __LINE__, false));
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s",
+				array(bigintval($id)), __FILE__, __LINE__, false));
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s",
+				array(bigintval($id)), __FILE__, __LINE__, false));
+		} // END - foreach
+
+		// Run SQLS
+		runFilterChain('run_sqls');
 
 		// Output message
-		$MSG = RALLYE_DELETED;
-	}
-	 else
-	{
+		$message = getMessage('RALLYE_DELETED');
+	} else {
 		// No rallye selected to delete!
-		$MSG = RALLYE_DELETE_NOTHING_SELECTED;
+		$message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
 	}
-}
- elseif (isset($_POST['change']))
-{
+} elseif (isPostRequestElementSet('change')) {
 	// Change rallye
-	$SEL = SELECTION_COUNT($_POST['title']);
-	if ($SEL > 0)
-	{
+	$SEL = countSelection(postRequestElement('title'));
+	if ($SEL > 0) {
+		// Init SQLs
+		initSqls();
+
 		// Change selected rallyes and all it's data
-		foreach ($_POST['title'] as $id => $title)
-		{
-			// Secure ID number
+		foreach (postRequestElement('title') as $id => $title) {
+			// Secure id number
 			$id = bigintval($id);
 
 			// Generate timestamps
-			$START = mktime($_POST['start_hour'][$id], $_POST['start_min'][$id], $_POST['start_sec'][$id], $_POST['start_month'][$id], $_POST['start_day'][$id], $_POST['start_year'][$id]);
-			$END   = mktime($_POST['end_hour'][$id]  , $_POST['end_min'][$id]  , $_POST['end_sec'][$id]  , $_POST['end_month'][$id]  , $_POST['end_day'][$id]  , $_POST['end_year'][$id]  );
+			$START = mktime(postRequestElement('start_hour', $id), postRequestElement('start_min', $id), postRequestElement('start_sec', $id), postRequestElement('start_month', $id), postRequestElement('start_day', $id), postRequestElement('start_year', $id));
+			$END   = mktime(postRequestElement('end_hour', $id)  , postRequestElement('end_min', $id)  , postRequestElement('end_sec', $id)  , postRequestElement('end_month', $id)  , postRequestElement('end_day', $id)  , postRequestElement('end_year', $id)  );
 
 			// Update entry
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_rallye_data SET
-title='%s',
-descr='%s',
-template='%s',
-start_time='%s',
-end_time='%s',
-min_users='%s',
-min_prices='%s'
-WHERE id='".$id."' LIMIT 1",
- array($title, $_POST['descr'][$id], $_POST['templ'][$id], bigintval($START), bigintval($END), bigintval($_POST['min_users'][$id]), bigintval($_POST['min_prices'][$id]), $id),
- __FILE__, __LINE__);
+			addSql(SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_rallye_data`
+SET
+	`title`='%s',
+	`descr`='%s',
+	`template`='%s',
+	`start_time`='%s',
+	`end_time`='%s',
+	`min_users`='%s',
+	`min_prices`='%s'
+WHERE
+	`id`='%s'
+LIMIT 1",
+			array(
+				$title,
+				postRequestElement('descr', $id),
+				postRequestElement('templ', $id),
+				bigintval($START),
+				bigintval($END),
+				bigintval(postRequestElement('min_users', $id)),
+				bigintval(postRequestElement('min_prices', $id)),
+				$id
+			), __FILE__, __LINE__, false));
 		}
 
+		// Run SQLS
+		runFilterChain('run_sqls');
+
 		// Output message
-		$MSG = RALLYE_CHANGED;
+		$message = getMessage('RALLYE_CHANGED');
 	}
 }
 
-if (isset($_POST['edit']))
-{
+if (isPostRequestElementSet('edit')) {
 	// Check for selections
-	$SEL = SELECTION_COUNT($_POST['sel']);
-	if ($SEL > 0)
-	{
+	$SEL = countPostSelection();
+	if ($SEL > 0) {
 		// Make all selected and deactivated rallyes editable
-		$SW = 2; $OUT = "";
-		foreach ($_POST['sel'] as $id => $sel)
-		{
+		$OUT = ''; $SW = 2;
+		foreach (postRequestElement('sel') as $id => $selected) {
 			// Load rallye basic data
-			$result = SQL_QUERY_ESC("SELECT title, descr, template, start_time, end_time, min_users, min_prices FROM "._MYSQL_PREFIX."_rallye_data WHERE id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
-			list($title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result);
+			$result = SQL_QUERY_ESC("SELECT
+	`title`, `descr`, `template`, `start_time`, `end_time`, `min_users`, `min_prices`
+FROM
+	`{?_MYSQL_PREFIX?}_rallye_data`
+WHERE
+	`id`=%s
+LIMIT 1",
+				array(bigintval($id)), __FILE__, __LINE__);
+			// Fetch an array
+			$content = SQL_FETCHARRAY($result);
+
+			// Free result
 			SQL_FREERESULT($result);
 
 			// Starting day
-			$content['s_sec']   = ADD_SELECTION("sec"  , date("s", $start), "start", $id);
-			$content['s_min']   = ADD_SELECTION("min"  , date("i", $start), "start", $id);
-			$content['s_hour']  = ADD_SELECTION("hour" , date("G", $start), "start", $id);
-			$content['s_day']   = ADD_SELECTION("day"  , date("d", $start), "start", $id);
-			$content['s_month'] = ADD_SELECTION("month", date("m", $start), "start", $id);
-			$content['s_year']  = ADD_SELECTION("year" , date('Y', $start), "start", $id);
+			$content['s_sec']   = addSelectionBox('sec'  , date('s', $content['start_time']), 'start', $id);
+			$content['s_min']   = addSelectionBox('min'  , date('i', $content['start_time']), 'start', $id);
+			$content['s_hour']  = addSelectionBox('hour' , date('G', $content['start_time']), 'start', $id);
+			$content['s_day']   = addSelectionBox('day'  , date('d', $content['start_time']), 'start', $id);
+			$content['s_month'] = addSelectionBox('month', date('m', $content['start_time']), 'start', $id);
+			$content['s_year']  = addSelectionBox('year' , date('Y', $content['start_time']), 'start', $id);
 
 			// Ending day
-			$content['e_sec']   = ADD_SELECTION("sec"  , date("s", $end)  , "end"  , $id);
-			$content['e_min']   = ADD_SELECTION("min"  , date("i", $end)  , "end"  , $id);
-			$content['e_hour']  = ADD_SELECTION("hour" , date("G", $end)  , "end"  , $id);
-			$content['e_day']   = ADD_SELECTION("day"  , date("d", $end)  , "end"  , $id);
-			$content['e_month'] = ADD_SELECTION("month", date("m", $end)  , "end"  , $id);
-			$content['e_year']  = ADD_SELECTION("year" , date('Y', $end)  , "end"  , $id);
-
-			// Remember over values
-			$content['templ']      = RALLYE_TEMPLATE_SELECTION("templ[".$id."]", $templ);
+			$content['e_sec']   = addSelectionBox('sec'  , date('s', $content['end_time'])  , 'end'  , $id);
+			$content['e_min']   = addSelectionBox('min'  , date('i', $content['end_time'])  , 'end'  , $id);
+			$content['e_hour']  = addSelectionBox('hour' , date('G', $content['end_time'])  , 'end'  , $id);
+			$content['e_day']   = addSelectionBox('day'  , date('d', $content['end_time'])  , 'end'  , $id);
+			$content['e_month'] = addSelectionBox('month', date('m', $content['end_time'])  , 'end'  , $id);
+			$content['e_year']  = addSelectionBox('year' , date('Y', $content['end_time'])  , 'end'  , $id);
+
+			// Remember other values
+			$content['templ']      = addReferalRallyeTemplateSelection('templ['.$id.']', $content['template']);
 			$content['sw']         = $SW;
 			$content['id']         = $id;
-			$content['title']      = $title;
-			$content['descr']      = $descr;
-			$content['min_users']  = $min_users;
-			$content['min_prices'] = $min_prices;
 
 			// Output row
-			$OUT .= LOAD_TEMPLATE("admin_edit_rallyes_row", true, $content);
+			$OUT .= loadTemplate('admin_edit_rallyes_row', true, $content);
 
 			// Color switching
 			$SW = 3 - $SW;
 		}
-		// Remember rows in constant
-		define('__RALLYE_ROWS', $OUT);
 
 		// Load final template
-		LOAD_TEMPLATE("admin_edit_rallyes");
-	}
-	 else
-	{
+		loadTemplate('admin_edit_rallyes', false, $OUT);
+	} else {
 		// Nothing selected to edit
-		LOAD_TEMPLATE("admin_settings_saved", false, LOAD_TEMPLATE("admin_list_rallye_noselect", true));
+		loadTemplate('admin_settings_saved', false, loadTemplate('admin_list_rallye_noselect', true));
 	}
-}
- elseif (($_GET['sub'] == "users") && ($_GET['rallye'] > 0))
-{
+} elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye') > 0)) {
 	// List users and their refs before start and current
-	$result = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s ORDER BY userid",
-	 array(bigintval($_GET['rallye'])), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
-		$SW = 2; $OUT = "";
-		define('__RALLYE_VALUE', $_GET['rallye']);
-		while (list($uid, $old, $opoints) = SQL_FETCHROW($result))
-		{
-			// Check for referral count
-			$cnt = RALLYE_GET_REFCOUNT($uid, $old);
+	$result = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
+		array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) > 0) {
+		$OUT = ''; $SW = 2;
+		$content['rallye'] = getRequestElement('rallye');
+		while ($row = SQL_FETCHARRAY($result)) {
+			// Check for referal count
+			$cnt = getReferalRallyeRefsCount($row['userid'], $row['refs']);
+
+			// Init variables
+			$bl = '';
+			$br = '';
 
 			// Output row
-			$Bl = ""; $Br = "";
-			if (($opoints > 0) && ($cnt > 0)) { $Bl = "<STRONG>"; $Br = "</STRONG>"; }
-			if (($old > 0) || ($cnt > 0))
-			{
-				// Insert link to referral list
-				//* DEBUG: */ echo "-".$uid."/".$cnt."/".$old."-<br />";
-				$cnt = ADMIN_USER_PROFILE_LINK($uid, $cnt, "list_refs");
-				$old = ADMIN_USER_PROFILE_LINK($uid, $old, "list_refs");
-			}
-			$content = array(
+			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = "<strong>"; $br = "</strong>"; }
+			if (($row['refs'] > 0) || ($cnt > 0)) {
+				// Insert link to referal list
+				//* DEBUG: */ outputHtml('-'.$row['userid'].'/'.$cnt.'/'.$row['refs']."-<br />");
+				$cnt = generateUserProfileLink($row['userid'], $cnt, 'list_refs');
+				$row['refs'] = generateUserProfileLink($row['userid'], $row['refs'], 'list_refs');
+			} // END - if
+
+			// Get user points
+			$points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
+			//* DEBUG: */ outputHtml(basename(__FILE__).":userid={$row['userid']},points={$points},opoints={$row['curr_points']}<br />");
+
+			// Prepare content
+			// @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
+			$row = array(
 				'sw'      => $SW ,
-				'uid'     => $uid,
-				'bold_l'  => $Bl ,
-				'bold_r'  => $Br ,
-				'old'     => $old,
+				'userid'     => $row['userid'],
+				'bold_l'  => $bl ,
+				'bold_r'  => $br ,
+				'old'     => $row['refs'],
 				'cnt'     => $cnt,
-				'opoints' => TRANSLATE_COMMA($opoints),
+				'opoints' => translateComma($points - $row['curr_points']),
 			);
-			$OUT .= LOAD_TEMPLATE("admin_list_rallye_usr_row", true, $content);
+
+			// Load row template and switch color
+			$OUT .= loadTemplate('admin_list_rallye_usr_row', true, $row);
 			$SW = 3 - $SW;
-		}
+		} // END - while
+
+		// Remember rows
+		$content['rows']   = $OUT;
+		$content['rallye'] = getRequestElement('rallye');
 
 		// Free memory
 		SQL_FREERESULT($result);
-		define('__RALLYE_USER_ROWS', $OUT);
 
 		// Load template
-		LOAD_TEMPLATE("admin_list_rallye_usr");
-	}
-	 else
-	{
+		loadTemplate('admin_list_rallye_usr', false, $content);
+	} else {
 		// No entries found?
-		LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ADMIN_USERS_404);
+		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
 	}
-}
- else
-{
+} else {
 	// Start listing rallyes
-	$result = SQL_QUERY("SELECT id, admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify, notified, min_users, min_prices
-FROM "._MYSQL_PREFIX."_rallye_data
-ORDER BY start_time DESC",
- __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+	$result = SQL_QUERY("SELECT
+	`id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`
+FROM
+	`{?_MYSQL_PREFIX?}_rallye_data`
+ORDER BY
+	`start_time` DESC", __FILE__, __LINE__);
+
+	// Records found?
+	if (SQL_NUMROWS($result) > 0) {
 		// List found rallyes
-		$SW = 2; $OUT = "";
-		while (list($id, $aid, $title, $descr, $templ, $start, $end, $auto_add, $active, $notify, $notified, $min_users, $min_prices) = SQL_FETCHROW($result))
-		{
+		$OUT = ''; $SW = 2;
+		while ($data = SQL_FETCHARRAY($result)) {
 			// Load admin login
-			$alogin = GET_ADMIN_LOGIN($aid);
-
-			// Count assigned prices
-			$result_prices = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_prices WHERE rallye_id=%s",
-			 array(bigintval($id)), __FILE__, __LINE__);
+			$data['login'] = getAdminLogin($data['admin_id']);
 
 			// Count joined userids
-			$result_user = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_rallye_users WHERE rallye_id=%s",
-			 array($id), __FILE__, __LINE__);
-			$joined = SQL_NUMROWS($result_user);
+			$joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
 			// Did some users joined this rallye?
-			if ($joined > 0)
-			{
+			if ($joined > 0) {
 				// List joined users
-				$joined = "<A href=\"".URL."/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$id."\" title=\"".RALLYE_LIST_USERS."\">".$joined."</A>";
-			}
+				$joined = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$data['id']."\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$joined."</a>";
+			} // END - if
 
 			// Alter some variables
-			if (empty($alogin)) $alogin = "???";
-			if (empty($templ))  $templ  = "---";
-			if (empty($descr))  $descr  = "---";
+			if (empty($data['login']))    $data['login']     = '???';
+			if (empty($data['template'])) $data['template']  = '---';
+			if (empty($data['descr']))    $data['descr']     = '---';
 
 			// Transfer data into array for the template
-			$content = array(
-				'select'     => "<INPUT type=\"checkbox\" name=\"sel[".$id."]\" class=\"admin_normal\" value=\"1\">",
-				'aid'        => $aid,
-				'email_link' => CREATE_EMAIL_LINK($aid),
-				'alogin'     => $alogin,
-				'id'         => $id,
+			$row = array(
+				'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
+				'admin_id'   => $data['admin_id'],
+				'admin_link' => generateAdminLink($data['admin_id']),
+				'login'      => $data['login'],
+				'id'         => $data['id'],
 				'sw'         => $SW,
-				'title'      => $title,
-				'template'   => $templ,
+				'title'      => $data['title'],
+				'template'   => $data['template'],
 				'joined'     => $joined,
-				'start_date' => MAKE_DATETIME($start, "2"),
-				'end_date'   => MAKE_DATETIME($end  , "2"),
-				'active_lnk' => TRANSLATE_YESNO($active),
-				'notify_lnk' => TRANSLATE_YESNO($notify),
-				'auto_lnk'   => TRANSLATE_YESNO($auto_add),
-				'notified'   => TRANSLATE_YESNO($notified),
-				'prices_cnt' => SQL_NUMROWS($result_prices),
-				'descr'      => COMPILE_CODE($descr),
-				'min_users'  => $min_users,
-				'min_prices' => $min_prices,
+				'start_date' => generateDateTime($data['start_time'], 2),
+				'end_date'   => generateDateTime($data['end_time']  , 2),
+				'active_lnk' => translateYesNo($data['is_active']),
+				'notify_lnk' => translateYesNo($data['send_notify']),
+				'auto_lnk'   => translateYesNo($data['auto_add_new_user']),
+				'notified'   => translateYesNo($data['notified']),
+				'prices_cnt' => translateComma(countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true)),
+				'descr'      => $data['descr'],
+				'min_users'  => $data['min_users'],
+				'min_prices' => $data['min_prices'],
 			);
 
-			// Free memory
-			SQL_FREERESULT($result_prices);
-			SQL_FREERESULT($result_user);
-
 			// Is the rallye active or not?
-			switch ($active)
-			{
-			case 'Y':
-				// Rallye is active so do not edit it!
-				$content['select'] = "<STRONG class=\"big\">".$id."</STRONG>";
-				$content['active_title'] = RALLYE_DEACTIVATE_NOW;
-				$content['active'] = "0";
-				break;
-
-			case 'N':
-				$content['active_title'] = RALLYE_ACTIVATE_NOW;
-				$content['active'] = "1";
-				break;
+			switch ($data['is_active']) {
+				case 'Y':
+					// Rallye is active so do not edit it!
+					$row['select'] = "<div class=\"big\">".$row['id']."</div>";
+					$row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
+					$row['active'] = '0';
+					break;
+
+				case 'N':
+					$row['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
+					$row['active'] = 1;
+					break;
 			}
 
 			// Notification to members?
-			switch ($notify)
-			{
-			case 'Y':
-				$content['notify_title'] = RALLYE_STOP_NOTIFY_NOW;
-				$content['notify'] = "0";
-				break;
-
-			case 'N':
-				$content['notify_title'] = RALLYE_START_NOTIFY_NOW;
-				$content['notify'] = "1";
-				break;
+			switch ($data['send_notify']) {
+				case 'Y':
+					$row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
+					$row['notify'] = '0';
+					break;
+
+				case 'N':
+					$row['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
+					$row['notify'] = 1;
+					break;
 			}
 
 			// Auto-add of new joined members?
-			switch ($auto_add)
-			{
-			case 'Y':
-				$content['auto_title'] = RALLYE_STOP_AUTO_ADD_NOW;
-				$content['auto'] = "0";
-				break;
-
-			case 'N':
-				$content['auto_title'] = RALLYE_START_AUTO_ADD_NOW;
-				$content['auto'] = "1";
-				break;
+			switch ($data['auto_add_new_user']) {
+				case 'Y':
+					$row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
+					$row['auto'] = '0';
+					break;
+
+				case 'N':
+					$row['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
+					$row['auto'] = 1;
+					break;
 			}
 
 			// Output row
-			$OUT .= LOAD_TEMPLATE("admin_list_rallyes_row", true, $content);
+			$OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
 			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
-		define('__RALLYE_ROWS', $OUT);
+
+		// Remember rows in array
+		$content['rows'] = $OUT;
 
 		// Load template
-		LOAD_TEMPLATE("admin_list_rallyes");
-	}
-	 else
-	{
+		loadTemplate('admin_list_rallyes', false, $content);
+	} else {
 		// No rallyes setup so far
-		LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_NO_RALLYES_SETUP);
+		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
 	}
 }
-//
+
+// [EOF]
 ?>