New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / modules / admin / what-list_bank_package.php

diff --git a/inc/modules/admin/what-list_bank_package.php b/inc/modules/admin/what-list_bank_package.php
index 595409c3b4d0abe3b8100d48828e322dadf41e4f..ebfaa3dab7a3b93fc27d51f0760862a24dd07d26 100644 (file)
--- a/inc/modules/admin/what-list_bank_package.php
+++ b/inc/modules/admin/what-list_bank_package.php
@@ -47,31 +47,31 @@ ADD_DESCR('admin', __FILE__);
 
 // Check if there is enougth selected
 $show = true;
-if ((REQUEST_ISSET_POST(('id'))) && (is_array(REQUEST_POST('id'))) && (count(REQUEST_POST('id')) > 0)) {
+if ((REQUEST_ISSET_POST('id')) && (is_array(REQUEST_POST('id'))) && (count(REQUEST_POST('id')) > 0)) {
        // Okay, which button was pressed?
        if (REQUEST_ISSET_POST('change')) {
                // Change permissions
-               ADMIN_CHANGE_ACTIVATION_STATUS(REQUEST_POST('id'), "bank_packages", "package_active");
+               ADMIN_CHANGE_ACTIVATION_STATUS(REQUEST_POST('id'), 'bank_packages', 'package_active');
        } elseif (REQUEST_ISSET_POST('edit')) {
                // Delete entries (with confirmation)
                ADMIN_EDIT_ENTRIES_CONFIRM(
                        REQUEST_POST('id'),
-                       "bank_packages",
-                       array("id", "title", "description", "account_fee", "free_transfers", "transfer_fee", "output_system_mode", "package_active", "free_months_no_fee", "interest_plus", "interest_minus", "first_payment", "free_account_income", "free_account_stuff", "tan_lock"),
-                       array("bigintval", '', '', "TRANSLATE_COMMA", "bigintval", "TRANSLATE_COMMA", '', '', "bigintval", "TRANSLATE_COMMA", "TRANSLATE_COMMA", "TRANSLATE_COMMA", "TRANSLATE_COMMA", '', "bigintval"),
-                       array("", '', '', '', '', '', '', '', '', '', '', '', '', '', '')
+                       'bank_packages',
+                       array('id', 'title', 'description', 'account_fee', 'free_transfers', 'transfer_fee', 'output_system_mode', 'package_active', 'free_months_no_fee', 'interest_plus', 'interest_minus', 'first_payment', 'free_account_income', 'free_account_stuff', 'tan_lock'),
+                       array('bigintval', '', '', 'translateComma', 'bigintval', 'translateComma', '', '', 'bigintval', 'translateComma', 'translateComma', 'translateComma', 'translateComma', '', 'bigintval'),
+                       array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '')
                );
                $show = false;
        } elseif (REQUEST_ISSET_POST(('do_edit'))) {
                // Delete entries (with confirmation)
-               ADMIN_EDIT_ENTRIES_CONFIRM(REQUEST_POST('id'), "bank_packages", array(), array(), array(), true);
+               ADMIN_EDIT_ENTRIES_CONFIRM(REQUEST_POST('id'), 'bank_packages', array(), array(), array(), true);
        } elseif (REQUEST_ISSET_POST('delete')) {
                // Delete entries (with confirmation)
-               ADMIN_DELETE_ENTRIES_CONFIRM(REQUEST_POST('id'), "bank_packages", array("id", "title", "description", "account_fee"), array("bigintval", '', '', "TRANSLATE_COMMA"), array("", '', '', ''));
+               ADMIN_DELETE_ENTRIES_CONFIRM(REQUEST_POST('id'), 'bank_packages', array('id', 'title', 'description', 'account_fee'), array('bigintval', '', '', 'translateComma'), array('', '', '', ''));
                $show = false;
        } elseif (REQUEST_ISSET_POST('remove')) {
                // Delete entries (with confirmation)
-               ADMIN_DELETE_ENTRIES_CONFIRM(REQUEST_POST('id'), "bank_packages", array(), array(), array(), true);
+               ADMIN_DELETE_ENTRIES_CONFIRM(REQUEST_POST('id'), 'bank_packages', array(), array(), array(), true);
        }
 } // END - if
 
@@ -89,14 +89,14 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate" some data
-               $content['active'] = TRANSLATE_YESNO($content['active']);
-               $content['fee']    = TRANSLATE_COMMA($content['fee']);
-               $content['plus']   = TRANSLATE_COMMA($content['plus']);
-               $content['minus']  = TRANSLATE_COMMA($content['minus']);
+               $content['active'] = translateYesNo($content['active']);
+               $content['fee']    = translateComma($content['fee']);
+               $content['plus']   = translateComma($content['plus']);
+               $content['minus']  = translateComma($content['minus']);
                $content['sw']     = $SW;
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE("admin_list_bank_package_row", true, $content);
+               $OUT .= LOAD_TEMPLATE('admin_list_bank_package_row', true, $content);
                $SW = 3 - $SW;
        } // END - while
 
@@ -104,7 +104,7 @@ if (SQL_NUMROWS($result) > 0) {
        define('__BANK_PACKAGE_ROWS', $OUT);
 
        // Load main template
-       LOAD_TEMPLATE("admin_list_bank_package");
+       LOAD_TEMPLATE('admin_list_bank_package');
 } else {
        // No packages found!
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BANK_NO_PACKAGES_FOUND'));