Extension ext-earning introduced (unfinished), renamings:

[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 39ed75b7605cef23e3343fc59866683b98e99993..96a45b90565ac3d45fe27f4aff8da2385deca2fd 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -44,45 +44,45 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Add new code?
-if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequestParameterSet('descr'))) {
+if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestElementSet('descr'))) {
        // Check if country code does already exist
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `code`='%s' LIMIT 1",
-       array(strtoupper(postRequestParameter('code'))), __FILE__, __LINE__);
+       array(strtoupper(postRequestElement('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(postRequestElement('code'), 0, 2)),
+                       postRequestElement('descr'),
+                       postRequestElement('is_active')
                ), __FILE__, __LINE__);
 
                // Country added
-               $message = getMaskedMessage('ADMIN_COUNTRY_ADDED', strtoupper(postRequestParameter('descr')));
+               $message = '{%message,ADMIN_COUNTRY_ADDED=' . strtoupper(postRequestElement('descr')) . '%}';
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Does already exist
-               $message = getMaskedMessage('ADMIN_COUNTRY_ALREADY', strtoupper(postRequestParameter('code')));
+               $message = '{%message,ADMIN_COUNTRY_ALREADY=' . strtoupper(postRequestElement('code')) . '%}';
        }
 
        // Display message
        displayMessage($message);
-} elseif ((isFormSent('do_edit')) && (isPostRequestParameterSet('id'))) {
+} elseif ((isFormSent('do_edit')) && (isPostRequestElementSet('id'))) {
        // Change all status
-       adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
+       adminChangeActivationStatus(postRequestElement('id'), 'countries', 'is_active');
 
        // Show next link
        loadTemplate('admin_next_link', false, array(
                'url'   => 'modules.php?module=admin&what=list_country',
                'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
        ));
-} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
-       if (count(postRequestParameter('id')) > 0) {
+} elseif (((isFormSent('edit')) || (isPostRequestElementSet('delete'))) && (isPostRequestElementSet('id'))) {
+       if (count(postRequestElement('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--}';
@@ -100,21 +100,16 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                // Edit all selected country codes
                $OUT = '';
-               foreach (postRequestParameter('id') as $id => $isActive) {
+               foreach (postRequestElement('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'] = '{%pipe,translateYesNo=' . $isActive . '%}';
-                               }
+                               // Add $isActive
+                               $content['is_active'] = $isActive;
 
                                // Insert row template and switch color
                                $OUT .= loadTemplate($row, true, $content);
@@ -141,18 +136,18 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        // Shall we modify / remove entries now?
        $message = '';
        initSqls();
-       if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('id'))) {
+       if ((isPostRequestElementSet('modify')) && (isPostRequestElementSet('id'))) {
                // Modify
-               foreach (postRequestParameter('id') as $id => $sel) {
-                       addSql("UPDATE `{?_MYSQL_PREFIX?}_countries` SET `code`='" . postRequestParameter('code', $id) . "', `descr`='" . postRequestParameter('descr', $id) . "', `is_active`='" . postRequestParameter('is_active', $id) . "' WHERE `id`=" . bigintval($id) . " LIMIT 1");
+               foreach (postRequestElement('id') as $id => $sel) {
+                       addSql("UPDATE `{?_MYSQL_PREFIX?}_countries` SET `code`='" . postRequestElement('code', $id) . "', `descr`='" . postRequestElement('descr', $id) . "', `is_active`='" . postRequestElement('is_active', $id) . "' WHERE `id`=" . bigintval($id) . " LIMIT 1");
                } // END - foreach
 
                // Create message
                $message = '{--ADMIN_COUNTRIES_MODIFIED--}';
-       } elseif ((isFormSent('do_delete')) && (isPostRequestParameterSet('id'))) {
+       } elseif ((isFormSent('do_delete')) && (isPostRequestElementSet('id'))) {
                // Remove
-               $IDs = implode(',', array_keys(postRequestParameter('id')));
-               addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestParameter('id'))."");
+               $IDs = implode(',', array_keys(postRequestElement('id')));
+               addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestElement('id'))."");
 
                // Create message
                $message = '{--ADMIN_COUNTRIES_REMOVED--}';
@@ -167,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?