X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=05397487ce4e89ebc0816498585e9a02d7349ae6;hp=05fe8420bd702a38e0a3ed32414a3c96beafb6ee;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 05fe8420bd..05397487ce 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -46,30 +46,30 @@ 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
 	displayMessage($message);
-} elseif ((isFormSent('change')) && (isPostRequestParameterSet('id'))) {
+} 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'))."");