X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=f67b2dd615fc4e89b58f81e611ba62a0d9984b8c;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=f7c4fd16a7a080b2d88839ea9433d81ec81873ac;hpb=fc162164725588cf75969f707faead9c9cd8e68b;p=mailer.git

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index f7c4fd16a7..f67b2dd615 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,7 +38,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -86,38 +84,29 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 			// Edit template
 			$row    = 'admin_list_country_edit_row';
 			$post   = 'modify';
-			$class  = 'admin_submit';
+			$class  = 'form_submit';
 			$submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
 			$title  = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
-			$reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" /> ';
+			$reset  = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" /> ';
 		} else {
 			// Delete template
 			$row    = 'admin_list_country_del_row';
 			$post   = 'remove';
-			$class  = 'admin_delete';
+			$class  = 'form_delete';
 			$submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
 			$title  = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
 			$reset  = '';
 		}
 
 		// Edit all selected country codes
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		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",
+			$result = SQL_QUERY_ESC("SELECT `id`, `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Load data
-				list($code, $descr) = SQL_FETCHROW($result);
-				SQL_FREERESULT($result);
-
-				// Prepare data, load row template and switch colors
-				$content = array(
-					'id'    => $id,
-					'code'  => $code,
-					'descr' => $descr,
-					'sw'    => $SW,
-				);
+				$content = SQL_FETCHARRAY($result);
 
 				if ($post == 'modify') {
 					// Generate default selection in edit-mode
@@ -129,9 +118,11 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
 				// Insert row template and switch color
 				$OUT .= loadTemplate($row, true, $content);
-				$SW = 3 - $SW;
-			}
-		}
+			} // END - if
+
+			// Free result
+			SQL_FREERESULT($result);
+		} // END - foreach
 
 		// Prepare content for template
 		$content = array(
@@ -172,23 +163,18 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
 		// Display message
 		loadTemplate('admin_settings_saved', false, $message);
-	}
+	} // 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',
 	__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List all countries
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Prepare array for the template
-			$content['active'] = translateYesNo($content['is_active']);
-			$content['sw']     = $SW;
-
 			// Load row template and switch colors
 			$OUT .= loadTemplate('admin_list_country_row', true, $content);
-			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);