X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=63a08add0fbe95b6f0546f48377d1cb6ad8c6817;hp=617b0349be192ba34ac8e399f385c8f68654ddd3;hb=903f539b5aac6171fdfee9ad252565531e8dd4e2;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 617b0349be..63a08add0f 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -48,7 +48,7 @@ addMenuDescription('admin', __FILE__);
 if (isGetRequestParameterSet('rallye')) {
 	// Price submitted?
 	if (isFormSent('add')) {
-		if ((isPostRequestParameterSet(('level'))) && ((isPostRequestParameterSet('points')) || (isPostRequestParameterSet(('info'))))) {
+		if ((isPostRequestParameterSet('level')) && ((isPostRequestParameterSet('points')) || (isPostRequestParameterSet('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(getRequestParameter('rallye')), bigintval(postRequestParameter('level'))), __FILE__, __LINE__);
@@ -77,7 +77,7 @@ if (isGetRequestParameterSet('rallye')) {
 		}
 	} elseif (isFormSent('remove')) {
 		// Check if at last one line is selected
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Delete selected entries
 			foreach (postRequestParameter('sel') as $id => $sel) {
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
@@ -121,30 +121,24 @@ LIMIT 1",
 
 	if (isFormSent('edit')) {
 		// Check if at last one line is selected
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Make selected editable
-			$OUT = ''; $SW = 2;
+			$OUT = '';
 			foreach (postRequestParameter('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",
+				$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);
+				$content = SQL_FETCHARRAY($result);
 				SQL_FREERESULT($result);
 
-				// Prepare data for the row template
-				$content = array(
-					'sw'      => $SW,
-					'id'      => $id,
-					'rallyes' => generateOptionList('rallye_data', 'id', 'title', $rallye),
-					'level'   => $level,
-					'points'  => $points,
-					'infos'   => $infos,
-				);
+				// Add more content
+				$content['rallye_content'] = generateOptionList('rallye_data', 'id', 'title', $content['rallye_id']);
 
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_config_rallye_edit_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - foreach
+
+			// Remember row content
 			$content['rows'] = $OUT;
 
 			// Prepare data for the main template
@@ -157,32 +151,20 @@ LIMIT 1",
 			$content = '{--RALLYE_NO_PRICES_SELECTED_1--}<a href="{%url=modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=' . getRequestParameter('rallye') . '%}">{--RALLYE_NO_PRICES_SELECTED_2--}</a>{--RALLYE_NO_PRICES_SELECTED_3--}';
 			loadTemplate('admin_settings_saved', false, $content);
 		}
-	} elseif (isFormSent('del')) {
+	} elseif (isFormSent('delete')) {
 		// Check if at last one line is selected
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// List all prices
-			$OUT = ''; $SW = 2;
+			$OUT = '';
 			foreach (postRequestParameter('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__);
-				list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
+				$content = SQL_FETCHARRAY($result);
 				SQL_FREERESULT($result);
 
-				if (empty($infos)) $infos = '---';
-
-				// Prepare data for the row template
-				$content = array(
-					'sw'      => $SW,
-					'id'      => $id,
-					'level'   => $level,
-					'points'  => $points,
-					'infos'   => $infos,
-				);
-
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_config_rallye_del_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - foreach
 			$content['rows'] = $OUT;
 
@@ -201,26 +183,12 @@ LIMIT 1",
 		$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(getRequestParameter('rallye'))), __FILE__, __LINE__);
 
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Load all prices for the selected rallye
-			$OUT = ''; $SW = 2;
+			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
-				// Fix empty info
-				if (empty($content['info'])) $content['info'] = '---';
-
-				// Prepare data for the row template
-				// @TODO Rewritings: level->price_level, infos->info in template
-				$content = array(
-					'sw'      => $SW,
-					'id'      => $content['id'],
-					'level'   => $content['price_level'],
-					'points'  => $content['points'],
-					'infos'   => $content['info'],
-				);
-
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_config_rallye_prices_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - while
 
 			// Free memory
@@ -253,17 +221,15 @@ ON
 	d.admin_id=a.id
 ORDER BY
 	d.start_time DESC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List found rallyes
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Prepare data for the row template
 			$content = array(
-				'sw'         => $SW,
 				'id'         => $content['id'],
 				'title'      => $content['title'],
 				'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),
@@ -271,7 +237,6 @@ ORDER BY
 
 			// Load row template and switch color
 			$OUT .= loadTemplate('admin_list_rallye_prices_row', true, $content);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory