X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=63030d31811b9510976cf93098aec98ad6261917;hb=996586caead345147b60216d2f4325b5f57a9874;hp=6f43d830f979943193c9ae299423334bcaed7010;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 6f43d830f9..63030d3181 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -44,12 +44,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isGetRequestElementSet(('rallye'))) {
+if (isGetRequestElementSet('rallye')) {
 	// Price submitted?
 	if (isPostRequestElementSet('add')) {
 		if ((isPostRequestElementSet(('level'))) && ((isPostRequestElementSet(('points'))) || (isPostRequestElementSet(('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",
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s AND `price_level`='%s' LIMIT 1",
 			array(bigintval(getRequestElement('rallye')), bigintval(postRequestElement('level'))), __FILE__, __LINE__);
 
 			if (SQL_NUMROWS($result) == 0) {
@@ -57,10 +57,10 @@ if (isGetRequestElementSet(('rallye'))) {
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_prices` (rallye_id, price_level, points, info)
 VALUES ('%s','%s','%s','%s')",
 				array(
-				bigintval(getRequestElement('rallye')),
-				bigintval(postRequestElement('level')),
-				postRequestElement('points'),
-				postRequestElement('info')
+					bigintval(getRequestElement('rallye')),
+					bigintval(postRequestElement('level')),
+					postRequestElement('points'),
+					postRequestElement('info')
 				), __FILE__, __LINE__);
 				loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
 			} else {
@@ -89,18 +89,27 @@ VALUES ('%s','%s','%s','%s')",
 	} elseif (isPostRequestElementSet('change')) {
 		// Change entries
 		foreach (postRequestElement('level') as $id => $level) {
-			// Secure ID
+			// Secure id
 			$id = bigintval($id);
 
 			// 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(
-			postRequestElement('rallye_id', $id),
-			bigintval($level),
-			postRequestElement('points', $id),
-			postRequestElement('infos', $id),
-			$id
-			), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_rallye_prices`
+SET
+	`rallye_id`=%s,
+	`price_level`=%d,
+	`points`=%s,
+	`info`='%s'
+WHERE
+	`id`=%s
+LIMIT 1",
+				array(
+					postRequestElement('rallye_id', $id),
+					bigintval($level),
+					postRequestElement('points', $id),
+					postRequestElement('infos', $id),
+					$id
+				), __FILE__, __LINE__);
 		}
 
 		// Output message
@@ -116,7 +125,7 @@ VALUES ('%s','%s','%s','%s')",
 			foreach (postRequestElement('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);
 
@@ -124,7 +133,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,
@@ -154,8 +163,8 @@ VALUES ('%s','%s','%s','%s')",
 			$OUT = ''; $SW = 2;
 			foreach (postRequestElement('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__);
+				$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__);
 				list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 
@@ -188,8 +197,8 @@ 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(getRequestElement('rallye'))), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT `id`, `price_level`, `points`, `info` FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s ORDER BY `price_level` ASC",
+			array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
 
 		if (SQL_NUMROWS($result) > 0) {
 			// Load all prices for the selected rallye
@@ -236,32 +245,27 @@ VALUES ('%s','%s','%s','%s')",
 	$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?}_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__);
+	d.start_time DESC", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// List found rallyes
 		$OUT = ''; $SW = 2;
 		while ($content = SQL_FETCHARRAY($result)) {
-			$select = "<input type=\"checkbox\" name=\"sel[".$content['id']."]\" class=\"admin_normal\" value=\"1\">";
-			if ($content['is_active'] == 'Y') $select = "<div class=\"big\">".$content['id']."</div>";
-
 			// Prepare data for the row template
-			// @TODO Rewritings: admin_id->admin_id, alogin->login in template
 			$content = array(
 				'sw'         => $SW,
 				'id'         => $content['id'],
-				'select'     => $select,
 				'title'      => $content['title'],
-				'admin_id'        => $content['admin_id'],
-				'email_link' => generateEmailLink($content['admin_id']),
-				'alogin'     => $content['login'],
-				'start'      => generateDateTime($content['start_time'], '3'),
-				'end'        => generateDateTime($content['end_time'], '3'),
+				'admin_id'   => $content['admin_id'],
+				'admin_link' => generateAdminLink($content['admin_id']),
+				'login'      => $content['login'],
+				'start'      => generateDateTime($content['start_time'], 3),
+				'end'        => generateDateTime($content['end_time'], 3),
 			);
 
 			// Load row template and switch color