X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=90494cce85f2cdd775af892783515811cd908027;hp=05af9628f26f4d65ef3990e494d59b32686e28f7;hb=3f51c40f4fede87228216f9285b745a339e3891d;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 05af9628f2..90494cce85 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -47,22 +47,22 @@ ADD_DESCR('admin', __FILE__);
 
 if (REQUEST_ISSET_GET(('rallye'))) {
 	// Price submitted?
-	if (REQUEST_ISSET_POST(('add'))) {
+	if (REQUEST_ISSET_POST('add')) {
 		if ((REQUEST_ISSET_POST(('level'))) && ((REQUEST_ISSET_POST(('points'))) || (REQUEST_ISSET_POST(('info'))))) {
 			// Submitted data is valid, but maybe we already have this price level?
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s AND price_level='%s' LIMIT 1",
-				array(bigintval(REQUEST_GET('rallye')), bigintval(REQUEST_POST('level'))), __FILE__, __LINE__);
+			array(bigintval(REQUEST_GET('rallye')), bigintval(REQUEST_POST('level'))), __FILE__, __LINE__);
 
 			if (SQL_NUMROWS($result) == 0) {
 				// Ok, new price level entered!
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_prices` (rallye_id, price_level, points, info)
 VALUES ('%s','%s','%s','%s')",
- array(
-	bigintval(REQUEST_GET('rallye')),
-	bigintval(REQUEST_POST('level')),
-	REQUEST_POST('points'),
-	REQUEST_POST('info')
-), __FILE__, __LINE__);
+				array(
+				bigintval(REQUEST_GET('rallye')),
+				bigintval(REQUEST_POST('level')),
+				REQUEST_POST('points'),
+				REQUEST_POST('info')
+				), __FILE__, __LINE__);
 				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
 			} else {
 				// Free memory
@@ -79,7 +79,7 @@ VALUES ('%s','%s','%s','%s')",
 			// Delete selected entries
 			foreach (REQUEST_POST('sel') as $id => $sel) {
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE `id`=%s LIMIT 1",
-					array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($id)), __FILE__, __LINE__);
 			}
 
 			// Output message
@@ -95,13 +95,13 @@ VALUES ('%s','%s','%s','%s')",
 
 			// Update entry
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_rallye_prices` SET rallye_id=%s, price_level='%s', points='%s', info='%s' WHERE `id`=%s LIMIT 1",
-				array(
-					REQUEST_POST('rallye_id', $id),
-					bigintval($level),
-					REQUEST_POST('points', $id]),
-					REQUEST_POST('infos', $id),
-					$id
-				), __FILE__, __LINE__);
+			array(
+			REQUEST_POST('rallye_id', $id),
+			bigintval($level),
+			REQUEST_POST('points', $id),
+			REQUEST_POST('infos', $id),
+			$id
+			), __FILE__, __LINE__);
 		}
 
 		// Output message
@@ -117,7 +117,7 @@ VALUES ('%s','%s','%s','%s')",
 			foreach (REQUEST_POST('sel') as $id => $sel) {
 				// Load data to selected rallye
 				$result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE `id`=%s LIMIT 1",
-					array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($id)), __FILE__, __LINE__);
 				list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 
@@ -125,7 +125,7 @@ VALUES ('%s','%s','%s','%s')",
 				$content = array(
 					'sw'      => $SW,
 					'id'      => $id,
-					'rallyes' => generateOptionList("rallye_data", "id", "title", $rallye),
+					'rallyes' => generateOptionList("rallye_data", 'id', "title", $rallye),
 					'level'   => $level,
 					'points'  => $points,
 					'infos'   => $infos,
@@ -156,7 +156,7 @@ VALUES ('%s','%s','%s','%s')",
 			foreach (REQUEST_POST('sel') as $id => $sel) {
 				// Load data to selected rallye
 				$result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE `id`=%s LIMIT 1",
-					array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($id)), __FILE__, __LINE__);
 				list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 
@@ -190,7 +190,7 @@ VALUES ('%s','%s','%s','%s')",
 	} else {
 		// a rallye was selected, so check if there are already prices assigned...
 		$result = SQL_QUERY_ESC("SELECT id, price_level, points, info FROM `{!_MYSQL_PREFIX!}_rallye_prices` WHERE rallye_id=%s ORDER BY price_level",
-			array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
+		array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
 
 		if (SQL_NUMROWS($result) > 0) {
 			// Load all prices for the selected rallye
@@ -210,7 +210,7 @@ VALUES ('%s','%s','%s','%s')",
 				);
 
 				// Load row template and switch color
-				$OUT .= LOAD_TEMPLATE("admin_config_rallye_prices_row", true, $content);
+				$OUT .= LOAD_TEMPLATE('admin_config_rallye_prices_row', true, $content);
 				$SW = 3 - $SW;
 			} // END - while
 
@@ -224,19 +224,26 @@ VALUES ('%s','%s','%s','%s')",
 			define('__RALLYE_ID', REQUEST_GET('rallye'));
 
 			// Load main template
-			LOAD_TEMPLATE("admin_config_rallye_prices");
+			LOAD_TEMPLATE('admin_config_rallye_prices');
 		}
 	}
 
 	// Add form for adding new price level
 	if (!REQUEST_ISSET_POST('edit')) {
-		LOAD_TEMPLATE("admin_add_rallye_prices", false, REQUEST_GET('rallye'));
+		LOAD_TEMPLATE('admin_add_rallye_prices', false, REQUEST_GET('rallye'));
 	}
 } else {
 	// No rallye selected so display all available without prices
-	$result = SQL_QUERY("SELECT d.id, d.admin_id, d.start_time, d.end_time, d.title, a.login, d.is_active
-FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d, `{!_MYSQL_PREFIX!}_admins` AS a
-WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT
+	d.id, d.admin_id, d.start_time, d.end_time, d.title, a.login, d.is_active
+FROM
+	`{!_MYSQL_PREFIX!}_rallye_data` AS d,
+LEFT JOIN
+	`{!_MYSQL_PREFIX!}_admins` AS a
+ON
+	d.admin_id=a.id
+ORDER BY
+	`d.start_time` DESC", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// List found rallyes
 		$OUT = ''; $SW = 2;
@@ -252,14 +259,14 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
 				'select'     => $select,
 				'title'      => $content['title'],
 				'aid'        => $content['admin_id'],
-				'email_link' => generateMemberEmailLink($content['admin_id']),
+				'email_link' => generateEmailLink($content['admin_id']),
 				'alogin'     => $content['login'],
 				'start'      => generateDateTime($content['start_time'], '3'),
 				'end'        => generateDateTime($content['end_time'], '3'),
 			);
 
 			// Load row template and switch color
-			$OUT .= LOAD_TEMPLATE("admin_list_rallye_prices_row", true, $content);
+			$OUT .= LOAD_TEMPLATE('admin_list_rallye_prices_row', true, $content);
 			$SW = 3 - $SW;
 		}
 
@@ -268,7 +275,7 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
 		define('__RALLYE_ROWS', $OUT);
 
 		// Load main template
-		LOAD_TEMPLATE("admin_list_rallye_prices");
+		LOAD_TEMPLATE('admin_list_rallye_prices');
 	} else {
 		// No rallyes setup so far
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));