Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:
[mailer.git] / inc / modules / admin / what-list_rallyes.php
index d6bb58f5f338f1f5c1801f1ed01ebdfc63a25ba6..205d3c2139a6aaad6a355e25f2d37723be094e78 100644 (file)
@@ -150,12 +150,12 @@ SET
        `title`='%s',
        `descr`='%s',
        `template`='%s',
-       `start_time`='%s',
-       `end_time`='%s',
-       `min_users`='%s',
-       `min_prices`='%s'
+       `start_time`=%s,
+       `end_time`=%s,
+       `min_users`=%s,
+       `min_prices`=%s
 WHERE
-       `id`='%s'
+       `id`=%s
 LIMIT 1",
                        array(
                                $title,
@@ -224,17 +224,24 @@ LIMIT 1",
 
                        // Color switching
                        $SW = 3 - $SW;
-               }
+               } // END - foreach
 
                // Load final template
                loadTemplate('admin_edit_rallyes', false, $OUT);
        } else {
                // Nothing selected to edit
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
        }
 } elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('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",
+       $result = SQL_QUERY_ESC("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_NUMROWS($result) > 0) {
                $OUT = ''; $SW = 2;
@@ -252,18 +259,17 @@ LIMIT 1",
 
                        // 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 />");
+                       //* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
 
                        // Prepare content
-                       // @TODO Rewritings: opoints->curr_points,old->refs in template
                        $row = array(
                                'sw'      => $SW ,
                                'userid'  => $row['userid'],
                                'bold_l'  => $bl ,
                                'bold_r'  => $br ,
-                               'old'     => $row['refs'],
+                               'rews'    => $row['refs'],
                                'cnt'     => $cnt,
-                               'opoints' => translateComma($points - $row['curr_points']),
+                               'opoints' => ($points - $row['curr_points']),
                        );
 
                        // Load row template and switch color
@@ -282,12 +288,13 @@ LIMIT 1",
                loadTemplate('admin_list_rallye_usr', false, $content);
        } else {
                // No entries found?
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_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`
+       `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
@@ -302,12 +309,12 @@ ORDER BY
                        $data['login'] = getAdminLogin($data['admin_id']);
 
                        // Count joined userids
-                       $joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
+                       $users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
                        // Did some users joined this rallye?
-                       if ($joined > 0) {
+                       if ($users > 0) {
                                // List joined users
-                               $joined = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=' . $data['id'] . '%}" title="{--RALLYE_LIST_USERS_TITLE--}">' . $joined . '</a>';
+                               $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>';
                        } // END - if
 
                        // Alter some variables
@@ -317,67 +324,66 @@ ORDER BY
 
                        // Transfer data into array for the template
                        $row = array(
-                               'select'     => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="admin_normal" value="1" />',
-                               'admin_id'   => $data['admin_id'],
-                               'admin_link' => generateAdminLink($data['admin_id']),
-                               'login'      => $data['login'],
-                               'id'         => $data['id'],
-                               'sw'         => $SW,
-                               'title'      => $data['title'],
-                               'template'   => $data['template'],
-                               'joined'     => $joined,
-                               'start_date' => generateDateTime($data['start_time'], 2),
-                               'end_date'   => generateDateTime($data['end_time']  , 2),
-                               'active_lnk' => translateYesNo($data['is_active']),
-                               'notify_lnk' => translateYesNo($data['send_notify']),
-                               'auto_lnk'   => translateYesNo($data['auto_add_new_user']),
-                               'notified'   => translateYesNo($data['notified']),
-                               'prices_cnt' => translateComma(countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true)),
-                               'descr'      => $data['descr'],
-                               'min_users'  => $data['min_users'],
-                               'min_prices' => $data['min_prices'],
+                               'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="admin_normal" value="1" />',
+                               'admin_id'          => $data['admin_id'],
+                               'login'             => $data['login'],
+                               'id'                => $data['id'],
+                               'sw'                => $SW,
+                               'title'             => $data['title'],
+                               'template'          => $data['template'],
+                               'users_content'     => $users,
+                               'start_date'        => generateDateTime($data['start_time'], 2),
+                               'end_date'          => generateDateTime($data['end_time']  , 2),
+                               'is_active'         => $data['is_active'],
+                               '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),
+                               'descr'             => $data['descr'],
+                               'min_users'         => $data['min_users'],
+                               'min_prices'        => $data['min_prices'],
                        );
 
                        // Is the rallye active or not?
                        switch ($data['is_active']) {
                                case 'Y':
                                        // Rallye is active so do not edit it!
-                                       $row['select'] = '<div class="big">' . $row['id'] . '</div>';
+                                       $row['select']       = '<div class="big">' . $row['id'] . '</div>';
                                        $row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
-                                       $row['active'] = '0';
+                                       $row['active']       = '0';
                                        break;
 
                                case 'N':
                                        $row['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
-                                       $row['active'] = 1;
+                                       $row['active']       = 1;
                                        break;
-                       }
+                       } // END - switch
 
                        // Notification to members?
                        switch ($data['send_notify']) {
                                case 'Y':
                                        $row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
-                                       $row['notify'] = '0';
+                                       $row['notify']       = '0';
                                        break;
 
                                case 'N':
                                        $row['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
-                                       $row['notify'] = 1;
+                                       $row['notify']       = 1;
                                        break;
-                       }
+                       } // END - switch
 
                        // Auto-add of new joined members?
                        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':
                                        $row['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
-                                       $row['auto'] = 1;
+                                       $row['auto']       = 1;
                                        break;
-                       }
+                       } // END - switch
 
                        // Output row
                        $OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
@@ -394,7 +400,7 @@ ORDER BY
                loadTemplate('admin_list_rallyes', false, $content);
        } else {
                // No rallyes setup so far
-               loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+               loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
        }
 }