X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=baf1ab9ed241617d3bd0d6f9474ef0e42b622a30;hb=c4823d28fd0bd22250b16d73f2034f36fc54abda;hp=1c78c45384cc269cc1190c326c50f9cea5340174;hpb=7f5ffcc103a856b8867ac5739dcf0a3b6710413a;p=mailer.git

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 1c78c45384..baf1ab9ed2 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -14,11 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,12 +41,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('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__);
@@ -71,13 +69,13 @@ if (isGetRequestParameterSet('rallye')) {
 				// Free memory
 				SQL_FREERESULT($result);
 
-				// Price level found!
+				// Price level found
 				loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_ALREADY_FOUND--}');
 			}
 		}
 	} 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,9 +119,9 @@ 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",
@@ -132,12 +130,10 @@ LIMIT 1",
 				SQL_FREERESULT($result);
 
 				// Add more content
-				$content['sw']             = $SW;
 				$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
@@ -153,11 +149,11 @@ 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",
@@ -165,12 +161,8 @@ LIMIT 1",
 				$content = SQL_FETCHARRAY($result);
 				SQL_FREERESULT($result);
 
-				// Add color switch
-				$content['sw'] = $SW;
-
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_config_rallye_del_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - foreach
 			$content['rows'] = $OUT;
 
@@ -189,16 +181,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)) {
-				// Add color switch
-				$content['sw'] = $SW;
-
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_config_rallye_prices_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - while
 
 			// Free memory
@@ -231,13 +219,12 @@ 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'],
@@ -248,7 +235,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