X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=d4f2fbdddc860486b7a26168d7a5f13e157c525d;hp=8901ee49a5af86f2ac50a656304c19bcf1381198;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 8901ee49a5..d4f2fbdddc 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/30/2005 *
- * ================                             Last change: 04/30/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 04/30/2005 *
+ * ===================                          Last change: 04/30/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_country.php                            *
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,50 +46,50 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Add new code?
-if ((isPostRequestElementSet('add')) && (isPostRequestElementSet(('code'))) && (isPostRequestElementSet(('descr')))) {
+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",
-	array(strtoupper(postRequestElement('code'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == '0') {
+	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')",
 		array(
-		strtoupper(substr(postRequestElement('code'), 0, 2)),
-		postRequestElement('descr'),
-		postRequestElement('is_active')
+		strtoupper(substr(postRequestParameter('code'), 0, 2)),
+		postRequestParameter('descr'),
+		postRequestParameter('is_active')
 		), __FILE__, __LINE__);
 
 		// Country added
-		$message = sprintf(getMessage('ADMIN_COUNTRY_ADDED'), strtoupper(postRequestElement('descr')));
+		$message = getMaskedMessage('ADMIN_COUNTRY_ADDED', strtoupper(postRequestParameter('descr')));
 	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Does already exist
-		$message = sprintf(getMessage('ADMIN_COUNTRY_ALREADY'), strtoupper(postRequestElement('code')));
+		$message = getMaskedMessage('ADMIN_COUNTRY_ALREADY', strtoupper(postRequestParameter('code')));
 	}
 
 	// Display message
 	loadTemplate('admin_settings_saved', false, $message);
-} elseif ((isPostRequestElementSet('change')) && (isPostRequestElementSet('id'))) {
+} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
 	// Change all status
-	adminChangeActivationStatus(postRequestElement('id'), 'countries', 'is_active');
+	adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
 
 	// Show next link
 	loadTemplate('admin_next_link', false, array(
 		'url'   => 'modules.php?module=admin&amp;what=list_country',
 		'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
 	));
-} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet('delete'))) && (isPostRequestElementSet('id'))) {
-	if (count(postRequestElement('id')) > 0) {
-		if (isPostRequestElementSet('edit')) {
+} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
+	if (count(postRequestParameter('id')) > 0) {
+		if (isFormSent('edit')) {
 			// Edit template
 			$row    = 'admin_list_country_edit_row';
 			$post   = 'modify';
 			$class  = 'admin_submit';
 			$submit = getMessage('ADMIN_COUNTRY_EDIT_NOW');
 			$title  = getMessage('ADMIN_COUNTRY_EDIT_TITLE');
-			$reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />&nbsp;*';
+			$reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" /> ';
 		} else {
 			// Delete template
 			$row    = 'admin_list_country_del_row';
@@ -101,10 +102,10 @@ if ((isPostRequestElementSet('add')) && (isPostRequestElementSet(('code'))) && (
 
 		// Edit all selected country codes
 		$OUT = ''; $SW = 2;
-		foreach (postRequestElement('id') as $id => $status) {
+		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",
-			array(bigintval($id)), __FILE__, __LINE__);
+				array(bigintval($id)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Load data
 				list($code, $descr) = SQL_FETCHROW($result);
@@ -148,18 +149,18 @@ if ((isPostRequestElementSet('add')) && (isPostRequestElementSet(('code'))) && (
 } else {
 	// Shall we modify / remove entries now?
 	$message = ''; initSqls();
-	if ((isPostRequestElementSet(('modify'))) && (isPostRequestElementSet('id'))) {
+	if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('id'))) {
 		// Modify
-		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`='".$id."' LIMIT 1");
+		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");
 		}
 
 		// Create message
 		$message = getMessage('ADMIN_COUNTRIES_MODIFIED');
-	} elseif ((isPostRequestElementSet('remove')) && (isPostRequestElementSet('id'))) {
+	} elseif ((isFormSent('remove')) && (isPostRequestParameterSet('id'))) {
 		// Remove
-		$IDs = implode(',', array_keys(postRequestElement('id')));
-		addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestElement('id'))."");
+		$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');