X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=0ebeb5e4a4d0ff7566374e2432b2322938b89a78;hb=6809d445c472e918ac3bf8a6cb0914b3a996764d;hp=1b945c75a9ab0acf2c8d660b4e2f258b9d110152;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 1b945c75a9..0ebeb5e4a4 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -128,7 +128,7 @@ if (isGetRequestElementSet(('rallye'))) {
 
 		// Change selected rallyes and all it's data
 		foreach (postRequestElement('title') as $id => $title) {
-			// Secure ID number
+			// Secure id number
 			$id = bigintval($id);
 
 			// Generate timestamps
@@ -274,58 +274,60 @@ LIMIT 1",
 	}
 } 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__);
+	$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
 		$OUT = ''; $SW = 2;
-		while ($row = SQL_FETCHARRAY($result)) {
+		while ($data = SQL_FETCHARRAY($result)) {
 			// Load admin login
-			$row['alogin'] = getAdminLogin($row['admin_id']);
+			$data['login'] = getAdminLogin($data['admin_id']);
 
 			// Count joined userids
-			$joined = countSumTotalData($row['id'], "rallye_users", 'id', "rallye_id", true);
+			$joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
 			// Did some users joined this rallye?
 			if ($joined > 0) {
 				// List joined users
-				$joined = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$row['id']."\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$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($row['alogin']))   $row['alogin']    = '???';
-			if (empty($row['template'])) $row['template']  = '---';
-			if (empty($row['descr']))    $row['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
-			// @TODO Rewritings: admin_id->admin_id in template
 			$row = array(
-				'select'     => "<input type=\"checkbox\" name=\"sel[".$row['id']."]\" class=\"admin_normal\" value=\"1\" />",
-				'admin_id'        => $row['admin_id'],
-				'email_link' => generateEmailLink($row['admin_id']),
-				'alogin'     => $row['alogin'],
-				'id'         => $row['id'],
+				'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
+				'admin_id'   => $data['admin_id'],
+				'email_link' => generateEmailLink($data['admin_id']),
+				'login'      => $data['login'],
+				'id'         => $data['id'],
 				'sw'         => $SW,
-				'title'      => $row['title'],
-				'template'   => $row['template'],
+				'title'      => $data['title'],
+				'template'   => $data['template'],
 				'joined'     => $joined,
-				'start_date' => generateDateTime($row['start_time'], 2),
-				'end_date'   => generateDateTime($row['end_time']  , 2),
-				'active_lnk' => translateYesNo($row['is_active']),
-				'notify_lnk' => translateYesNo($row['send_notify']),
-				'auto_lnk'   => translateYesNo($row['auto_add_new_user']),
-				'notified'   => translateYesNo($row['notified']),
-				'prices_cnt' => translateComma(countSumTotalData($row['id'], 'rallye_prices', 'id', 'rallye_id', true)),
-				'descr'      => $row['descr'],
-				'min_users'  => $row['min_users'],
-				'min_prices' => $row['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'],
 			);
 
 			// Is the rallye active or not?
-			switch ($row['is_active'])
-			{
+			switch ($data['is_active']) {
 				case 'Y':
 					// Rallye is active so do not edit it!
 					$row['select'] = "<div class=\"big\">".$row['id']."</div>";
@@ -340,8 +342,7 @@ ORDER BY start_time DESC",
 			}
 
 			// Notification to members?
-			switch ($row['send_notify'])
-			{
+			switch ($data['send_notify']) {
 				case 'Y':
 					$row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
 					$row['notify'] = 0;
@@ -354,8 +355,7 @@ ORDER BY start_time DESC",
 			}
 
 			// Auto-add of new joined members?
-			switch ($row['auto_add_new_user'])
-			{
+			switch ($data['auto_add_new_user']) {
 				case 'Y':
 					$row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
 					$row['auto'] = 0;
@@ -370,7 +370,7 @@ ORDER BY start_time DESC",
 			// Output row
 			$OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
 			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);