A lot fixes to templates and missing functions added, more rewrites

[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 776b59948df438839d6a06e0080ee8f4ef698c4f..ee00866b20df6dfaf2c82aa29c819959caac61a5 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -41,41 +41,50 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Add new code?
-if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr']))) {
+if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_ISSET_POST(('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($_POST['code'])), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_countries` WHERE code='%s' LIMIT 1",
+        array(strtoupper(REQUEST_POST('code'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Save entry
-               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('%s','%s','%s')",
- array(strtoupper(substr($_POST['code'], 0, 2)), $_POST['descr'], $_POST['is_active']), __FILE__, __LINE__);
-
-               // Country added
-               $MSG = ADMIN_COUNTRY_ADDED_1.strtoupper($_POST['descr']).ADMIN_COUNTRY_ADDED_2;
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_countries` (code, descr, is_active) VALUES ('%s','%s','%s')",
+                       array(
+                               strtoupper(substr(REQUEST_POST('code'), 0, 2)),
+                               REQUEST_POST('descr'),
+                               REQUEST_POST('is_active')
+                       ), __FILE__, __LINE__);
+
+               // Country added
+               $MSG = ADMIN_COUNTRY_ADDED_1.strtoupper(REQUEST_POST('descr')).ADMIN_COUNTRY_ADDED_2;
        } else {
                // Free memory
                SQL_FREERESULT($result);
 
                // Does already exist
-               $MSG = ADMIN_COUNTRY_ALREADY_1.strtoupper($_POST['code']).ADMIN_COUNTRY_ALREADY_2;
+               $MSG = ADMIN_COUNTRY_ALREADY_1.strtoupper(REQUEST_POST('code')).ADMIN_COUNTRY_ALREADY_2;
        }
 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-       OUTPUT_HTML("<br />");
-} elseif ((isset($_POST['change'])) && (!empty($_POST['id']))) {
+} elseif ((REQUEST_ISSET_POST(('change'))) && (REQUEST_ISSET_POST(('id')))) {
        // Change all status
-       ADMIN_CHANGE_ACTIVATION_STATUS($_POST['id'], "countries", "is_active");
-} elseif (((isset($_POST['edit'])) || (isset($_POST['delete']))) && (!empty($_POST['id']))) {
-       if (count($_POST['id']) > 0) {
-               if (isset($_POST['edit'])) {
+       ADMIN_CHANGE_ACTIVATION_STATUS(REQUEST_POST('id'), "countries", "is_active");
+
+       // Show next link
+       LOAD_TEMPLATE("admin_next_link", false, array(
+               'url'   => "modules.php?module=admin&amp;what=list_country",
+               'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
+       ));
+} elseif (((REQUEST_ISSET_POST(('edit'))) || (REQUEST_ISSET_POST(('delete')))) && (REQUEST_ISSET_POST(('id')))) {
+       if (count(REQUEST_POST('id')) > 0) {
+               if (REQUEST_ISSET_POST(('edit'))) {
                        // Edit template
                        $row    = "admin_list_country_edit_row";
                        $post   = "modify";
                        $class  = "admin_submit";
                        $submit = ADMIN_COUNTRY_EDIT_NOW;
                        $title  = ADMIN_COUNTRY_EDIT_TITLE;
-                       $reset  = "<INPUT type=\"reset\" class=\"admin_reset\" value=\"".UNDO_SELECTIONS."\">&nbsp;*\n";
+                       $reset  = "<input type=\"reset\" class=\"admin_reset\" value=\"{!UNDO_SELECTIONS!}\" />&nbsp;*\n";
                } else {
                        // Delete template
                        $row    = "admin_list_country_del_row";
@@ -88,9 +97,9 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
 
                // Edit all selected country codes
                $OUT = ""; $SW = 2;
-               foreach ($_POST['id'] as $id => $status) {
+               foreach (REQUEST_POST('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 code, descr FROM `{!_MYSQL_PREFIX!}_countries` WHERE id=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
@@ -131,18 +140,18 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
 } else {
        // Shall we modify / remove entries now?
        $MSG = ""; $SQLs = array();
-       if ((isset($_POST['modify'])) && (!empty($_POST['id']))) {
+       if ((REQUEST_ISSET_POST(('modify'))) && (REQUEST_ISSET_POST(('id')))) {
                // Modify
-               foreach ($_POST['id'] as $id => $sel) {
-                       $SQLs[] = "UPDATE "._MYSQL_PREFIX."_countries SET code='".$_POST['code'][$id]."', descr='".$_POST['descr'][$id]."', is_active='".$_POST['is_active'][$id]."' WHERE id='".$id."' LIMIT 1";
+               foreach (REQUEST_POST('id') as $id => $sel) {
+                       $SQLs[] = "UPDATE `{!_MYSQL_PREFIX!}_countries` SET code='".REQUEST_POST('code', $id)."', descr='".REQUEST_POST('descr', $id)."', is_active='".REQUEST_POST('is_active', $id)."' WHERE id='".$id."' LIMIT 1";
                }
 
                // Create message
                $MSG = ADMIN_COUNTRIES_MODIFIED;
-       } elseif ((isset($_POST['remove'])) && (!empty($_POST['id']))) {
+       } elseif ((REQUEST_ISSET_POST(('remove'))) && (REQUEST_ISSET_POST(('id')))) {
                // Remove
-               $IDs = implode(", ", $_POST['id']);
-               $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_countries WHERE id IN (".$IDs.") LIMIT ".count($_POST['id'])."";
+               $IDs = implode(",", array_keys(REQUEST_POST('id')));
+               $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_countries` WHERE id IN (".$IDs.") LIMIT ".count(REQUEST_POST('id'))."";
 
                // Create message
                $MSG = ADMIN_COUNTRIES_REMOVED;
@@ -156,15 +165,14 @@ if ((isset($_POST['add'])) && (!empty($_POST['code'])) && (!empty($_POST['descr'
 
                // Display message
                LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-               OUTPUT_HTML("<br />");
        }
 
        // 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__);
+       $result = SQL_QUERY("SELECT id, code, descr, is_active FROM `{!_MYSQL_PREFIX!}_countries` ORDER BY code", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List all countries
                $OUT = ""; $SW = 2;
-               while(list($id, $code, $descr, $active) = SQL_FETCHROW($result)) {
+               while (list($id, $code, $descr, $active) = SQL_FETCHROW($result)) {
                        // Prepare array for the template
                        $content = array(
                                'id'     => $id,