The table 'network_translations' is now a static table maintained in the database

[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 4407bc58ccd15a0ce08d74d6329f431c55326c7a..1525b03830f3bf709bc5788144f1e25aee63d437 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -78,7 +78,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        // Show next link
        loadTemplate('admin_next_link', false, array(
                'url'   => 'modules.php?module=admin&what=list_country',
-               'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
+               'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
        ));
 } elseif (((isFormSent('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
        if (count(postRequestParameter('id')) > 0) {
@@ -87,41 +87,32 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                        $row    = 'admin_list_country_edit_row';
                        $post   = 'modify';
                        $class  = 'admin_submit';
-                       $submit = getMessage('ADMIN_COUNTRY_EDIT_NOW');
-                       $title  = getMessage('ADMIN_COUNTRY_EDIT_TITLE');
+                       $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
+                       $title  = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
                        $reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" /> ';
                } else {
                        // Delete template
                        $row    = 'admin_list_country_del_row';
                        $post   = 'remove';
                        $class  = 'admin_delete';
-                       $submit = getMessage('ADMIN_COUNTRY_DELETE_NOW');
-                       $title  = getMessage('ADMIN_COUNTRY_DELETE_TITLE');
+                       $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
+                       $title  = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
                        $reset  = '';
                }
 
                // Edit all selected country codes
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                foreach (postRequestParameter('id') as $id => $status) {
                        // Load data from DB
-                       $result = SQL_QUERY_ESC("SELECT 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
-                               list($code, $descr) = SQL_FETCHROW($result);
-                               SQL_FREERESULT($result);
-
-                               // Prepare data, load row template and switch colors
-                               $content = array(
-                                       'id'    => $id,
-                                       'code'  => $code,
-                                       'descr' => $descr,
-                                       'sw'    => $SW,
-                               );
+                               $content = SQL_FETCHARRAY($result);
 
                                if ($post == 'modify') {
                                        // Generate default selection in edit-mode
-                                       $content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array(getMessage('YES'), getMessage('NO')), $status);
+                                       $content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $status);
                                } else {
                                        // Only display status when in delete-mode
                                        $content['status'] = translateYesNo($status);
@@ -129,9 +120,11 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                                // Insert row template and switch color
                                $OUT .= loadTemplate($row, true, $content);
-                               $SW = 3 - $SW;
-                       }
-               }
+                       } // END - if
+
+                       // Free result
+                       SQL_FREERESULT($result);
+               } // END - foreach
 
                // Prepare content for template
                $content = array(
@@ -152,18 +145,18 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('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`='".$id."' LIMIT 1");
+                       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");
                }
 
                // Create message
-               $message = getMessage('ADMIN_COUNTRIES_MODIFIED');
+               $message = '{--ADMIN_COUNTRIES_MODIFIED--}';
        } elseif ((isFormSent('remove')) && (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'))."");
 
                // Create message
-               $message = getMessage('ADMIN_COUNTRIES_REMOVED');
+               $message = '{--ADMIN_COUNTRIES_REMOVED--}';
        }
 
        if ((!empty($message)) && (countSqls() > 0)) {
@@ -172,23 +165,21 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                // Display message
                loadTemplate('admin_settings_saved', false, $message);
-       }
+       } // 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',
        __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // List all countries
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare array for the template
                        $content['active'] = translateYesNo($content['is_active']);
-                       $content['sw']     = $SW;
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_list_country_row', true, $content);
-                       $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);