X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=e37051099dda1439d8ee50f5a8c5e87a98ebdea0;hb=8e1fd7e3be3811cb108a074bece2eecd5bcced8f;hp=43cda0efda8a51eedfd7b2d9ed3ae211b4e61e64;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 43cda0efda..e37051099d 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -14,11 +14,9 @@
* $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 *
+ * 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 *
@@ -40,98 +38,86 @@
// 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'))) {
// 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');
// 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) {
if (isFormSent('edit')) {
// Edit template
- $row = 'admin_list_country_edit_row';
+ $row = 'admin_edit_country_row';
$post = 'modify';
- $class = 'admin_submit';
+ $class = 'form_submit';
$submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
$title = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
- $reset = ' ';
+ $reset = ' ';
} else {
// Delete template
- $row = 'admin_list_country_del_row';
+ $row = 'admin_delete_country_row';
$post = 'remove';
- $class = 'admin_delete';
+ $class = 'form_delete';
$submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
$title = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
$reset = '';
}
// Edit all selected country codes
- $OUT = ''; $SW = 2;
- foreach (postRequestParameter('id') as $id => $status) {
+ $OUT = '';
+ foreach (postRequestParameter('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,
- 'sw' => $SW,
- );
-
- if ($post == 'modify') {
- // Generate default selection in edit-mode
- $content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array(getMessage('YES'), getMessage('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);
- $SW = 3 - $SW;
- }
- }
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+ } // END - foreach
// Prepare content for template
$content = array(
@@ -145,19 +131,20 @@ 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) {
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");
- }
+ } // END - foreach
// 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'))."");
@@ -171,24 +158,21 @@ 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__);
- if (SQL_NUMROWS($result) > 0) {
+
+ // Do we have entries?
+ 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);