More usage of wrapper functions

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

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 05fe8420bd702a38e0a3ed32414a3c96beafb6ee..e37051099dda1439d8ee50f5a8c5e87a98ebdea0 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -46,30 +46,30 @@ addYouAreHereLink('admin', __FILE__);
 // Add new code?
 if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequestParameterSet('descr'))) {
        // Check if country code does already exist
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` WHERE code='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `code`='%s' LIMIT 1",
        array(strtoupper(postRequestParameter('code'))), __FILE__, __LINE__);
        if (SQL_HASZERONUMS($result)) {
                // Save entry
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (code, descr, is_active) VALUES ('%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (`code`,`descr`,`is_active`) VALUES ('%s','%s','%s')",
                array(
-               strtoupper(substr(postRequestParameter('code'), 0, 2)),
-               postRequestParameter('descr'),
-               postRequestParameter('is_active')
+                       strtoupper(substr(postRequestParameter('code'), 0, 2)),
+                       postRequestParameter('descr'),
+                       postRequestParameter('is_active')
                ), __FILE__, __LINE__);
 
                // Country added
-               $message = getMaskedMessage('ADMIN_COUNTRY_ADDED', strtoupper(postRequestParameter('descr')));
+               $message = '{%message,ADMIN_COUNTRY_ADDED=' . strtoupper(postRequestParameter('descr')) . '%}';
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Does already exist
-               $message = getMaskedMessage('ADMIN_COUNTRY_ALREADY', strtoupper(postRequestParameter('code')));
+               $message = '{%message,ADMIN_COUNTRY_ALREADY=' . strtoupper(postRequestParameter('code')) . '%}';
        }
 
        // Display message
        displayMessage($message);
-} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
+} elseif ((isFormSent('do_edit')) && (isPostRequestParameterSet('id'))) {
        // Change all status
        adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
 
@@ -82,7 +82,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        if (count(postRequestParameter('id')) > 0) {
                if (isFormSent('edit')) {
                        // Edit template
-                       $row    = 'admin_list_country_edit_row';
+                       $row    = 'admin_edit_country_row';
                        $post   = 'modify';
                        $class  = 'form_submit';
                        $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
@@ -90,7 +90,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                        $reset  = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" /> ';
                } else {
                        // Delete template
-                       $row    = 'admin_list_country_del_row';
+                       $row    = 'admin_delete_country_row';
                        $post   = 'remove';
                        $class  = 'form_delete';
                        $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
@@ -102,19 +102,14 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                $OUT = '';
                foreach (postRequestParameter('id') as $id => $isActive) {
                        // Load data from DB
-                       $result = SQL_QUERY_ESC("SELECT `id`, `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `id`,`code`,`descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
                                $content = SQL_FETCHARRAY($result);
 
-                               if ($post == 'modify') {
-                                       // Generate default selection in edit-mode
-                                       $content['is_active'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $isActive);
-                               } else {
-                                       // Only display status when in delete-mode
-                                       $content['is_active'] = translateYesNo($isActive);
-                               }
+                               // Add $isActive
+                               $content['is_active'] = $isActive;
 
                                // Insert row template and switch color
                                $OUT .= loadTemplate($row, true, $content);
@@ -136,10 +131,11 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                // Load main template
                loadTemplate('admin_list_country_form', false, $content);
-       }
+       } // END - if
 } else {
        // Shall we modify / remove entries now?
-       $message = ''; initSqls();
+       $message = '';
+       initSqls();
        if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('id'))) {
                // Modify
                foreach (postRequestParameter('id') as $id => $sel) {
@@ -148,7 +144,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                // Create message
                $message = '{--ADMIN_COUNTRIES_MODIFIED--}';
-       } elseif ((isFormSent('remove')) && (isPostRequestParameterSet('id'))) {
+       } elseif ((isFormSent('do_delete')) && (isPostRequestParameterSet('id'))) {
                // Remove
                $IDs = implode(',', array_keys(postRequestParameter('id')));
                addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestParameter('id'))."");
@@ -166,7 +162,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        } // END - if
 
        // Load currenty setup country codes to list
-       $result = SQL_QUERY('SELECT `id`, `code`, `descr`, `is_active` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `code` ASC',
+       $result = SQL_QUERY('SELECT `id`,`code`,`descr`,`is_active` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `code` ASC',
        __FILE__, __LINE__);
 
        // Do we have entries?