Heavy rewrite:

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

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index a3d8edee32aabdb6db5a50bb261d5a57671162a2..90494cce85f2cdd775af892783515811cd908027 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -210,7 +210,7 @@ VALUES ('%s','%s','%s','%s')",
                                );
 
                                // Load row template and switch color
-                               $OUT .= LOAD_TEMPLATE("admin_config_rallye_prices_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_config_rallye_prices_row', true, $content);
                                $SW = 3 - $SW;
                        } // END - while
 
@@ -224,19 +224,26 @@ VALUES ('%s','%s','%s','%s')",
                        define('__RALLYE_ID', REQUEST_GET('rallye'));
 
                        // Load main template
-                       LOAD_TEMPLATE("admin_config_rallye_prices");
+                       LOAD_TEMPLATE('admin_config_rallye_prices');
                }
        }
 
        // Add form for adding new price level
        if (!REQUEST_ISSET_POST('edit')) {
-               LOAD_TEMPLATE("admin_add_rallye_prices", false, REQUEST_GET('rallye'));
+               LOAD_TEMPLATE('admin_add_rallye_prices', false, REQUEST_GET('rallye'));
        }
 } else {
        // No rallye selected so display all available without prices
-       $result = SQL_QUERY("SELECT d.id, d.admin_id, d.start_time, d.end_time, d.title, a.login, d.is_active
-FROM `{!_MYSQL_PREFIX!}_rallye_data` AS d, `{!_MYSQL_PREFIX!}_admins` AS a
-WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT
+       d.id, d.admin_id, d.start_time, d.end_time, d.title, a.login, d.is_active
+FROM
+       `{!_MYSQL_PREFIX!}_rallye_data` AS d,
+LEFT JOIN
+       `{!_MYSQL_PREFIX!}_admins` AS a
+ON
+       d.admin_id=a.id
+ORDER BY
+       `d.start_time` DESC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List found rallyes
                $OUT = ''; $SW = 2;
@@ -252,14 +259,14 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
                                'select'     => $select,
                                'title'      => $content['title'],
                                'aid'        => $content['admin_id'],
-                               'email_link' => generateMemberEmailLink($content['admin_id']),
+                               'email_link' => generateEmailLink($content['admin_id']),
                                'alogin'     => $content['login'],
                                'start'      => generateDateTime($content['start_time'], '3'),
                                'end'        => generateDateTime($content['end_time'], '3'),
                        );
 
                        // Load row template and switch color
-                       $OUT .= LOAD_TEMPLATE("admin_list_rallye_prices_row", true, $content);
+                       $OUT .= LOAD_TEMPLATE('admin_list_rallye_prices_row', true, $content);
                        $SW = 3 - $SW;
                }
 
@@ -268,7 +275,7 @@ WHERE d.admin_id=a.id ORDER BY start_time DESC", __FILE__, __LINE__);
                define('__RALLYE_ROWS', $OUT);
 
                // Load main template
-               LOAD_TEMPLATE("admin_list_rallye_prices");
+               LOAD_TEMPLATE('admin_list_rallye_prices');
        } else {
                // No rallyes setup so far
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));