X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=52633cb560df21f4d538b0aa4e0057474c03fe12;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=ef80b5cc6a88d1edbb05f07819db69f3b05aa860;hpb=5ab494ec65f8d912c075480312b15b15a5076ea4;p=mailer.git

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index ef80b5cc6a..52633cb560 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -40,10 +38,10 @@
 // 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'))) {
@@ -102,7 +100,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
 		// Edit all selected country codes
 		$OUT = '';
-		foreach (postRequestParameter('id') as $id => $status) {
+		foreach (postRequestParameter('id') as $id => $isActive) {
 			// Load data from DB
 			$result = SQL_QUERY_ESC("SELECT `id`, `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
@@ -112,10 +110,10 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
 				if ($post == 'modify') {
 					// Generate default selection in edit-mode
-					$content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $status);
+					$content['is_active'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $isActive);
 				} else {
 					// Only display status when in delete-mode
-					$content['status'] = translateYesNo($status);
+					$content['is_active'] = translateYesNo($isActive);
 				}
 
 				// Insert row template and switch color
@@ -146,7 +144,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 		// 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--}';
@@ -168,15 +166,14 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 	} // 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__);
+
+	// Do we have entries?
 	if (!SQL_HASZERONUMS($result)) {
 		// List all countries
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Prepare array for the template
-			$content['active'] = translateYesNo($content['is_active']);
-
 			// Load row template and switch colors
 			$OUT .= loadTemplate('admin_list_country_row', true, $content);
 		} // END - while