X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=fda9a05b29ebd83329b0e48ffc1903e3e15dfa22;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=65cf9f270d6ecba6aacfa69343325ad6289ebf25;hpb=acfb401fcf545c211ed51b8644d0965e35fdad07;p=mailer.git diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php index 65cf9f270d..fda9a05b29 100644 --- a/inc/modules/admin/what-list_rallyes.php +++ b/inc/modules/admin/what-list_rallyes.php @@ -14,8 +14,6 @@ * $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 * @@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); // Init message $message = ''; @@ -104,7 +102,7 @@ if (isGetRequestParameterSet('rallye')) { runFilterChain('run_sqls'); } elseif (isFormSent('remove')) { // Delete rallyes - if (countPostSelection() > 0) { + if (ifPostContainsSelections()) { // Init SQLs initSqls(); @@ -130,7 +128,7 @@ if (isGetRequestParameterSet('rallye')) { } } elseif (isFormSent('change')) { // 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) { @@ -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']), ); @@ -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'],