Even more fixes/improvements for rallye

diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php
index 37cf5e47a2deda688cf3184bce464d265f108921..2702351aa49eecb5182d8fe00e62ff7b8964859b 100644 (file)
--- a/inc/language/rallye_de.php
+++ b/inc/language/rallye_de.php
@@ -63,7 +63,7 @@ addMessages(array(
        'RALLYE_CONFIG_PRICES_2' => "</u>",
        'RALLYE_PRICE_LEVEL' => "Platz eingeben (1, 2, 3, usw.)",
        'RALLYE_PRICE_POINTS' => "Preis in {?POINTS?}",
-       'RALLYE_PRICE_INFOS' => "Preisbeschreibung (<div class=\"tiny\">Sie k&ouml;nnen auch nur die Beschreibung eingeben!</div>)",
+       'RALLYE_PRICE_INFOS' => "Preisbeschreibung (<span class=\"tiny\">Sie k&ouml;nnen auch nur die Beschreibung eingeben!</span>)",
        'RALLYE_PRICE_ALREADY_FOUND' => "Sie haben bereits f&uuml;r diesen Platz einen Preis vergeben oder ist identisch mit anderen Preisen.",
        'RALLYE_PRICE_LEVEL_SAVED' => "Preis wurde hinzugef&uuml;gt.",
        'RALLYE_EDIT_DEL_PRICES' => "&Auml;ndern und L&ouml;schen von Rallye-Preisen",

diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php
index 7b606ece565a664b7d8dd8a4c4b27c9094833e32..5d7453ff5e25a0a570a8c4ecdad057a8ba5bc050 100644 (file)
--- a/inc/modules/admin/what-config_rallye_prices.php
+++ b/inc/modules/admin/what-config_rallye_prices.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isGetRequestElementSet(('rallye'))) {
+if (isGetRequestElementSet('rallye')) {
        // Price submitted?
        if (isPostRequestElementSet('add')) {
                if ((isPostRequestElementSet(('level'))) && ((isPostRequestElementSet(('points'))) || (isPostRequestElementSet(('info'))))) {
@@ -57,10 +57,10 @@ if (isGetRequestElementSet(('rallye'))) {
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_rallye_prices` (rallye_id, price_level, points, info)
 VALUES ('%s','%s','%s','%s')",
                                array(
-                               bigintval(getRequestElement('rallye')),
-                               bigintval(postRequestElement('level')),
-                               postRequestElement('points'),
-                               postRequestElement('info')
+                                       bigintval(getRequestElement('rallye')),
+                                       bigintval(postRequestElement('level')),
+                                       postRequestElement('points'),
+                                       postRequestElement('info')
                                ), __FILE__, __LINE__);
                                loadTemplate('admin_settings_saved', false, getMessage('RALLYE_PRICE_LEVEL_SAVED'));
                        } else {
@@ -95,11 +95,11 @@ VALUES ('%s','%s','%s','%s')",
                        // Update entry
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_prices` SET rallye_id=%s, price_`level`='%s', points='%s', info='%s' WHERE `id`=%s LIMIT 1",
                        array(
-                       postRequestElement('rallye_id', $id),
-                       bigintval($level),
-                       postRequestElement('points', $id),
-                       postRequestElement('infos', $id),
-                       $id
+                               postRequestElement('rallye_id', $id),
+                               bigintval($level),
+                               postRequestElement('points', $id),
+                               postRequestElement('infos', $id),
+                               $id
                        ), __FILE__, __LINE__);
                }
 
@@ -116,7 +116,7 @@ VALUES ('%s','%s','%s','%s')",
                        foreach (postRequestElement('sel') as $id => $sel) {
                                // Load data to selected rallye
                                $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
-                               array(bigintval($id)), __FILE__, __LINE__);
+                                       array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
@@ -155,7 +155,7 @@ VALUES ('%s','%s','%s','%s')",
                        foreach (postRequestElement('sel') as $id => $sel) {
                                // Load data to selected rallye
                                $result = SQL_QUERY_ESC("SELECT rallye_id, price_level, points, info FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `id`=%s LIMIT 1",
-                               array(bigintval($id)), __FILE__, __LINE__);
+                                       array(bigintval($id)), __FILE__, __LINE__);
                                list($rallye, $level, $points, $infos) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 

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');