Even more fixes/improvements for rallye

[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 1ff14c15331517eb20b2b43accc8d115ea090990..8c46526b68a11e427e5761a2568366779245ae30 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -48,44 +48,41 @@ if (!isGetRequestElementSet('sub')) setRequestGetElement('sub', '');
 $message = '';
 
 // Quick actions on a rallye
-if (isGetRequestElementSet(('rallye'))) {
+if (isGetRequestElementSet('rallye')) {
        // Init SQL queries
        initSqls();
 
-       if (isGetRequestElementSet(('activate'))) {
+       if (isGetRequestElementSet('activate')) {
                // Activate / deactivate
-               switch (getRequestElement('activate'))
-               {
+               switch (getRequestElement('activate')) {
                        case 1: // Activate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET is_active='Y' WHERE `id`=%s AND is_active='N' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1");
                                break;
 
                        case 0: // Deactivate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET is_active='N' WHERE `id`=%s AND is_active='Y' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1");
                                break;
                }
        } elseif (isGetRequestElementSet('notify')) {
                // Automatic notification
-               switch (getRequestElement('notify'))
-               {
+               switch (getRequestElement('notify')) {
                        case 1: // Activate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET send_notify='Y' WHERE `id`=%s AND send_notify='N' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1");
                                break;
 
                        case 0: // Deactivate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET send_notify='N' WHERE `id`=%s AND send_notify='Y' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1");
                                break;
                }
-       } elseif (isGetRequestElementSet(('auto'))) {
+       } elseif (isGetRequestElementSet('auto')) {
                // Automatic adding of new members
-               switch (getRequestElement('auto'))
-               {
+               switch (getRequestElement('auto')) {
                        case 1: // Activate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET auto_add_new_user='Y' WHERE `id`=%s AND auto_add_new_user='N' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1");
                                break;
 
                        case 0: // Deactivate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET auto_add_new_user='N' WHERE `id`=%s AND auto_add_new_user='Y' LIMIT 1");
+                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1");
                                break;
                }
        }
@@ -136,24 +133,28 @@ if (isGetRequestElementSet(('rallye'))) {
                        $END   = mktime(postRequestElement('end_hour', $id)  , postRequestElement('end_min', $id)  , postRequestElement('end_sec', $id)  , postRequestElement('end_month', $id)  , postRequestElement('end_day', $id)  , postRequestElement('end_year', $id)  );
 
                        // Update entry
-                       addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET
-title='%s',
-descr='%s',
-template='%s',
-start_time='%s',
-end_time='%s',
-min_users='%s',
-min_prices='%s'
-WHERE `id`='".$id."' LIMIT 1",
+                       addSql(SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_rallye_data`
+SET
+       `title`='%s',
+       `descr`='%s',
+       `template`='%s',
+       `start_time`='%s',
+       `end_time`='%s',
+       `min_users`='%s',
+       `min_prices`='%s'
+WHERE
+       `id`='%s'
+LIMIT 1",
                        array(
-                       $title,
-                       postRequestElement('descr', $id),
-                       postRequestElement('templ', $id),
-                       bigintval($START),
-                       bigintval($END),
-                       bigintval(postRequestElement('min_users', $id)),
-                       bigintval(postRequestElement('min_prices', $id)),
-                       $id
+                               $title,
+                               postRequestElement('descr', $id),
+                               postRequestElement('templ', $id),
+                               bigintval($START),
+                               bigintval($END),
+                               bigintval(postRequestElement('min_users', $id)),
+                               bigintval(postRequestElement('min_prices', $id)),
+                               $id
                        ), __FILE__, __LINE__, false));
                }
 
@@ -173,11 +174,14 @@ if (isPostRequestElementSet('edit')) {
                $OUT = ''; $SW = 2;
                foreach (postRequestElement('sel') as $id => $selected) {
                        // Load rallye basic data
-                       $result = SQL_QUERY_ESC("SELECT title, descr, template, start_time, end_time, min_users, min_prices
-FROM `{?_MYSQL_PREFIX?}_rallye_data`
-WHERE `id`=%s
+                       $result = SQL_QUERY_ESC("SELECT
+       `title`, `descr`, `template`, `start_time`, `end_time`, `min_users`, `min_prices`
+FROM
+       `{?_MYSQL_PREFIX?}_rallye_data`
+WHERE
+       `id`=%s
 LIMIT 1",
-                       array(bigintval($id)), __FILE__, __LINE__);
+                               array(bigintval($id)), __FILE__, __LINE__);
                        // Fetch an array
                        $content = SQL_FETCHARRAY($result);
 
@@ -220,8 +224,8 @@ LIMIT 1",
        }
 } elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye') > 0)) {
        // List users and their refs before start and current
-       $result = SQL_QUERY_ESC("SELECT userid, refs, curr_points FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s ORDER BY `userid` ASC",
-       array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
+               array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                $OUT = ''; $SW = 2;
                $content['rallye'] = getRequestElement('rallye');