X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=d6bb58f5f338f1f5c1801f1ed01ebdfc63a25ba6;hb=22ba0c36c75ff989a6f48197c5a71524fb891b87;hp=9a4c3b13c62b95078f549ae2563f35b912d6d804;hpb=7f3f860c580046c17d18f2149f6c24a6bda2c901;p=mailer.git
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 9a4c3b13c6..d6bb58f5f3 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -1,7 +1,7 @@
0) {
+ if (countPostSelection() > 0) {
// Init SQLs
initSqls();
// Delete selected rallyes and all it's data
- foreach (postRequestElement('sel') as $id => $selected) {
+ foreach (postRequestParameter('sel') as $id => $selected) {
// Remove selected rallye entirely...
addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__, false));
- addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s",
+ addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",
array(bigintval($id)), __FILE__, __LINE__, false));
- addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s",
+ addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",
array(bigintval($id)), __FILE__, __LINE__, false));
} // END - foreach
@@ -128,21 +128,20 @@ if (isGetRequestElementSet('rallye')) {
// No rallye selected to delete!
$message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
}
-} elseif (isPostRequestElementSet('change')) {
+} elseif (isFormSent('change')) {
// Change rallye
- $SEL = countSelection(postRequestElement('title'));
- if ($SEL > 0) {
+ if (countSelection(postRequestParameter('title')) > 0) {
// Init SQLs
initSqls();
// Change selected rallyes and all it's data
- foreach (postRequestElement('title') as $id => $title) {
+ foreach (postRequestParameter('title') as $id => $title) {
// Secure id number
$id = bigintval($id);
// Generate timestamps
- $START = mktime(postRequestElement('start_hour', $id), postRequestElement('start_min', $id), postRequestElement('start_sec', $id), postRequestElement('start_month', $id), postRequestElement('start_day', $id), postRequestElement('start_year', $id));
- $END = mktime(postRequestElement('end_hour', $id) , postRequestElement('end_min', $id) , postRequestElement('end_sec', $id) , postRequestElement('end_month', $id) , postRequestElement('end_day', $id) , postRequestElement('end_year', $id) );
+ $START = mktime(postRequestParameter('start_hour', $id), postRequestParameter('start_min', $id), postRequestParameter('start_sec', $id), postRequestParameter('start_month', $id), postRequestParameter('start_day', $id), postRequestParameter('start_year', $id));
+ $END = mktime(postRequestParameter('end_hour', $id) , postRequestParameter('end_min', $id) , postRequestParameter('end_sec', $id) , postRequestParameter('end_month', $id) , postRequestParameter('end_day', $id) , postRequestParameter('end_year', $id) );
// Update entry
addSql(SQL_QUERY_ESC("UPDATE
@@ -160,12 +159,12 @@ WHERE
LIMIT 1",
array(
$title,
- postRequestElement('descr', $id),
- postRequestElement('templ', $id),
+ postRequestParameter('descr', $id),
+ postRequestParameter('templ', $id),
bigintval($START),
bigintval($END),
- bigintval(postRequestElement('min_users', $id)),
- bigintval(postRequestElement('min_prices', $id)),
+ bigintval(postRequestParameter('min_users', $id)),
+ bigintval(postRequestParameter('min_prices', $id)),
$id
), __FILE__, __LINE__, false));
}
@@ -178,13 +177,12 @@ LIMIT 1",
}
}
-if (isPostRequestElementSet('edit')) {
+if (isFormSent('edit')) {
// Check for selections
- $SEL = countPostSelection();
- if ($SEL > 0) {
+ if (countPostSelection() > 0) {
// Make all selected and deactivated rallyes editable
$OUT = ''; $SW = 2;
- foreach (postRequestElement('sel') as $id => $selected) {
+ foreach (postRequestParameter('sel') as $id => $selected) {
// Load rallye basic data
$result = SQL_QUERY_ESC("SELECT
`title`, `descr`, `template`, `start_time`, `end_time`, `min_users`, `min_prices`
@@ -232,15 +230,15 @@ LIMIT 1",
loadTemplate('admin_edit_rallyes', false, $OUT);
} else {
// Nothing selected to edit
- loadTemplate('admin_settings_saved', false, loadTemplate('admin_list_rallye_noselect', true));
+ loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED'));
}
-} elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye') > 0)) {
+} elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
// List users and their refs before start and current
$result = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
- array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
+ array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
if (SQL_NUMROWS($result) > 0) {
$OUT = ''; $SW = 2;
- $content['rallye'] = getRequestElement('rallye');
+ $content['rallye'] = getRequestParameter('rallye');
while ($row = SQL_FETCHARRAY($result)) {
// Check for referal count
$cnt = getReferalRallyeRefsCount($row['userid'], $row['refs']);
@@ -250,23 +248,17 @@ LIMIT 1",
$br = '';
// Output row
- if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = ""; $br = ""; }
- if (($row['refs'] > 0) || ($cnt > 0)) {
- // Insert link to referal list
- //* DEBUG: */ outputHtml('-'.$row['userid'].'/'.$cnt.'/'.$row['refs']."-
");
- $cnt = generateUserProfileLink($row['userid'], $cnt, 'list_refs');
- $row['refs'] = generateUserProfileLink($row['userid'], $row['refs'], 'list_refs');
- } // END - if
+ if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = ''; $br = ''; }
// Get user points
$points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
//* DEBUG: */ outputHtml(basename(__FILE__).":userid={$row['userid']},points={$points},opoints={$row['curr_points']}
");
// Prepare content
- // @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
+ // @TODO Rewritings: opoints->curr_points,old->refs in template
$row = array(
'sw' => $SW ,
- 'userid' => $row['userid'],
+ 'userid' => $row['userid'],
'bold_l' => $bl ,
'bold_r' => $br ,
'old' => $row['refs'],
@@ -279,11 +271,15 @@ LIMIT 1",
$SW = 3 - $SW;
} // END - while
+ // Remember rows
+ $content['rows'] = $OUT;
+ $content['rallye'] = getRequestParameter('rallye');
+
// Free memory
SQL_FREERESULT($result);
// Load template
- loadTemplate('admin_list_rallye_usr', false, $OUT);
+ loadTemplate('admin_list_rallye_usr', false, $content);
} else {
// No entries found?
loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
@@ -311,7 +307,7 @@ ORDER BY
// Did some users joined this rallye?
if ($joined > 0) {
// List joined users
- $joined = "".$joined."";
+ $joined = '' . $joined . '';
} // END - if
// Alter some variables
@@ -321,9 +317,9 @@ ORDER BY
// Transfer data into array for the template
$row = array(
- 'select' => "",
+ 'select' => '',
'admin_id' => $data['admin_id'],
- 'email_link' => generateEmailLink($data['admin_id']),
+ 'admin_link' => generateAdminLink($data['admin_id']),
'login' => $data['login'],
'id' => $data['id'],
'sw' => $SW,
@@ -346,9 +342,9 @@ ORDER BY
switch ($data['is_active']) {
case 'Y':
// Rallye is active so do not edit it!
- $row['select'] = "