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

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 9a0a10ef2c..d4f2fbdddc 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/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,11 +46,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Add new code?
-if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code'))) && (isPostRequestParameterSet(('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(postRequestParameter('code'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == '0') {
+	if (SQL_HASZERONUMS($result)) {
 		// Save entry
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (code, descr, is_active) VALUES ('%s','%s','%s')",
 		array(
@@ -70,7 +71,7 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code')))
 
 	// Display message
 	loadTemplate('admin_settings_saved', false, $message);
-} elseif ((isPostRequestParameterSet('change')) && (isPostRequestParameterSet('id'))) {
+} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
 	// Change all status
 	adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
 
@@ -79,16 +80,16 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code')))
 		'url'   => 'modules.php?module=admin&what=list_country',
 		'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
 	));
-} elseif (((isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
+} elseif (((isFormSent('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
 	if (count(postRequestParameter('id')) > 0) {
-		if (isPostRequestParameterSet('edit')) {
+		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';
@@ -104,7 +105,7 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code')))
 		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);
@@ -151,12 +152,12 @@ if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet(('code')))
 	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`='".$id."' LIMIT 1");
+			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 ((isPostRequestParameterSet('remove')) && (isPostRequestParameterSet('id'))) {
+	} elseif ((isFormSent('remove')) && (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'))."");