X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=40418c251c8ff6b3e7c201657fcfc8e9d71317ce;hb=12effdb00f104773905152bfb2950496c2efaec4;hp=39ed75b7605cef23e3343fc59866683b98e99993;hpb=a39205eb2ce8514510dcecb7bd0fdf4444ab5c05;p=mailer.git

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 39ed75b760..40418c251c 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -58,13 +58,13 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 		), __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
@@ -82,7 +82,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 	if (count(postRequestParameter('id')) > 0) {
 		if (isFormSent('edit')) {
 			// Edit template
-			$row    = 'admin_list_country_edit_row';
+			$row    = 'admin_edit_country_row';
 			$post   = 'modify';
 			$class  = 'form_submit';
 			$submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
@@ -90,7 +90,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 			$reset  = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" /> ';
 		} else {
 			// Delete template
-			$row    = 'admin_list_country_del_row';
+			$row    = 'admin_delete_country_row';
 			$post   = 'remove';
 			$class  = 'form_delete';
 			$submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
@@ -108,13 +108,8 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 				// Load data
 				$content = SQL_FETCHARRAY($result);
 
-				if ($post == 'modify') {
-					// Generate default selection in edit-mode
-					$content['is_active'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $isActive);
-				} else {
-					// Only display status when in delete-mode
-					$content['is_active'] = '{%pipe,translateYesNo=' . $isActive . '%}';
-				}
+				// Add $isActive
+				$content['is_active'] = $isActive;
 
 				// Insert row template and switch color
 				$OUT .= loadTemplate($row, true, $content);