X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=f3ea8c077fada103574ada22e488637135257e17;hb=ad16f516e254e67b221dd72d518821e9a0853610;hp=d6bb58f5f338f1f5c1801f1ed01ebdfc63a25ba6;hpb=1cbf289d059637cb2707b0f5384637f081ad6402;p=mailer.git
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index d6bb58f5f3..f3ea8c077f 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.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,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
// Init message
$message = '';
@@ -102,9 +100,9 @@ if (isGetRequestParameterSet('rallye')) {
// Run SQL command
runFilterChain('run_sqls');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
// Delete rallyes
- if (countPostSelection() > 0) {
+ if (ifPostContainsSelections()) {
// Init SQLs
initSqls();
@@ -123,14 +121,14 @@ if (isGetRequestParameterSet('rallye')) {
runFilterChain('run_sqls');
// Output message
- $message = getMessage('RALLYE_DELETED');
+ $message = '{--RALLYE_DELETED--}';
} else {
// No rallye selected to delete!
- $message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
+ $message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
}
-} elseif (isFormSent('change')) {
+} elseif (isFormSent('do_edit')) {
// Change rallye
- if (countSelection(postRequestParameter('title')) > 0) {
+ if (ifPostContainsSelections('title')) {
// Init SQLs
initSqls();
@@ -150,12 +148,12 @@ SET
`title`='%s',
`descr`='%s',
`template`='%s',
- `start_time`='%s',
- `end_time`='%s',
- `min_users`='%s',
- `min_prices`='%s'
+ `start_time`=%s,
+ `end_time`=%s,
+ `min_users`=%s,
+ `min_prices`=%s
WHERE
- `id`='%s'
+ `id`=%s
LIMIT 1",
array(
$title,
@@ -173,19 +171,19 @@ LIMIT 1",
runFilterChain('run_sqls');
// Output message
- $message = getMessage('RALLYE_CHANGED');
+ $message = '{--RALLYE_CHANGED--}';
}
}
if (isFormSent('edit')) {
// Check for selections
- if (countPostSelection() > 0) {
+ if (ifPostContainsSelections()) {
// Make all selected and deactivated rallyes editable
- $OUT = ''; $SW = 2;
+ $OUT = '';
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`
+ `title`,`descr`,`template`,`start_time`,`end_time`,`min_users`,`min_prices`
FROM
`{?_MYSQL_PREFIX?}_rallye_data`
WHERE
@@ -199,76 +197,79 @@ LIMIT 1",
SQL_FREERESULT($result);
// Starting day
- $content['s_sec'] = addSelectionBox('sec' , date('s', $content['start_time']), 'start', $id);
- $content['s_min'] = addSelectionBox('min' , date('i', $content['start_time']), 'start', $id);
- $content['s_hour'] = addSelectionBox('hour' , date('G', $content['start_time']), 'start', $id);
- $content['s_day'] = addSelectionBox('day' , date('d', $content['start_time']), 'start', $id);
- $content['s_month'] = addSelectionBox('month', date('m', $content['start_time']), 'start', $id);
- $content['s_year'] = addSelectionBox('year' , date('Y', $content['start_time']), 'start', $id);
+ $content['s_sec'] = addSelectionBox('sec' , getSecond($content['start_time']) , 'start', $id);
+ $content['s_min'] = addSelectionBox('min' , getMinute($content['start_time']) , 'start', $id);
+ $content['s_hour'] = addSelectionBox('hour' , getShortHour($content['start_time']), 'start', $id);
+ $content['s_day'] = addSelectionBox('day' , getDay($content['start_time']) , 'start', $id);
+ $content['s_month'] = addSelectionBox('month', getMonth($content['start_time']) , 'start', $id);
+ $content['s_year'] = addSelectionBox('year' , getYear($content['start_time']) , 'start', $id);
// Ending day
- $content['e_sec'] = addSelectionBox('sec' , date('s', $content['end_time']) , 'end' , $id);
- $content['e_min'] = addSelectionBox('min' , date('i', $content['end_time']) , 'end' , $id);
- $content['e_hour'] = addSelectionBox('hour' , date('G', $content['end_time']) , 'end' , $id);
- $content['e_day'] = addSelectionBox('day' , date('d', $content['end_time']) , 'end' , $id);
- $content['e_month'] = addSelectionBox('month', date('m', $content['end_time']) , 'end' , $id);
- $content['e_year'] = addSelectionBox('year' , date('Y', $content['end_time']) , 'end' , $id);
+ $content['e_sec'] = addSelectionBox('sec' , getSecond($content['end_time']) , 'end' , $id);
+ $content['e_min'] = addSelectionBox('min' , getMinute($content['end_time']) , 'end' , $id);
+ $content['e_hour'] = addSelectionBox('hour' , getShortHour($content['end_time']) , 'end' , $id);
+ $content['e_day'] = addSelectionBox('day' , getDay($content['end_time']) , 'end' , $id);
+ $content['e_month'] = addSelectionBox('month', getMonth($content['end_time']) , 'end' , $id);
+ $content['e_year'] = addSelectionBox('year' , getYear($content['end_time']) , 'end' , $id);
// Remember other values
$content['templ'] = addReferalRallyeTemplateSelection('templ['.$id.']', $content['template']);
- $content['sw'] = $SW;
$content['id'] = $id;
// Output row
$OUT .= loadTemplate('admin_edit_rallyes_row', true, $content);
-
- // Color switching
- $SW = 3 - $SW;
- }
+ } // END - foreach
// Load final template
loadTemplate('admin_edit_rallyes', false, $OUT);
} else {
// Nothing selected to edit
- loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED'));
+ displayMessage('{--RALLYE_NO_RALLYES_SELECTED--}');
}
} 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",
+ $result = SQL_QUERY_ESC("SELECT
+ `userid`,`refs`,`curr_points`
+FROM
+ `{?_MYSQL_PREFIX?}_rallye_users`
+WHERE
+ `rallye_id`=%s
+ORDER BY
+ `userid` ASC",
array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) > 0) {
- $OUT = ''; $SW = 2;
+ if (!SQL_HASZERONUMS($result)) {
+ $OUT = '';
$content['rallye'] = getRequestParameter('rallye');
while ($row = SQL_FETCHARRAY($result)) {
// Check for referal count
- $cnt = getReferalRallyeRefsCount($row['userid'], $row['refs']);
+ $count = getReferalRallyeRefsCount($row['userid'], $row['refs']);
// Init variables
$bl = '';
$br = '';
// Output row
- if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = ''; $br = ''; }
+ if (($row['curr_points'] > 0) && ($count > 0)) {
+ $bl = '';
+ $br = '';
+ } // END - if
// 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']}
");
+ //* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
// Prepare content
- // @TODO Rewritings: opoints->curr_points,old->refs in template
$row = array(
- 'sw' => $SW ,
'userid' => $row['userid'],
'bold_l' => $bl ,
'bold_r' => $br ,
- 'old' => $row['refs'],
- 'cnt' => $cnt,
- 'opoints' => translateComma($points - $row['curr_points']),
+ 'refs' => $row['refs'],
+ 'count' => $count,
+ 'opoints' => ($points - $row['curr_points']),
);
// Load row template and switch color
$OUT .= loadTemplate('admin_list_rallye_usr_row', true, $row);
- $SW = 3 - $SW;
} // END - while
// Remember rows
@@ -282,106 +283,95 @@ LIMIT 1",
loadTemplate('admin_list_rallye_usr', false, $content);
} else {
// No entries found?
- loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
+ displayMessage('{--RALLYE_ADMIN_USERS_404--}');
}
} else {
// Start listing rallyes
$result = SQL_QUERY("SELECT
- `id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`
+ `id`,`admin_id`,`title`,`descr`,`template`,`start_time`,`end_time`,
+ `auto_add_new_user`,`is_active`,`send_notify`,`notified`,`min_users`,`min_prices`
FROM
`{?_MYSQL_PREFIX?}_rallye_data`
ORDER BY
`start_time` DESC", __FILE__, __LINE__);
// Records found?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// List found rallyes
- $OUT = ''; $SW = 2;
+ $OUT = '';
while ($data = SQL_FETCHARRAY($result)) {
- // Load admin login
- $data['login'] = getAdminLogin($data['admin_id']);
-
// Count joined userids
- $joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
+ $users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
// Did some users joined this rallye?
- if ($joined > 0) {
+ if ($users > 0) {
// List joined users
- $joined = '' . $joined . '';
+ $users = '' . $users . '';
} // END - if
- // Alter some variables
- if (empty($data['login'])) $data['login'] = '???';
- if (empty($data['template'])) $data['template'] = '---';
- if (empty($data['descr'])) $data['descr'] = '---';
-
// Transfer data into array for the template
$row = array(
- 'select' => '',
- 'admin_id' => $data['admin_id'],
- 'admin_link' => generateAdminLink($data['admin_id']),
- 'login' => $data['login'],
- 'id' => $data['id'],
- 'sw' => $SW,
- 'title' => $data['title'],
- 'template' => $data['template'],
- 'joined' => $joined,
- 'start_date' => generateDateTime($data['start_time'], 2),
- 'end_date' => generateDateTime($data['end_time'] , 2),
- 'active_lnk' => translateYesNo($data['is_active']),
- 'notify_lnk' => translateYesNo($data['send_notify']),
- 'auto_lnk' => translateYesNo($data['auto_add_new_user']),
- 'notified' => translateYesNo($data['notified']),
- 'prices_cnt' => translateComma(countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true)),
- 'descr' => $data['descr'],
- 'min_users' => $data['min_users'],
- 'min_prices' => $data['min_prices'],
+ 'select' => '',
+ 'admin_id' => $data['admin_id'],
+ 'id' => $data['id'],
+ 'title' => $data['title'],
+ 'template' => $data['template'],
+ 'users_content' => $users,
+ 'start_date' => generateDateTime($data['start_time'], 2),
+ 'end_date' => generateDateTime($data['end_time'] , 2),
+ 'is_active' => $data['is_active'],
+ 'send_notify' => $data['send_notify'],
+ 'auto_add_new_user' => $data['auto_add_new_user'],
+ 'notified' => $data['notified'],
+ 'prices_cnt' => countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true),
+ 'descr' => $data['descr'],
+ 'min_users' => $data['min_users'],
+ 'min_prices' => $data['min_prices'],
);
// Is the rallye active or not?
switch ($data['is_active']) {
case 'Y':
// Rallye is active so do not edit it!
- $row['select'] = '