Performance hacks, encapsulation and more EL code usage:

[mailer.git] / inc / modules / admin / what-list_rallyes.php

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index e55c5bbd3b1a44bd8b854ce07c97f3e69b828c7d..fda9a05b29ebd83329b0e48ffc1903e3e15dfa22 100644 (file)
--- 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 = '';
@@ -219,11 +217,11 @@ LIMIT 1",
                        $content['id']         = $id;
 
                        // Output row
-                       $OUT .= loadTemplate('form_submit_rallyes_row', true, $content);
+                       $OUT .= loadTemplate('admin_edit_rallyes_row', true, $content);
                } // END - foreach
 
                // Load final template
-               loadTemplate('form_submit_rallyes', false, $OUT);
+               loadTemplate('admin_edit_rallyes', false, $OUT);
        } else {
                // Nothing selected to edit
                loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
@@ -244,14 +242,14 @@ ORDER BY
                $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)) {
+                       if (($row['curr_points'] > 0) && ($count > 0)) {
                                $bl = '<strong>';
                                $br = '</strong>';
                        } // END - if
@@ -266,7 +264,7 @@ ORDER BY
                                'bold_l'  => $bl ,
                                'bold_r'  => $br ,
                                'refs'    => $row['refs'],
-                               'cnt'     => $cnt,
+                               'cnt'     => $count,
                                'opoints' => ($points - $row['curr_points']),
                        );
 
@@ -302,9 +300,6 @@ ORDER BY
                // 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);
 
@@ -314,14 +309,10 @@ ORDER BY
                                $users = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=' . $data['id'] . '%}" title="{--RALLYE_LIST_USERS_TITLE--}">' . $users . '</a>';
                        } // END - if
 
-                       // Alter some variables
-                       if (empty($data['login']))    $data['login']     = '???';
-
                        // Transfer data into array for the template
                        $row = array(
                                'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="form_field" value="1" />',
                                'admin_id'          => $data['admin_id'],
-                               'login'             => $data['login'],
                                'id'                => $data['id'],
                                'title'             => $data['title'],
                                'template'          => $data['template'],