Fix for user list in 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 0ebeb5e4a4d0ff7566374e2432b2322938b89a78..b6fdb930c6d3f44067df2d92d2d9d603fa0f0221 100644 (file)
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -48,44 +48,53 @@ if (!isGetRequestElementSet('sub')) setRequestGetElement('sub', '');
 $message = '';
 
 // Quick actions on a rallye
 $message = '';
 
 // Quick actions on a rallye

-if (isGetRequestElementSet(('rallye'))) {
+if (isGetRequestElementSet('rallye')) {

        // Init SQL queries
        initSqls();
 
        // Init SQL queries
        initSqls();
 

-       if (isGetRequestElementSet(('activate'))) {
+       if (isGetRequestElementSet('activate')) {

                // Activate / deactivate
                // Activate / deactivate

-               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");
+               switch (getRequestElement('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;
 
                                break;
 

-                       case 0: // Deactivate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET is_active='N' WHERE `id`=%s AND is_active='Y' LIMIT 1");
+                       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)
+                               );

                                break;
                }
        } elseif (isGetRequestElementSet('notify')) {
                // Automatic notification
                                break;
                }
        } elseif (isGetRequestElementSet('notify')) {
                // Automatic notification

-               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");
+               switch (getRequestElement('notify')) {
+                       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;
 
                                break;
 

-                       case 0: // Deactivate
-                               addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET send_notify='N' WHERE `id`=%s AND send_notify='Y' LIMIT 1");
+                       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)
+                               );

                                break;
                }
                                break;
                }

-       } elseif (isGetRequestElementSet(('auto'))) {
+       } elseif (isGetRequestElementSet('auto')) {

                // Automatic adding of new members
                // Automatic adding of new members

-               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");
+               switch (getRequestElement('auto')) {
+                       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;
 
                                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");
+                       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)
+                               );

                                break;
                }
        }
                                break;
                }
        }


@@ -103,11 +112,11 @@ if (isGetRequestElementSet(('rallye'))) {
                foreach (postRequestElement('sel') as $id => $selected) {
                        // Remove selected rallye entirely...
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
                foreach (postRequestElement('sel') as $id => $selected) {
                        // Remove selected rallye entirely...
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",

-                       array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, false));

                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s",
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s",

-                       array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, false));

                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s",
                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s",

-                       array(bigintval($id)), __FILE__, __LINE__, false));
+                               array(bigintval($id)), __FILE__, __LINE__, false));

                } // END - foreach
 
                // Run SQLS
                } // END - foreach
 
                // Run SQLS


@@ -136,24 +145,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
                        $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(
                        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));
                }
 
                        ), __FILE__, __LINE__, false));
                }
 


@@ -173,11 +186,14 @@ if (isPostRequestElementSet('edit')) {
                $OUT = ''; $SW = 2;
                foreach (postRequestElement('sel') as $id => $selected) {
                        // Load rallye basic data
                $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",
 LIMIT 1",

-                       array(bigintval($id)), __FILE__, __LINE__);
+                               array(bigintval($id)), __FILE__, __LINE__);

                        // Fetch an array
                        $content = SQL_FETCHARRAY($result);
 
                        // Fetch an array
                        $content = SQL_FETCHARRAY($result);
 


@@ -220,8 +236,8 @@ LIMIT 1",
        }
 } elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye') > 0)) {
        // List users and their refs before start and current
        }
 } 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');
        if (SQL_NUMROWS($result) > 0) {
                $OUT = ''; $SW = 2;
                $content['rallye'] = getRequestElement('rallye');


@@ -234,23 +250,17 @@ LIMIT 1",
                        $br = '';
 
                        // Output row
                        $br = '';
 
                        // Output row

-                       if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = "<strong>"; $br = "</strong>"; }
-                       if (($row['refs'] > 0) || ($cnt > 0)) {
-                               // Insert link to referal list
-                               //* DEBUG: */ outputHtml('-'.$row['userid'].'/'.$cnt.'/'.$row['refs']."-<br />");
-                               $cnt = generateUserProfileLink($row['userid'], $cnt, 'list_refs');
-                               $row['refs'] = generateUserProfileLink($row['userid'], $row['refs'], 'list_refs');
-                       } // END - if
+                       if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = '<strong>'; $br = '</strong>'; }

 
                        // Get user points
                        $points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
                        //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$row['userid']},points={$points},opoints={$row['curr_points']}<br />");
 
                        // Prepare content
 
                        // Get user points
                        $points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
                        //* DEBUG: */ outputHtml(basename(__FILE__).":userid={$row['userid']},points={$points},opoints={$row['curr_points']}<br />");
 
                        // Prepare content

-                       // @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
+                       // @TODO Rewritings: opoints->curr_points,old->refs in template

                        $row = array(
                                'sw'      => $SW ,
                        $row = array(
                                'sw'      => $SW ,

-                               'userid'     => $row['userid'],
+                               'userid'  => $row['userid'],

                                'bold_l'  => $bl ,
                                'bold_r'  => $br ,
                                'old'     => $row['refs'],
                                'bold_l'  => $bl ,
                                'bold_r'  => $br ,
                                'old'     => $row['refs'],


@@ -263,11 +273,15 @@ LIMIT 1",
                        $SW = 3 - $SW;
                } // END - while
 
                        $SW = 3 - $SW;
                } // END - while
 

+               // Remember rows
+               $content['rows']   = $OUT;
+               $content['rallye'] = getRequestElement('rallye');
+

                // Free memory
                SQL_FREERESULT($result);
 
                // Load template
                // 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'));
        } else {
                // No entries found?
                loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));


@@ -275,7 +289,7 @@ LIMIT 1",
 } else {
        // Start listing rallyes
        $result = SQL_QUERY("SELECT
 } else {
        // Start listing rallyes
        $result = SQL_QUERY("SELECT

-       `id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices
+       `id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`

 FROM
        `{?_MYSQL_PREFIX?}_rallye_data`
 ORDER BY
 FROM
        `{?_MYSQL_PREFIX?}_rallye_data`
 ORDER BY


@@ -307,7 +321,7 @@ ORDER BY
                        $row = array(
                                'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
                                'admin_id'   => $data['admin_id'],
                        $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,
                                'login'      => $data['login'],
                                'id'         => $data['id'],
                                'sw'         => $SW,


@@ -332,7 +346,7 @@ ORDER BY
                                        // Rallye is active so do not edit it!
                                        $row['select'] = "<div class=\"big\">".$row['id']."</div>";
                                        $row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
                                        // 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'] = 0;
+                                       $row['active'] = '0';

                                        break;
 
                                case 'N':
                                        break;
 
                                case 'N':


@@ -345,7 +359,7 @@ ORDER BY
                        switch ($data['send_notify']) {
                                case 'Y':
                                        $row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
                        switch ($data['send_notify']) {
                                case 'Y':
                                        $row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');

-                                       $row['notify'] = 0;
+                                       $row['notify'] = '0';

                                        break;
 
                                case 'N':
                                        break;
 
                                case 'N':


@@ -358,7 +372,7 @@ ORDER BY
                        switch ($data['auto_add_new_user']) {
                                case 'Y':
                                        $row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
                        switch ($data['auto_add_new_user']) {
                                case 'Y':
                                        $row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');

-                                       $row['auto'] = 0;
+                                       $row['auto'] = '0';

                                        break;
 
                                case 'N':
                                        break;
 
                                case 'N':