X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=1a5e1ceddce6b52d261d4ee7f74134d232e0325f;hb=6560179e7c8dc565485503f374d4e31f333ffd0e;hp=a419063cf565151840ed95cae7bac53adc81e3e1;hpb=30ae22f62ae87c53a56baf0d134569ba91011111;p=mailer.git
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index a419063cf5..1a5e1ceddc 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -14,12 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -40,61 +38,63 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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__);
+ $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `code`='%s' LIMIT 1",
+ 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
- loadTemplate('admin_settings_saved', false, $message);
-} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
+ displayMessage($message);
+} 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'))) {
+ // Are there entries?
+ if (ifPostContainsSelections('id')) {
+ // Is the proper form sent?
if (isFormSent('edit')) {
// Edit template
- $row = 'admin_list_country_edit_row';
- $post = 'modify';
- $class = 'admin_submit';
+ $row = 'admin_edit_country_row';
+ $do = 'modify';
+ $class = 'form_submit';
$submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
$title = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
- $reset = ' ';
+ $reset = ' ';
} else {
// Delete template
- $row = 'admin_list_country_del_row';
- $post = 'remove';
- $class = 'admin_delete';
+ $row = 'admin_delete_country_row';
+ $do = 'remove';
+ $class = 'form_delete';
$submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
$title = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
$reset = '';
@@ -102,39 +102,29 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
// Edit all selected country codes
$OUT = '';
- foreach (postRequestParameter('id') as $id => $status) {
+ foreach (postRequestElement('id') as $id => $isActive) {
// 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,
- );
-
- if ($post == 'modify') {
- // Generate default selection in edit-mode
- $content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $status);
- } else {
- // Only display status when in delete-mode
- $content['status'] = translateYesNo($status);
- }
+ $content = SQL_FETCHARRAY($result);
+
+ // Add $isActive
+ $content['is_active'] = $isActive;
// Insert row template and switch color
$OUT .= loadTemplate($row, true, $content);
} // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
} // END - foreach
// Prepare content for template
$content = array(
'rows' => $OUT,
- 'mode' => $post,
+ 'do' => $do,
'class' => $class,
'title' => $title,
'submit' => $submit,
@@ -143,22 +133,31 @@ 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();
- if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('id'))) {
+ $message = '';
+ initSqls();
+ 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('remove')) && (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 ' . countPostSelection('id') . '');
// Create message
$message = '{--ADMIN_COUNTRIES_REMOVED--}';
@@ -169,19 +168,18 @@ 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
- $result = SQL_QUERY('SELECT id, code, descr, is_active FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY code',
+ $result = SQL_QUERY('SELECT `id`,`code`,`descr`,`is_active` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `code` ASC',
__FILE__, __LINE__);
+
+ // Are there entries?
if (!SQL_HASZERONUMS($result)) {
// List all countries
$OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
- // Prepare array for the template
- $content['active'] = translateYesNo($content['is_active']);
-
// Load row template and switch colors
$OUT .= loadTemplate('admin_list_country_row', true, $content);
} // END - while