Huge HTML/CSS rewrite (see forum)

[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 ed36fbb8fd5c635b7947244c67daf0cd148a190b..56acd7ac78767b7ef79722713ae4aba770ca6a0b 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -39,12 +39,12 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (!isGetRequestElementSet('sub')) setRequestGetElement('sub', '');
+// Init message
 $message = '';
 
 // Quick actions on a rallye
@@ -66,7 +66,7 @@ if (isGetRequestElementSet('rallye')) {
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
                                break;
-               }
+               } // END - switch
        } elseif (isGetRequestElementSet('notify')) {
                // Automatic notification
                switch (getRequestElement('notify')) {
@@ -81,7 +81,7 @@ if (isGetRequestElementSet('rallye')) {
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
                                break;
-               }
+               } // END - switch
        } elseif (isGetRequestElementSet('auto')) {
                // Automatic adding of new members
                switch (getRequestElement('auto')) {
@@ -96,15 +96,14 @@ if (isGetRequestElementSet('rallye')) {
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
                                break;
-               }
+               } // END - switch
        }
 
        // Run SQL command
        runFilterChain('run_sqls');
 } elseif (isPostRequestElementSet('remove')) {
        // Delete rallyes
-       $SEL = countPostSelection();
-       if ($SEL > 0) {
+       if (countPostSelection() > 0) {
                // Init SQLs
                initSqls();
 
@@ -113,9 +112,9 @@ if (isGetRequestElementSet('rallye')) {
                        // 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
 
@@ -130,8 +129,7 @@ if (isGetRequestElementSet('rallye')) {
        }
 } elseif (isPostRequestElementSet('change')) {
        // Change rallye
-       $SEL = countSelection(postRequestElement('title'));
-       if ($SEL > 0) {
+       if (countSelection(postRequestElement('title')) > 0) {
                // Init SQLs
                initSqls();
 
@@ -180,8 +178,7 @@ LIMIT 1",
 
 if (isPostRequestElementSet('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) {
@@ -250,23 +247,17 @@ LIMIT 1",
                        $br = '';
 
                        // Output row
-                       if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = "<strong>"; $br = "</strong>"; }
-                       if (($row['refs'] > 0) || ($cnt > 0)) {
-                               // Insert link to referal list
-                               //* DEBUG: */ outputHtml('-'.$row['userid'].'/'.$cnt.'/'.$row['refs']."-<br />");
-                               $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 = '<strong>'; $br = '</strong>'; }
 
                        // 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']}<br />");
 
                        // 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 +270,15 @@ LIMIT 1",
                        $SW = 3 - $SW;
                } // END - while
 
+               // Remember rows
+               $content['rows']   = $OUT;
+               $content['rallye'] = getRequestElement('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'));
@@ -323,7 +318,7 @@ ORDER BY
                        $row = array(
                                'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
                                '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,