X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=ec3c17b554ff59b586c2c74cdcd2b17904577389;hb=dc25bd7a76750f02e2d617c9db9eb0aae53270f5;hp=76bdd3eb3342351ad24dc1b6f6c44eae181ce528;hpb=cf3765c38cf0a76f396aca291f71858936e92956;p=mailer.git
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 76bdd3eb33..ec3c17b554 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();
@@ -128,9 +126,9 @@ if (isGetRequestParameterSet('rallye')) {
// No rallye selected to delete!
$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();
@@ -179,7 +177,7 @@ LIMIT 1",
if (isFormSent('edit')) {
// Check for selections
- if (countPostSelection() > 0) {
+ if (ifPostContainsSelections()) {
// Make all selected and deactivated rallyes editable
$OUT = '';
foreach (postRequestParameter('sel') as $id => $selected) {
@@ -199,20 +197,20 @@ 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']);
@@ -226,7 +224,7 @@ LIMIT 1",
loadTemplate('admin_edit_rallyes', false, $OUT);
} else {
// Nothing selected to edit
- loadTemplate('admin_settings_saved', false, '{--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
@@ -239,19 +237,22 @@ WHERE
ORDER BY
`userid` ASC",
array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) > 0) {
+ 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");
@@ -262,8 +263,8 @@ ORDER BY
'userid' => $row['userid'],
'bold_l' => $bl ,
'bold_r' => $br ,
- 'rews' => $row['refs'],
- 'cnt' => $cnt,
+ 'refs' => $row['refs'],
+ 'cnt' => $count,
'opoints' => ($points - $row['curr_points']),
);
@@ -282,7 +283,7 @@ ORDER BY
loadTemplate('admin_list_rallye_usr', false, $content);
} else {
// No entries found?
- loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}');
+ displayMessage('{--RALLYE_ADMIN_USERS_404--}');
}
} else {
// Start listing rallyes
@@ -295,13 +296,10 @@ ORDER BY
`start_time` DESC", __FILE__, __LINE__);
// Records found?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// List found rallyes
$OUT = '';
while ($data = SQL_FETCHARRAY($result)) {
- // Load admin login
- $data['login'] = getAdminLogin($data['admin_id']);
-
// Count joined userids
$users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
@@ -311,14 +309,10 @@ ORDER BY
$users = '' . $users . '';
} // END - if
- // Alter some variables
- if (empty($data['login'])) $data['login'] = '???';
-
// Transfer data into array for the template
$row = array(
- 'select' => '',
+ 'select' => '',
'admin_id' => $data['admin_id'],
- 'login' => $data['login'],
'id' => $data['id'],
'title' => $data['title'],
'template' => $data['template'],
@@ -390,7 +384,7 @@ ORDER BY
loadTemplate('admin_list_rallyes', false, $content);
} else {
// No rallyes setup so far
- loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
+ displayMessage('{--RALLYE_NO_RALLYES_SETUP--}');
}
}