X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=069d2ea0b113fb5914ce04e419d6c214fcb8cc27;hp=669f7565e130a83315422ba7c219a9120bdc07d9;hb=a18efdcd57ba91893f0958a457b5c58639b135c3;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 669f7565e1..069d2ea0b1 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 04/30/2005 *
- * ================                             Last change: 04/30/2005 *
+ * ===================                          Last change: 04/30/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_country.php                            *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,98 +38,86 @@
 // 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 ((isPostRequestElementSet('add')) && (isPostRequestElementSet(('code'))) && (isPostRequestElementSet(('descr')))) {
+if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestElementSet('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(postRequestElement('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')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (`code`,`descr`,`is_active`) VALUES ('%s','%s','%s')",
 		array(
-		strtoupper(substr(postRequestElement('code'), 0, 2)),
-		postRequestElement('descr'),
-		postRequestElement('is_active')
+			strtoupper(substr(postRequestElement('code'), 0, 2)),
+			postRequestElement('descr'),
+			postRequestElement('is_active')
 		), __FILE__, __LINE__);
 
 		// Country added
-		$message = sprintf(getMessage('ADMIN_COUNTRY_ADDED'), strtoupper(postRequestElement('descr')));
+		$message = '{%message,ADMIN_COUNTRY_ADDED=' . strtoupper(postRequestElement('descr')) . '%}';
 	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Does already exist
-		$message = sprintf(getMessage('ADMIN_COUNTRY_ALREADY'), strtoupper(postRequestElement('code')));
+		$message = '{%message,ADMIN_COUNTRY_ALREADY=' . strtoupper(postRequestElement('code')) . '%}';
 	}
 
 	// Display message
-	loadTemplate('admin_settings_saved', false, $message);
-} elseif ((isPostRequestElementSet('change')) && (isPostRequestElementSet('id'))) {
+	displayMessage($message);
+} elseif ((isFormSent('do_edit')) && (isPostRequestElementSet('id'))) {
 	// Change all status
 	adminChangeActivationStatus(postRequestElement('id'), 'countries', 'is_active');
 
 	// Show next link
 	loadTemplate('admin_next_link', false, array(
 		'url'   => 'modules.php?module=admin&amp;what=list_country',
-		'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
+		'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
 	));
-} elseif (((isPostRequestElementSet('edit')) || (isPostRequestElementSet('delete'))) && (isPostRequestElementSet('id'))) {
+} elseif (((isFormSent('edit')) || (isPostRequestElementSet('delete'))) && (isPostRequestElementSet('id'))) {
 	if (count(postRequestElement('id')) > 0) {
-		if (isPostRequestElementSet('edit')) {
+		if (isFormSent('edit')) {
 			// Edit template
-			$row    = 'admin_list_country_edit_row';
+			$row    = 'admin_edit_country_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;*';
+			$class  = 'form_submit';
+			$submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
+			$title  = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
+			$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  = 'admin_delete';
-			$submit = getMessage('ADMIN_COUNTRY_DELETE_NOW');
-			$title  = getMessage('ADMIN_COUNTRY_DELETE_TITLE');
+			$class  = 'form_delete';
+			$submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
+			$title  = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
 			$reset  = '';
 		}
 
 		// Edit all selected country codes
-		$OUT = ''; $SW = 2;
-		foreach (postRequestElement('id') as $id => $status) {
+		$OUT = '';
+		foreach (postRequestElement('id') as $id => $isActive) {
 			// 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__);
+			$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,
-				);
-
-				if ($post == 'modify') {
-					// Generate default selection in edit-mode
-					$content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array(getMessage('YES'), getMessage('NO')), $status);
-				} else {
-					// Only display status when in delete-mode
-					$content['status'] = translateYesNo($status);
-				}
+				$content = SQL_FETCHARRAY($result);
+
+				// Add $isActive
+				$content['is_active'] = $isActive;
 
 				// 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(
@@ -144,25 +131,34 @@ if ((isPostRequestElementSet('add')) && (isPostRequestElementSet(('code'))) && (
 
 		// Load main template
 		loadTemplate('admin_list_country_form', false, $content);
-	}
+	} // END - if
 } else {
 	// Shall we modify / remove entries now?
-	$message = ''; initSqls();
-	if ((isPostRequestElementSet(('modify'))) && (isPostRequestElementSet('id'))) {
+	$message = '';
+	initSqls();
+	if ((isPostRequestElementSet('modify')) && (isPostRequestElementSet('id'))) {
 		// Modify
 		foreach (postRequestElement('id') as $id => $sel) {
-			addSql("UPDATE `{?_MYSQL_PREFIX?}_countries` SET `code`='".postRequestElement('code', $id)."', `descr`='".postRequestElement('descr', $id)."', `is_active`='".postRequestElement('is_active', $id)."' WHERE `id`='".$id."' LIMIT 1");
-		}
+			addSql("UPDATE
+	`{?_MYSQL_PREFIX?}_countries`
+SET
+	`code`='" . postRequestElement('code', $id) . "',
+	`descr`='" . postRequestElement('descr', $id) . "',
+	`is_active`='" . postRequestElement('is_active', $id) . "'
+WHERE
+	`id`=" . bigintval($id) . "
+LIMIT 1");
+		} // END - foreach
 
 		// Create message
-		$message = getMessage('ADMIN_COUNTRIES_MODIFIED');
-	} elseif ((isPostRequestElementSet('remove')) && (isPostRequestElementSet('id'))) {
+		$message = '{--ADMIN_COUNTRIES_MODIFIED--}';
+	} elseif ((isFormSent('do_delete')) && (isPostRequestElementSet('id'))) {
 		// Remove
 		$IDs = implode(',', array_keys(postRequestElement('id')));
 		addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestElement('id'))."");
 
 		// Create message
-		$message = getMessage('ADMIN_COUNTRIES_REMOVED');
+		$message = '{--ADMIN_COUNTRIES_REMOVED--}';
 	}
 
 	if ((!empty($message)) && (countSqls() > 0)) {
@@ -170,24 +166,21 @@ if ((isPostRequestElementSet('add')) && (isPostRequestElementSet(('code'))) && (
 		runFilterChain('run_sqls');
 
 		// Display message
-		loadTemplate('admin_settings_saved', false, $message);
-	}
+		displayMessage($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',
+	$result = SQL_QUERY('SELECT `id`,`code`,`descr`,`is_active` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `code` ASC',
 	__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+
+	// Do we have entries?
+	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);