X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_country.php;h=93a5d73c87e94246efdec0fb8733bd25c16826d1;hp=c27f2284b37833333e73221dd078bc4e0e8e8a26;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb

diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index c27f2284b3..93a5d73c87 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,11 +46,11 @@ addYouAreHereLink('admin', __FILE__);
 // Add new code?
 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 = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `code`='%s' LIMIT 1",
 	array(strtoupper(postRequestElement('code'))), __FILE__, __LINE__);
-	if (SQL_HASZERONUMS($result)) {
+	if (ifSqlHasZeroNumRows($result)) {
 		// Save entry
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (`code`, `descr`, `is_active`) VALUES ('%s','%s','%s')",
+		sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (`code`, `descr`, `is_active`) VALUES ('%s','%s','%s')",
 		array(
 			strtoupper(substr(postRequestElement('code'), 0, 2)),
 			postRequestElement('descr'),
@@ -61,7 +61,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
 		$message = '{%message,ADMIN_COUNTRY_ADDED=' . strtoupper(postRequestElement('descr')) . '%}';
 	} else {
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Does already exist
 		$message = '{%message,ADMIN_COUNTRY_ALREADY=' . strtoupper(postRequestElement('code')) . '%}';
@@ -74,7 +74,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
 	adminChangeActivationStatus(postRequestElement('id'), 'countries', 'is_active');
 
 	// Show next link
-	loadTemplate('admin_next_link', false, array(
+	loadTemplate('admin_next_link', FALSE, array(
 		'url'   => 'modules.php?module=admin&what=list_country',
 		'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
 	));
@@ -85,7 +85,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
 		if (isFormSent('edit')) {
 			// Edit template
 			$row    = 'admin_edit_country_row';
-			$do     = 'modify';
+			$do     = 'do_edit';
 			$class  = 'form_submit';
 			$submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
 			$title  = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
@@ -93,7 +93,7 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
 		} else {
 			// Delete template
 			$row    = 'admin_delete_country_row';
-			$do     = 'remove';
+			$do     = 'do_delete';
 			$class  = 'form_delete';
 			$submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
 			$title  = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
@@ -104,21 +104,21 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
 		$OUT = '';
 		foreach (postRequestElement('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",
+			$result = sqlQueryEscaped("SELECT `id`, `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1) {
+			if (sqlNumRows($result) == 1) {
 				// Load data
-				$content = SQL_FETCHARRAY($result);
+				$content = sqlFetchArray($result);
 
 				// Add $isActive
 				$content['is_active'] = $isActive;
 
 				// Insert row template and switch color
-				$OUT .= loadTemplate($row, true, $content);
+				$OUT .= loadTemplate($row, TRUE, $content);
 			} // END - if
 
 			// Free result
-			SQL_FREERESULT($result);
+			sqlFreeResult($result);
 		} // END - foreach
 
 		// Prepare content for template
@@ -132,13 +132,13 @@ if ((isFormSent('add')) && (isPostRequestElementSet('code')) && (isPostRequestEl
 		);
 
 		// Load main template
-		loadTemplate('admin_list_country_form', false, $content);
+		loadTemplate('admin_list_country_form', FALSE, $content);
 	} // END - if
 } else {
 	// Shall we modify / remove entries now?
 	$message = '';
 	initSqls();
-	if ((isPostRequestElementSet('modify')) && (isPostRequestElementSet('id'))) {
+	if ((isPostRequestElementSet('do_edit')) && (isPostRequestElementSet('id'))) {
 		// Modify
 		foreach (postRequestElement('id') as $id => $sel) {
 			addSql("UPDATE
@@ -163,6 +163,7 @@ LIMIT 1");
 		$message = '{--ADMIN_COUNTRIES_REMOVED--}';
 	}
 
+	// Are a message and some SQLs set?
 	if ((!empty($message)) && (countSqls() > 0)) {
 		// Run SQL commands
 		runFilterChain('run_sqls');
@@ -172,33 +173,30 @@ LIMIT 1");
 	} // 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` ASC',
-	__FILE__, __LINE__);
+	$result = sqlQuery('SELECT `id`, `code`, `descr`, `is_active` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `code` ASC',
+		__FILE__, __LINE__);
 
 	// Are there entries?
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// List all countries
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Load row template and switch colors
-			$OUT .= loadTemplate('admin_list_country_row', true, $content);
+			$OUT .= loadTemplate('admin_list_country_row', TRUE, $content);
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} else {
 		// No code setup so far (not possible by this software! 'DE' for 'Deutschland' is default
-		$OUT = loadTemplate('admin_list_country_no_row', true);
+		$OUT = loadTemplate('admin_list_country_no_row', TRUE);
 	}
 
 	// Add list to constant for the template
 	$content['rows'] = $OUT;
 
-	// Include add template
-	$content['add_form'] = loadTemplate('admin_add_country', true);
-
 	// Load main template
-	loadTemplate('admin_list_country', false, $content);
+	loadTemplate('admin_list_country', FALSE, $content);
 }
 
 // [EOF]