X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=3723a4a1684a41ffb4a1d8fe5f8d42a54242b8c7;hp=ace52878238c21e6f7e7209dc7cf484d3e8c463a;hb=116747e4dba29e9e2e4daa82c45d8bbb302e9378;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index ace5287823..3723a4a168 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Rallye-Preise einrichten                         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,88 +38,86 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
-if (!empty($_GET['rallye']))
-{
+if (REQUEST_ISSET_GET(('rallye'))) {
 	// Price submitted?
-	if (isset($_POST['add']))
-	{
-		if ((!empty($_POST['level'])) && ((!empty($_POST['points'])) || (!empty($_POST['info']))))
-		{
+	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($_GET['rallye']), bigintval($_POST['level'])), __FILE__, __LINE__);
+			$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__);
 
-			if (SQL_NUMROWS($result) == 0)
-			{
+			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)
+				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_prices` (rallye_id, price_level, points, info)
 VALUES ('%s','%s','%s','%s')",
  array(
-	bigintval($_GET['rallye']),
-	bigintval($_POST['level']),
-	$_POST['points'],
-	$_POST['info']
+	bigintval(REQUEST_GET('rallye')),
+	bigintval(REQUEST_POST('level')),
+	REQUEST_POST('points'),
+	REQUEST_POST('info')
 ), __FILE__, __LINE__);
-				LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PRICE_LEVEL_SAVED);
-			}
-			 else
-			{
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
+			} else {
 				// Free memory
 				SQL_FREERESULT($result);
 
 				// Price level found!
-				LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PRICE_ALREADY_FOUND);
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_PRICE_ALREADY_FOUND'));
 			}
 		}
-	} elseif (isset($_POST['remove'])) {
+	} elseif (REQUEST_ISSET_POST('remove')) {
 		// Check if at last one line is selected
-		$SEL = SELECTION_COUNT($_POST['sel']);
+		$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
 		if ($SEL > 0) {
 			// Delete selected entries
-			foreach ($_POST['sel'] as $id => $sel) {
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_rallye_prices WHERE id=%s LIMIT 1",
+			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__);
 			}
 
 			// Output message
-			LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_DELETED);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_DELETED'));
 		} else {
-			LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_NOT_DELETED);
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_NOT_DELETED'));
 		}
-	} elseif (isset($_POST['change'])) {
+	} elseif (REQUEST_ISSET_POST('change')) {
 		// Change entries
-		foreach ($_POST['level'] as $id => $level) {
+		foreach (REQUEST_POST('level') as $id => $level) {
 			// 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($_POST['rallye_id'][$id], bigintval($level), $_POST['points'][$id], $_POST['infos'][$id], $id), __FILE__, __LINE__);
+			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__);
 		}
 
 		// Output message
-		LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_CHANGED);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_CHANGED'));
 	}
 
-	if (isset($_POST['edit'])) {
+	if (REQUEST_ISSET_POST('edit')) {
 		// Check if at last one line is selected
-		$SEL = SELECTION_COUNT($_POST['sel']);
-		if ($SEL > 0)
-		{
+		$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+		if ($SEL > 0) {
 			// Make selected editable
-			$SW = 2; $OUT = "";
-			foreach ($_POST['sel'] as $id => $sel)
-			{
+			$OUT = ''; $SW = 2;
+			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__);
+				$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);
 
@@ -135,31 +138,25 @@ VALUES ('%s','%s','%s','%s')",
 			define('__PRICE_ROWS', $OUT);
 
 			// Prepare data for the main template
-			define('__RALLYE_ID', $_GET['rallye']);
+			define('__RALLYE_ID', REQUEST_GET('rallye'));
 
 			// Load main template
 			LOAD_TEMPLATE("admin_config_rallye_edit");
-		}
-		 else
-		{
+		} else {
 			// Nothing selected
-			$content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
-			LOAD_TEMPLATE("admin_settings_saved", false, $content);
+			$content = sprintf(getMessage('RALLYE_NO_PRICES_SELECTED'), "<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".REQUEST_GET('rallye')."\">", "</a>");
+			LOAD_TEMPLATE('admin_settings_saved', false, $content);
 		}
-	}
-	 elseif (isset($_POST['del']))
-	{
+	} elseif (REQUEST_ISSET_POST('del')) {
 		// Check if at last one line is selected
-		$SEL = SELECTION_COUNT($_POST['sel']);
-		if ($SEL > 0)
-		{
+		$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+		if ($SEL > 0) {
 			// List all prices
-			$SW = 2; $OUT = "";
-			foreach ($_POST['sel'] as $id => $sel)
-			{
+			$OUT = ''; $SW = 2;
+			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__);
+				$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);
 
@@ -181,52 +178,50 @@ VALUES ('%s','%s','%s','%s')",
 			define('__PRICE_ROWS', $OUT);
 
 			// Prepare data for the main template
-			define('__RALLYE_ID', $_GET['rallye']);
+			define('__RALLYE_ID', REQUEST_GET('rallye'));
 
 			// Load main template
 			LOAD_TEMPLATE("admin_config_rallye_del");
-		}
-		 else
-		{
+		} else {
 			// Nothing selected
-			$content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"".URL."/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".$_GET['rallye']."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
-			LOAD_TEMPLATE("admin_settings_saved", false, $content);
+			$content = RALLYE_NO_PRICES_SELECTED_1."<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye=".REQUEST_GET('rallye')."\">".RALLYE_NO_PRICES_SELECTED_2."</a>".RALLYE_NO_PRICES_SELECTED_3;
+			LOAD_TEMPLATE('admin_settings_saved', false, $content);
 		}
-	}
-	 else
-	{
+	} 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($_GET['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",
+			array(bigintval(REQUEST_GET('rallye'))), __FILE__, __LINE__);
 
-		if (SQL_NUMROWS($result) > 0)
-		{
+		if (SQL_NUMROWS($result) > 0) {
 			// Load all prices for the selected rallye
-			$SW = 2; $OUT = "";
-			while(list($id, $level, $points, $infos) = SQL_FETCHROW($result))
-			{
-				if (empty($infos)) $infos = "---";
+			$OUT = ''; $SW = 2;
+			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'      => $id,
-					'level'   => $level,
-					'points'  => $points,
-					'infos'   => $infos,
+					'id'      => $content['id'],
+					'level'   => $content['price_level'],
+					'points'  => $content['points'],
+					'infos'   => $content['info'],
 				);
 
 				// Load row template and switch color
 				$OUT .= LOAD_TEMPLATE("admin_config_rallye_prices_row", true, $content);
 				$SW = 3 - $SW;
-			}
+			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
+
+			// @TODO Rewrite these two constants
 			define('__PRICE_ROWS', $OUT);
 
 			// Prepare data for the main template
-			define('__RALLYE_ID', $_GET['rallye']);
+			define('__RALLYE_ID', REQUEST_GET('rallye'));
 
 			// Load main template
 			LOAD_TEMPLATE("admin_config_rallye_prices");
@@ -234,37 +229,33 @@ VALUES ('%s','%s','%s','%s')",
 	}
 
 	// Add form for adding new price level
-	if (empty($_POST['edit']))
-	{
-		LOAD_TEMPLATE("admin_add_rallye_prices", false, $_GET['rallye']);
+	if (!REQUEST_ISSET_POST('edit')) {
+		LOAD_TEMPLATE("admin_add_rallye_prices", false, REQUEST_GET('rallye'));
 	}
-}
- else
-{
+} 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
+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__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+	if (SQL_NUMROWS($result) > 0) {
 		// List found rallyes
-		$SW = 2; $OUT = "";
-		while (list($id, $aid, $start, $end, $title, $alogin, $active) = SQL_FETCHROW($result))
-		{
-			$select = "<INPUT type=\"checkbox\" name=\"sel[".$id."]\" class=\"admin_normal\" value=\"1\">";
-			if ($active == "Y") $select = "<div class=\"big\">".$id."</div>";
+		$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: aid->admin_id, alogin->login in template
 			$content = array(
 				'sw'         => $SW,
-				'id'         => $id,
+				'id'         => $content['id'],
 				'select'     => $select,
-				'title'      => $title,
-				'aid'        => $aid,
-				'email_link' => CREATE_EMAIL_LINK($aid),
-				'alogin'     => $alogin,
-				'start'      => MAKE_DATETIME($start, "3"),
-				'end'        => MAKE_DATETIME($end, "3"),
+				'title'      => $content['title'],
+				'aid'        => $content['admin_id'],
+				'email_link' => CREATE_EMAIL_LINK($content['admin_id']),
+				'alogin'     => $content['login'],
+				'start'      => MAKE_DATETIME($content['start_time'], "3"),
+				'end'        => MAKE_DATETIME($content['end_time'], "3"),
 			);
 
 			// Load row template and switch color
@@ -278,11 +269,9 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
 
 		// Load main template
 		LOAD_TEMPLATE("admin_list_rallye_prices");
-	}
-	 else
-	{
+	} else {
 		// No rallyes setup so far
-		LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_NO_RALLYES_SETUP);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
 	}
 }
 //