Way more usage of EL code:

[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 ceaee5366ecd5d456b89085d9d93c9c22027b3db..05397487ce4e89ebc0816498585e9a02d7349ae6 100644 (file)
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,35 +41,35 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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
-       loadTemplate('admin_settings_saved', false, $message);
-} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
+       displayMessage($message);
+} elseif ((isFormSent('do_edit')) && (isPostRequestParameterSet('id'))) {
        // Change all status
        adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
 
@@ -113,7 +113,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                                        $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);
+                                       $content['is_active'] = '{%pipe,translateYesNo=' . $isActive . '%}';
                                }
 
                                // Insert row template and switch color
@@ -136,10 +136,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 +149,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'))."");
@@ -162,7 +163,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
                runFilterChain('run_sqls');
 
                // Display message
-               loadTemplate('admin_settings_saved', false, $message);
+               displayMessage($message);
        } // END - if
 
        // Load currenty setup country codes to list