Changed all admin getter, closed internal TODOs:

[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 7f6f64a1475a3a4fb647946f1155b9f3f24bb486..509f6d23f62360976630a5bff4b1f128fbf8a3d3 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -123,10 +123,10 @@ if (isGetRequestParameterSet('rallye')) {
                runFilterChain('run_sqls');
 
                // Output message
-               $message = getMessage('RALLYE_DELETED');
+               $message = '{--RALLYE_DELETED--}';
        } else {
                // No rallye selected to delete!
-               $message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
+               $message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
        }
 } elseif (isFormSent('change')) {
        // Change rallye
@@ -173,7 +173,7 @@ LIMIT 1",
                runFilterChain('run_sqls');
 
                // Output message
-               $message = getMessage('RALLYE_CHANGED');
+               $message = '{--RALLYE_CHANGED--}';
        }
 }
 
@@ -230,7 +230,7 @@ LIMIT 1",
                loadTemplate('admin_edit_rallyes', false, $OUT);
        } else {
                // Nothing selected to edit
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
        }
 } elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
        // List users and their refs before start and current
@@ -288,7 +288,7 @@ ORDER BY
                loadTemplate('admin_list_rallye_usr', false, $content);
        } else {
                // No entries found?
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}');
        }
 } else {
        // Start listing rallyes
@@ -319,8 +319,6 @@ ORDER BY
 
                        // Alter some variables
                        if (empty($data['login']))    $data['login']     = '???';
-                       if (empty($data['template'])) $data['template']  = '---';
-                       if (empty($data['descr']))    $data['descr']     = '---';
 
                        // Transfer data into array for the template
                        $row = array(
@@ -349,12 +347,12 @@ ORDER BY
                                case 'Y':
                                        // Rallye is active so do not edit it!
                                        $row['select']       = '<div class="big">' . $row['id'] . '</div>';
-                                       $row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
+                                       $row['active_title'] = '{--RALLYE_DEACTIVATE_NOW--}';
                                        $row['active']       = '0';
                                        break;
 
                                case 'N':
-                                       $row['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
+                                       $row['active_title'] = '{--RALLYE_ACTIVATE_NOW--}';
                                        $row['active']       = 1;
                                        break;
                        } // END - switch
@@ -362,12 +360,12 @@ ORDER BY
                        // Notification to members?
                        switch ($data['send_notify']) {
                                case 'Y':
-                                       $row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
+                                       $row['notify_title'] = '{--RALLYE_STOP_NOTIFY_NOW--}';
                                        $row['notify']       = '0';
                                        break;
 
                                case 'N':
-                                       $row['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
+                                       $row['notify_title'] = '{--RALLYE_START_NOTIFY_NOW--}';
                                        $row['notify']       = 1;
                                        break;
                        } // END - switch
@@ -375,12 +373,12 @@ ORDER BY
                        // Auto-add of new joined members?
                        switch ($data['auto_add_new_user']) {
                                case 'Y':
-                                       $row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
+                                       $row['auto_title'] = '{--RALLYE_STOP_AUTO_ADD_NOW--}';
                                        $row['auto']       = '0';
                                        break;
 
                                case 'N':
-                                       $row['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
+                                       $row['auto_title'] = '{--RALLYE_START_AUTO_ADD_NOW--}';
                                        $row['auto']       = 1;
                                        break;
                        } // END - switch
@@ -400,7 +398,7 @@ ORDER BY
                loadTemplate('admin_list_rallyes', false, $content);
        } else {
                // No rallyes setup so far
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
        }
 }