X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_rallye_prices.php;h=1c90f6a42086bfaf7873800912ab92d96a21bcf8;hp=617b0349be192ba34ac8e399f385c8f68654ddd3;hb=0f3a135204757cc8750262871c8e62c42300acb4;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4
diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 617b0349be..1c90f6a420 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__);
@@ -57,7 +55,7 @@ if (isGetRequestParameterSet('rallye')) {
// Ok, new price level entered!
SQL_QUERY_ESC("INSERT INTO
`{?_MYSQL_PREFIX?}_rallye_prices`
-(`rallye_id`, `price_level`, `points`, `info`)
+(`rallye_id`,`price_level`,`points`,`info`)
VALUES
(%s, %s, '%s', '%s')",
array(
@@ -66,18 +64,18 @@ if (isGetRequestParameterSet('rallye')) {
postRequestParameter('points'),
postRequestParameter('info')
), __FILE__, __LINE__);
- loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_LEVEL_SAVED--}');
+ displayMessage('{--RALLYE_PRICE_LEVEL_SAVED--}');
} else {
// Free memory
SQL_FREERESULT($result);
- // Price level found!
- loadTemplate('admin_settings_saved', false, '{--RALLYE_PRICE_ALREADY_FOUND--}');
+ // Price level found
+ displayMessage('{--RALLYE_PRICE_ALREADY_FOUND--}');
}
}
- } elseif (isFormSent('remove')) {
+ } elseif (isFormSent('do_delete')) {
// 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",
@@ -85,11 +83,11 @@ if (isGetRequestParameterSet('rallye')) {
} // END - foreach
// Output message
- loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_DELETED--}');
+ displayMessage('{--RALLYE_ENTRIES_DELETED--}');
} else {
- loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_NOT_DELETED--}');
+ displayMessage('{--RALLYE_ENTRIES_NOT_DELETED--}');
}
- } elseif (isFormSent('change')) {
+ } elseif (isFormSent('do_edit')) {
// Change entries
foreach (postRequestParameter('level') as $id => $level) {
// Secure id
@@ -116,35 +114,29 @@ LIMIT 1",
}
// Output message
- loadTemplate('admin_settings_saved', false, '{--RALLYE_ENTRIES_CHANGED--}');
+ displayMessage('{--RALLYE_ENTRIES_CHANGED--}');
}
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
@@ -155,34 +147,22 @@ LIMIT 1",
} else {
// Nothing selected
$content = '{--RALLYE_NO_PRICES_SELECTED_1--}{--RALLYE_NO_PRICES_SELECTED_2--}{--RALLYE_NO_PRICES_SELECTED_3--}';
- loadTemplate('admin_settings_saved', false, $content);
+ displayMessage($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",
+ $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;
@@ -194,33 +174,19 @@ LIMIT 1",
} else {
// Nothing selected
$content = '{--RALLYE_NO_PRICES_SELECTED_1--}{--RALLYE_NO_PRICES_SELECTED_2--}{--RALLYE_NO_PRICES_SELECTED_3--}';
- loadTemplate('admin_settings_saved', false, $content);
+ displayMessage($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` ASC",
+ $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,25 +219,17 @@ 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),
- );
+ // @TODO rename: start->start_time, end->end_time
+ $content['start'] = generateDateTime($content['start_time'], '3');
+ $content['end'] = generateDateTime($content['end_time'] , '3');
// Load row template and switch color
$OUT .= loadTemplate('admin_list_rallye_prices_row', true, $content);
- $SW = 3 - $SW;
} // END - while
// Free memory
@@ -281,7 +239,7 @@ ORDER BY
loadTemplate('admin_list_rallye_prices', false, $OUT);
} else {
// No rallyes setup so far
- loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
+ displayMessage('{--RALLYE_NO_RALLYES_SETUP--}');
}
}