Some rewrites

[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 52bdf868cf619aa80e4b5497424a1a1009a2d71e..9469dcc38fb5f8822ecdd6a43087e77930580dfa 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -55,13 +55,13 @@ if (isGetRequestElementSet('rallye')) {
        if (isGetRequestElementSet('activate')) {
                // Activate / deactivate
                switch (getRequestElement('activate')) {
-                       case 1: // Activate
+                       case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1",
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
                                break;
 
-                       case 0: // Deactivate
+                       case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1",
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
@@ -70,13 +70,13 @@ if (isGetRequestElementSet('rallye')) {
        } elseif (isGetRequestElementSet('notify')) {
                // Automatic notification
                switch (getRequestElement('notify')) {
-                       case 1: // Activate
+                       case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1",
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
                                break;
 
-                       case 0: // Deactivate
+                       case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1",
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
@@ -85,13 +85,13 @@ if (isGetRequestElementSet('rallye')) {
        } elseif (isGetRequestElementSet('auto')) {
                // Automatic adding of new members
                switch (getRequestElement('auto')) {
-                       case 1: // Activate
+                       case '1': // Activate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1",
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
                                break;
 
-                       case 0: // Deactivate
+                       case '0': // Deactivate
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1",
                                        array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
                                );
@@ -279,11 +279,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 +327,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,