X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=0887e9ba982d7afe7932ee1692cd5e9857ebfc29;hb=66b91ce490ab549425619c95fc12086e126d541b;hp=98960fe2517849b7090f8129cba64dbfd72f5bc7;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 98960fe251..0887e9ba98 100644
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -38,86 +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 (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__);
+			$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) {
 				// 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__);
-				LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
+				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
 				SQL_FREERESULT($result);
 
 				// Price level found!
-				LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_PRICE_ALREADY_FOUND'));
+				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_PRICE_ALREADY_FOUND'));
 			}
 		}
-	} elseif (REQUEST_ISSET_POST(('remove'))) {
+	} elseif (REQUEST_ISSET_POST('remove')) {
 		// Check if at last one line is selected
-		$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+		$SEL = countPostSelection();
 		if ($SEL > 0) {
 			// 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__);
+				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, getMessage('RALLYE_ENTRIES_DELETED'));
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_DELETED'));
 		} else {
-			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('RALLYE_ENTRIES_NOT_DELETED'));
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_NOT_DELETED'));
 		}
-	} elseif (REQUEST_ISSET_POST(('change'))) {
+	} elseif (REQUEST_ISSET_POST('change')) {
 		// Change entries
 		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(
-					REQUEST_POST('rallye_id', $id),
-					bigintval($level),
-					REQUEST_POST('points', $id]),
-					REQUEST_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, getMessage('RALLYE_ENTRIES_CHANGED'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_ENTRIES_CHANGED'));
 	}
 
 	if (REQUEST_ISSET_POST('edit')) {
 		// Check if at last one line is selected
-		$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+		$SEL = countPostSelection();
 		if ($SEL > 0) {
 			// Make selected editable
-			$OUT = ""; $SW = 2;
+			$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);
 
@@ -125,7 +125,7 @@ VALUES ('%s','%s','%s','%s')",
 				$content = array(
 					'sw'      => $SW,
 					'id'      => $id,
-					'rallyes' => ADD_OPTION_LINES("rallye_data", "id", "title", $rallye),
+					'rallyes' => generateOptionList("rallye_data", 'id', "title", $rallye),
 					'level'   => $level,
 					'points'  => $points,
 					'infos'   => $infos,
@@ -144,23 +144,23 @@ VALUES ('%s','%s','%s','%s')",
 			LOAD_TEMPLATE("admin_config_rallye_edit");
 		} else {
 			// Nothing selected
-			$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);
+			$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 (REQUEST_ISSET_POST('del')) {
 		// Check if at last one line is selected
-		$SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+		$SEL = countPostSelection();
 		if ($SEL > 0) {
 			// List all prices
-			$OUT = ""; $SW = 2;
+			$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);
 
-				if (empty($infos)) $infos = "---";
+				if (empty($infos)) $infos = '---';
 
 				// Prepare data for the row template
 				$content = array(
@@ -184,20 +184,20 @@ VALUES ('%s','%s','%s','%s')",
 			LOAD_TEMPLATE("admin_config_rallye_del");
 		} else {
 			// Nothing selected
-			$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);
+			$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 {
 		// 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
-			$OUT = ""; $SW = 2;
+			$OUT = ''; $SW = 2;
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Fix empty info
-				if (empty($content['info'])) $content['info'] = "---";
+				if (empty($content['info'])) $content['info'] = '---';
 
 				// Prepare data for the row template
 				// @TODO Rewritings: level->price_level, infos->info in template
@@ -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,25 +224,32 @@ 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;
+		$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>";
+			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
@@ -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' => CREATE_EMAIL_LINK($content['admin_id']),
+				'email_link' => generateEmailLink($content['admin_id']),
 				'alogin'     => $content['login'],
-				'start'      => MAKE_DATETIME($content['start_time'], "3"),
-				'end'        => MAKE_DATETIME($content['end_time'], "3"),
+				'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,10 +275,10 @@ 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'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
 	}
 }
 //