X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=74d517baae03b30874aee20dcd40599f266a9e00;hp=5ccf1187570ba4943583e1fd91fbad096a0541f0;hb=ccf34a2a92d80d01debd84b4b6e1f294d8f90cce;hpb=6bcc8f1ebbd646d15c5905a5cec47d1c1e446238

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index 5ccf118757..74d517baae 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/30/2005 *
- * ================                             Last change: 04/30/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 04/30/2005 *
+ * ===================                          Last change: 04/30/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_country.php                            *
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,59 +37,58 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Add new code?
-if ((REQUEST_ISSET_POST('add')) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_ISSET_POST(('descr')))) {
+if ((isPostRequestParameterSet('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",
-	array(strtoupper(REQUEST_POST('code'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 0) {
+	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` WHERE code='%s' LIMIT 1",
+	array(strtoupper(postRequestParameter('code'))), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) == '0') {
 		// 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(REQUEST_POST('code'), 0, 2)),
-		REQUEST_POST('descr'),
-		REQUEST_POST('is_active')
+		strtoupper(substr(postRequestParameter('code'), 0, 2)),
+		postRequestParameter('descr'),
+		postRequestParameter('is_active')
 		), __FILE__, __LINE__);
 
 		// Country added
-		$message = sprintf(getMessage('ADMIN_COUNTRY_ADDED'), strtoupper(REQUEST_POST('descr')));
+		$message = getMaskedMessage('ADMIN_COUNTRY_ADDED', strtoupper(postRequestParameter('descr')));
 	} else {
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Does already exist
-		$message = sprintf(getMessage('ADMIN_COUNTRY_ALREADY'), strtoupper(REQUEST_POST('code')));
+		$message = getMaskedMessage('ADMIN_COUNTRY_ALREADY', strtoupper(postRequestParameter('code')));
 	}
 
 	// Display message
-	LOAD_TEMPLATE('admin_settings_saved', false, $message);
-} elseif ((REQUEST_ISSET_POST('change')) && (REQUEST_ISSET_POST('id'))) {
+	loadTemplate('admin_settings_saved', false, $message);
+} elseif ((isPostRequestParameterSet('change')) && (isPostRequestParameterSet('id'))) {
 	// Change all status
-	ADMIN_CHANGE_ACTIVATION_STATUS(REQUEST_POST('id'), "countries", "is_active");
+	adminChangeActivationStatus(postRequestParameter('id'), 'countries', 'is_active');
 
 	// Show next link
-	LOAD_TEMPLATE('admin_next_link', false, array(
+	loadTemplate('admin_next_link', false, array(
 		'url'   => 'modules.php?module=admin&amp;what=list_country',
 		'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
 	));
-} elseif (((REQUEST_ISSET_POST('edit')) || (REQUEST_ISSET_POST('delete'))) && (REQUEST_ISSET_POST('id'))) {
-	if (count(REQUEST_POST('id')) > 0) {
-		if (REQUEST_ISSET_POST('edit')) {
+} elseif (((isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
+	if (count(postRequestParameter('id')) > 0) {
+		if (isPostRequestParameterSet('edit')) {
 			// Edit template
 			$row    = 'admin_list_country_edit_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;*';
+			$reset  = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" /> ';
 		} else {
 			// Delete template
 			$row    = 'admin_list_country_del_row';
@@ -102,10 +101,10 @@ if ((REQUEST_ISSET_POST('add')) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_IS
 
 		// Edit all selected country codes
 		$OUT = ''; $SW = 2;
-		foreach (REQUEST_POST('id') as $id => $status) {
+		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",
-			array(bigintval($id)), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT 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);
@@ -128,68 +127,65 @@ if ((REQUEST_ISSET_POST('add')) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_IS
 				}
 
 				// Insert row template and switch color
-				$OUT .= LOAD_TEMPLATE($row, true, $content);
+				$OUT .= loadTemplate($row, true, $content);
 				$SW = 3 - $SW;
 			}
 		}
-		define('__COUNTRY_ROWS'  , $OUT);
-		define('__COUNTRY_MODE'  , $post);
-		define('__COUNTRY_CLASS' , $class);
-		define('__COUNTRY_SUBMIT', $submit);
-		define('__COUNTRY_TITLE' , $title);
-		define('__COUNTRY_RESET' , $reset);
+
+		// Prepare content for template
+		$content = array(
+			'rows'   => $OUT,
+			'mode'   => $post,
+			'class'  => $class,
+			'title'  => $title,
+			'submit' => $submit,
+			'reset'  => $reset,
+		);
 
 		// Load main template
-		LOAD_TEMPLATE('admin_list_country_form');
+		loadTemplate('admin_list_country_form', false, $content);
 	}
 } else {
 	// Shall we modify / remove entries now?
-	$message = ''; INIT_SQLS();
-	if ((REQUEST_ISSET_POST(('modify'))) && (REQUEST_ISSET_POST('id'))) {
+	$message = ''; initSqls();
+	if ((isPostRequestParameterSet('modify')) && (isPostRequestParameterSet('id'))) {
 		// Modify
-		foreach (REQUEST_POST('id') as $id => $sel) {
-			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_countries` SET `code`='".REQUEST_POST('code', $id)."', `descr`='".REQUEST_POST('descr', $id)."', `is_active`='".REQUEST_POST('is_active', $id)."' WHERE `id`='".$id."' LIMIT 1");
+		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`='".$id."' LIMIT 1");
 		}
 
 		// Create message
 		$message = getMessage('ADMIN_COUNTRIES_MODIFIED');
-	} elseif ((REQUEST_ISSET_POST('remove')) && (REQUEST_ISSET_POST('id'))) {
+	} elseif ((isPostRequestParameterSet('remove')) && (isPostRequestParameterSet('id'))) {
 		// Remove
-		$IDs = implode(',', array_keys(REQUEST_POST('id')));
-		ADD_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(REQUEST_POST('id'))."");
+		$IDs = implode(',', array_keys(postRequestParameter('id')));
+		addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestParameter('id'))."");
 
 		// Create message
 		$message = getMessage('ADMIN_COUNTRIES_REMOVED');
 	}
 
-	if ((!empty($message)) && (COUNT_SQLS() > 0)) {
+	if ((!empty($message)) && (countSqls() > 0)) {
 		// Run SQL commands
 		runFilterChain('run_sqls');
 
 		// Display message
-		LOAD_TEMPLATE('admin_settings_saved', false, $message);
+		loadTemplate('admin_settings_saved', false, $message);
 	}
 
 	// 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',
 	__FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// List all countries
 		$OUT = ''; $SW = 2;
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Prepare array for the template
-			// @TODO Rewritings: name->descr,status->is_active in template
-			$content = array(
-				'id'     => $content['id'],
-				'code'   => $content['code'],
-				'name'   => $content['descr'],
-				'active' => translateYesNo($content['is_active']),
-				'sw'     => $SW,
-				'status' => $content['is_active'],
-			);
+			$content['active'] = translateYesNo($content['is_active']);
+			$content['sw']     = $SW;
 
 			// Load row template and switch colors
-			$OUT .= LOAD_TEMPLATE('admin_list_country_row', true, $content);
+			$OUT .= loadTemplate('admin_list_country_row', true, $content);
 			$SW = 3 - $SW;
 		}
 
@@ -197,18 +193,18 @@ if ((REQUEST_ISSET_POST('add')) && (REQUEST_ISSET_POST(('code'))) && (REQUEST_IS
 		SQL_FREERESULT($result);
 	} else {
 		// No code setup so far (not possible by this software! 'DE' for 'Deutschland' is default
-		$OUT = LOAD_TEMPLATE('admin_list_country_no_row', true);
+		$OUT = loadTemplate('admin_list_country_no_row', true);
 	}
 
 	// Add list to constant for the template
-	define('__COUNTRY_ROWS', $OUT);
+	$content['rows'] = $OUT;
 
 	// Include add template
-	define('__ADD_COUNTRY_FORM', LOAD_TEMPLATE('admin_add_country', true));
+	$content['add_form'] = loadTemplate('admin_add_country', true);
 
 	// Load main template
-	LOAD_TEMPLATE('admin_list_country');
+	loadTemplate('admin_list_country', false, $content);
 }
 
-//
+// [EOF]
 ?>