]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/what-list_rallyes.php
Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.
[mailer.git] / inc / modules / admin / what-list_rallyes.php
index f6a25db6ecaaea37f2f175251d10767f0f66fd04..788c49723494a258a43cbe84f31dfc01b1621968 100644 (file)
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -47,52 +47,52 @@ addYouAreHereLink('admin', __FILE__);
 $message = '';
 
 // Quick actions on a rallye
-if (isGetRequestParameterSet('rallye')) {
+if (isGetRequestElementSet('rallye_id')) {
        // Init SQL queries
        initSqls();
 
-       if (isGetRequestParameterSet('activate')) {
+       if (isGetRequestElementSet('activate')) {
                // Activate / deactivate
-               switch (getRequestParameter('activate')) {
+               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(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+                               addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1",
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)
                                );
                                break;
 
                        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(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+                               addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1",
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)
                                );
                                break;
                } // END - switch
-       } elseif (isGetRequestParameterSet('notify')) {
+       } elseif (isGetRequestElementSet('notify')) {
                // Automatic notification
-               switch (getRequestParameter('notify')) {
+               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(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+                               addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1",
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)
                                );
                                break;
 
                        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(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+                               addSql(sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1",
+                                       array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__, FALSE)
                                );
                                break;
                } // END - switch
-       } elseif (isGetRequestParameterSet('auto')) {
+       } elseif (isGetRequestElementSet('auto')) {
                // Automatic adding of new members
-               switch (getRequestParameter('auto')) {
+               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(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+                               addSql(sqlQueryEscaped("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_id'))), __FILE__, __LINE__, FALSE)
                                );
                                break;
 
                        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(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+                               addSql(sqlQueryEscaped("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_id'))), __FILE__, __LINE__, FALSE)
                                );
                                break;
                } // END - switch
@@ -100,49 +100,49 @@ if (isGetRequestParameterSet('rallye')) {
 
        // Run SQL command
        runFilterChain('run_sqls');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
        // Delete rallyes
        if (ifPostContainsSelections()) {
                // Init SQLs
                initSqls();
 
                // Delete selected rallyes and all it's data
-               foreach (postRequestParameter('sel') as $id => $selected) {
+               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));
-                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",
-                               array(bigintval($id)), __FILE__, __LINE__, false));
-                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",
-                               array(bigintval($id)), __FILE__, __LINE__, false));
+                       addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));
+                       addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));
+                       addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",
+                               array(bigintval($id)), __FILE__, __LINE__, FALSE));
                } // END - foreach
 
                // Run SQLS
                runFilterChain('run_sqls');
 
                // Output message
-               $message = '{--RALLYE_DELETED--}';
+               $message = '{--ADMIN_RALLYE_DELETED--}';
        } else {
                // No rallye selected to delete!
-               $message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
+               $message = '{--ADMIN_RALLYE_DELETE_NOTHING_SELECTED--}';
        }
-} elseif (isFormSent('change')) {
+} elseif (isFormSent('do_edit')) {
        // Change rallye
        if (ifPostContainsSelections('title')) {
                // Init SQLs
                initSqls();
 
                // Change selected rallyes and all it's data
-               foreach (postRequestParameter('title') as $id => $title) {
+               foreach (postRequestElement('title') as $id => $title) {
                        // Secure id number
                        $id = bigintval($id);
 
                        // Generate timestamps
-                       $START = mktime(postRequestParameter('start_hour', $id), postRequestParameter('start_min', $id), postRequestParameter('start_sec', $id), postRequestParameter('start_month', $id), postRequestParameter('start_day', $id), postRequestParameter('start_year', $id));
-                       $END   = mktime(postRequestParameter('end_hour', $id)  , postRequestParameter('end_min', $id)  , postRequestParameter('end_sec', $id)  , postRequestParameter('end_month', $id)  , postRequestParameter('end_day', $id)  , postRequestParameter('end_year', $id)  );
+                       $START = mktime(postRequestElement('start_time_ho', $id), postRequestElement('start_time_mi', $id), 0, postRequestElement('start_time_mo', $id), postRequestElement('start_time_da', $id), postRequestElement('start_time_ye', $id));
+                       $END   = mktime(postRequestElement('end_time_ho', $id)  , postRequestElement('end_time_mi', $id)  , 0, postRequestElement('end_time_mo', $id)  , postRequestElement('end_time_da', $id)  , postRequestElement('end_time_ye', $id)  );
 
                        // Update entry
-                       addSql(SQL_QUERY_ESC("UPDATE
+                       addSql(sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_rallye_data`
 SET
        `title`='%s',
@@ -157,92 +157,118 @@ WHERE
 LIMIT 1",
                        array(
                                $title,
-                               postRequestParameter('descr', $id),
-                               postRequestParameter('templ', $id),
+                               postRequestElement('descr', $id),
+                               postRequestElement('templ', $id),
                                bigintval($START),
                                bigintval($END),
-                               bigintval(postRequestParameter('min_users', $id)),
-                               bigintval(postRequestParameter('min_prices', $id)),
+                               bigintval(postRequestElement('min_users', $id)),
+                               bigintval(postRequestElement('min_prices', $id)),
                                $id
-                       ), __FILE__, __LINE__, false));
+                       ), __FILE__, __LINE__, FALSE));
                }
 
                // Run SQLS
                runFilterChain('run_sqls');
 
                // Output message
-               $message = '{--RALLYE_CHANGED--}';
+               $message = '{--ADMIN_RALLYE_CHANGED--}';
        }
 }
 
-if (isFormSent('edit')) {
+// edit/delete are both handled the same way
+if ((isFormSent('edit')) || (isFormSent('delete'))) {
+       // Default is 'edit'
+       $mode = 'edit';
+
+       // Is delete button used?
+       if (isFormSent('delete')) {
+               // Then set it
+               $mode = 'delete';
+       } // END - if
+
        // Check for selections
        if (ifPostContainsSelections()) {
                // Make all selected and deactivated rallyes editable
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $selected) {
+               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`
+                       $result = sqlQueryEscaped("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__);
+
                        // Fetch an array
-                       $content = SQL_FETCHARRAY($result);
+                       $content = sqlFetchArray($result);
 
                        // Free result
-                       SQL_FREERESULT($result);
-
-                       // Starting day
-                       $content['s_sec']   = addSelectionBox('sec'  , getSecond($content['start_time'])   , 'start', $id);
-                       $content['s_min']   = addSelectionBox('min'  , getMinute($content['start_time'])   , 'start', $id);
-                       $content['s_hour']  = addSelectionBox('hour' , getShortHour($content['start_time']), 'start', $id);
-                       $content['s_day']   = addSelectionBox('day'  , getDay($content['start_time'])      , 'start', $id);
-                       $content['s_month'] = addSelectionBox('month', getMonth($content['start_time'])    , 'start', $id);
-                       $content['s_year']  = addSelectionBox('year' , getYear($content['start_time'])     , 'start', $id);
-
-                       // Ending day
-                       $content['e_sec']   = addSelectionBox('sec'  , getSecond($content['end_time'])     , 'end'  , $id);
-                       $content['e_min']   = addSelectionBox('min'  , getMinute($content['end_time'])     , 'end'  , $id);
-                       $content['e_hour']  = addSelectionBox('hour' , getShortHour($content['end_time'])  , 'end'  , $id);
-                       $content['e_day']   = addSelectionBox('day'  , getDay($content['end_time'])        , 'end'  , $id);
-                       $content['e_month'] = addSelectionBox('month', getMonth($content['end_time'])      , 'end'  , $id);
-                       $content['e_year']  = addSelectionBox('year' , getYear($content['end_time'])       , 'end'  , $id);
-
-                       // Remember other values
-                       $content['templ']      = addReferalRallyeTemplateSelection('templ['.$id.']', $content['template']);
-                       $content['id']         = $id;
+                       sqlFreeResult($result);
+
+                       // Only for editing ...
+                       if ($mode == 'edit') {
+                               // Starting day
+                               $content['s_min']   = addSelectionBox('mi', getMinute($content['start_time'])   , 'start_time', $id);
+                               $content['s_hour']  = addSelectionBox('ho', getShortHour($content['start_time']), 'start_time', $id);
+                               $content['s_day']   = addSelectionBox('da', getDay($content['start_time'])      , 'start_time', $id);
+                               $content['s_month'] = addSelectionBox('mo', getMonth($content['start_time'])    , 'start_time', $id);
+                               $content['s_year']  = addSelectionBox('ye', getYear($content['start_time'])     , 'start_time', $id);
+
+                               // Ending day
+                               $content['e_min']   = addSelectionBox('mi', getMinute($content['end_time'])     , 'end_time'  , $id);
+                               $content['e_hour']  = addSelectionBox('ho', getShortHour($content['end_time'])  , 'end_time'  , $id);
+                               $content['e_day']   = addSelectionBox('da', getDay($content['end_time'])        , 'end_time'  , $id);
+                               $content['e_month'] = addSelectionBox('mo', getMonth($content['end_time'])      , 'end_time'  , $id);
+                               $content['e_year']  = addSelectionBox('ye', getYear($content['end_time'])       , 'end_time'  , $id);
+
+                               // Remember other values
+                               $content['templ']      = addReferralRallyeTemplateSelection('templ[' . $id . ']', $content['template']);
+                       } else {
+                               // Convert timestamps into human-readable
+                               $content['start_time'] = generateDateTime($content['start_time'], '2');
+                               $content['end_time']   = generateDateTime($content['end_time']  , '2');
+                       }
+
+                       // Remember id number
+                       $content['rallye_id']         = bigintval($id);
 
                        // Output row
-                       $OUT .= loadTemplate('admin_edit_rallyes_row', true, $content);
+                       $OUT .= loadTemplate('admin_' . $mode . '_rallyes_row', TRUE, $content);
                } // END - foreach
 
                // Load final template
-               loadTemplate('admin_edit_rallyes', false, $OUT);
+               loadTemplate('admin_' . $mode . '_rallyes', FALSE, $OUT);
        } else {
                // Nothing selected to edit
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
+               displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SELECTED--}');
        }
-} elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
+} elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye_id') > 0)) {
        // List users and their refs before start and current
-       $result = SQL_QUERY_ESC("SELECT
-       `userid`, `refs`, `curr_points`
+       $result = sqlQueryEscaped("SELECT
+       `userid`,
+       `refs`,
+       `curr_points`
 FROM
        `{?_MYSQL_PREFIX?}_rallye_users`
 WHERE
        `rallye_id`=%s
 ORDER BY
        `userid` ASC",
-               array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
-       if (!SQL_HASZERONUMS($result)) {
+               array(bigintval(getRequestElement('rallye_id'))), __FILE__, __LINE__);
+       if (!ifSqlHasZeroNumRows($result)) {
                $OUT = '';
-               $content['rallye'] = getRequestParameter('rallye');
-               while ($row = SQL_FETCHARRAY($result)) {
-                       // Check for referal count
-                       $count = getReferalRallyeRefsCount($row['userid'], $row['refs']);
+               $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
+               while ($row = sqlFetchArray($result)) {
+                       // Check for referral count
+                       $count = getReferralRallyeRefsCount($row['userid'], $row['refs']);
 
                        // Init variables
                        $bl = '';
@@ -255,7 +281,7 @@ ORDER BY
                        } // END - if
 
                        // Get user points
-                       $points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
+                       $points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', FALSE, " AND `ref_depth`=1");
                        //* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
 
                        // Prepare content
@@ -264,56 +290,67 @@ ORDER BY
                                'bold_l'  => $bl ,
                                'bold_r'  => $br ,
                                'refs'    => $row['refs'],
-                               'cnt'     => $count,
+                               'count'   => $count,
                                'opoints' => ($points - $row['curr_points']),
                        );
 
                        // Load row template and switch color
-                       $OUT .= loadTemplate('admin_list_rallye_usr_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_rallye_usr_row', TRUE, $row);
                } // END - while
 
                // Remember rows
-               $content['rows']   = $OUT;
-               $content['rallye'] = getRequestParameter('rallye');
+               $content['rows']      = $OUT;
+               $content['rallye_id'] = bigintval(getRequestElement('rallye_id'));
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Load template
-               loadTemplate('admin_list_rallye_usr', false, $content);
+               loadTemplate('admin_list_rallye_usr', FALSE, $content);
        } else {
                // No entries found?
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}');
+               displayMessage('{--ADMIN_RALLYE_USERS_404--}');
        }
 } 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`
+       $result = sqlQuery("SELECT
+       `id` AS `rallye_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
        `start_time` DESC", __FILE__, __LINE__);
 
        // Records found?
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // List found rallyes
                $OUT = '';
-               while ($data = SQL_FETCHARRAY($result)) {
+               while ($data = sqlFetchArray($result)) {
                        // Count joined userids
-                       $users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
+                       $users = countSumTotalData($data['rallye_id'], 'rallye_users', 'rallye_id', 'rallye_id', TRUE);
 
                        // Did some users joined this rallye?
                        if ($users > 0) {
                                // List joined users
-                               $users = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=' . $data['id'] . '%}" title="{--RALLYE_LIST_USERS_TITLE--}">' . $users . '</a>';
+                               $users = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye_id=' . $data['rallye_id'] . '%}" title="{--ADMIN_LIST_RALLYE_USERS_TITLE--}">{%pipe,translateComma=' . $users . '%}</a>';
                        } // END - if
 
                        // Transfer data into array for the template
                        $row = array(
-                               'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="form_field" value="1" />',
+                               'select'            => '<input type="checkbox" name="sel[' . $data['rallye_id'] . ']" class="form_field" value="1" />',
                                'admin_id'          => $data['admin_id'],
-                               'id'                => $data['id'],
+                               'rallye_id'         => $data['rallye_id'],
                                'title'             => $data['title'],
                                'template'          => $data['template'],
                                'users_content'     => $users,
@@ -323,7 +360,7 @@ ORDER BY
                                'send_notify'       => $data['send_notify'],
                                'auto_add_new_user' => $data['auto_add_new_user'],
                                'notified'          => $data['notified'],
-                               'prices_cnt'        => countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true),
+                               'prices_cnt'        => countSumTotalData($data['rallye_id'], 'rallye_prices', 'rallye_id', 'rallye_id', TRUE),
                                'descr'             => $data['descr'],
                                'min_users'         => $data['min_users'],
                                'min_prices'        => $data['min_prices'],
@@ -333,13 +370,13 @@ ORDER BY
                        switch ($data['is_active']) {
                                case 'Y':
                                        // Rallye is active so do not edit it!
-                                       $row['select']       = '<div class="big">' . $row['id'] . '</div>';
-                                       $row['active_title'] = '{--RALLYE_DEACTIVATE_NOW--}';
+                                       $row['select']       = '<div class="big">' . $row['rallye_id'] . '</div>';
+                                       $row['active_title'] = '{--ADMIN_RALLYE_DEACTIVATE_NOW--}';
                                        $row['active']       = '0';
                                        break;
 
                                case 'N':
-                                       $row['active_title'] = '{--RALLYE_ACTIVATE_NOW--}';
+                                       $row['active_title'] = '{--ADMIN_RALLYE_ACTIVATE_NOW--}';
                                        $row['active']       = 1;
                                        break;
                        } // END - switch
@@ -347,12 +384,12 @@ ORDER BY
                        // Notification to members?
                        switch ($data['send_notify']) {
                                case 'Y':
-                                       $row['notify_title'] = '{--RALLYE_STOP_NOTIFY_NOW--}';
+                                       $row['notify_title'] = '{--ADMIN_RALLYE_STOP_NOTIFY_NOW--}';
                                        $row['notify']       = '0';
                                        break;
 
                                case 'N':
-                                       $row['notify_title'] = '{--RALLYE_START_NOTIFY_NOW--}';
+                                       $row['notify_title'] = '{--ADMIN_RALLYE_START_NOTIFY_NOW--}';
                                        $row['notify']       = 1;
                                        break;
                        } // END - switch
@@ -360,31 +397,31 @@ ORDER BY
                        // Auto-add of new joined members?
                        switch ($data['auto_add_new_user']) {
                                case 'Y':
-                                       $row['auto_title'] = '{--RALLYE_STOP_AUTO_ADD_NOW--}';
+                                       $row['auto_title'] = '{--ADMIN_RALLYE_STOP_AUTO_ADD_NOW--}';
                                        $row['auto']       = '0';
                                        break;
 
                                case 'N':
-                                       $row['auto_title'] = '{--RALLYE_START_AUTO_ADD_NOW--}';
+                                       $row['auto_title'] = '{--ADMIN_RALLYE_START_AUTO_ADD_NOW--}';
                                        $row['auto']       = 1;
                                        break;
                        } // END - switch
 
                        // Output row
-                       $OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_rallyes_row', TRUE, $row);
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
 
                // Remember rows in array
                $content['rows'] = $OUT;
 
                // Load template
-               loadTemplate('admin_list_rallyes', false, $content);
+               loadTemplate('admin_list_rallyes', FALSE, $content);
        } else {
                // No rallyes setup so far
-               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
+               displayMessage('{--ADMIN_RALLYE_NO_RALLYES_SETUP--}');
        }
 }