X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_sponsor_pay.php;h=70d261837529304589104514aa09df823ebbbf83;hb=c9b17a86f4d62b50b8b1fbe6f9d88e6092430526;hp=d57c721c5191c251afe604dc40d1c887ae8db2f7;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git

diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index d57c721c51..70d2618375 100644
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.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                    *
@@ -47,7 +45,7 @@ addMenuDescription('admin', __FILE__);
 
 $message = '';
 
-if (isPostRequestParameterSet('add')) {
+if (isFormSent('add')) {
 	// Check input variables
 	if (!isPostRequestParameterSet('pay_name')) unsetPostRequestParameter('add');
 	if ((round(postRequestParameter('pay_rate')) == 0) || (!isPostRequestParameterSet('pay_rate'))) unsetPostRequestParameter('add');
@@ -57,15 +55,15 @@ if (isPostRequestParameterSet('add')) {
 	if ((postRequestParameter('pay_min_count') == '0') || (!isPostRequestParameterSet('pay_min_count'))) unsetPostRequestParameter('add');
 	if (!isPostRequestParameterSet('pay_currency')) unsetPostRequestParameter('add');
 
-} elseif ((isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('del')) || (isPostRequestParameterSet('change')) || (isPostRequestParameterSet('remove'))) {
+} elseif ((isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('change')) || (isFormSent('remove'))) {
 	// Check if at least one entry was selected
 	if (!isPostRequestParameterSet('id')) {
 		// Nothing selected for editing / deleting???
 		unsetPostRequestParameter('edit');
-		unsetPostRequestParameter('del');
+		unsetPostRequestParameter('delete');
 		unsetPostRequestParameter('change');
 		unsetPostRequestParameter('remove');
-	} elseif (isPostRequestParameterSet('change')) {
+	} elseif (isFormSent('change')) {
 		// Change entries here...
 		foreach (postRequestParameter('id') as $id => $sel) {
 			// Secure id
@@ -80,7 +78,7 @@ SET
 	`pay_min_count`='%s',
 	`pay_currency`='%s'
 WHERE
-	`id`='%s'
+	`id`=%s
 LIMIT 1",
 			array(
 				postRequestParameter('name', $id),
@@ -92,17 +90,17 @@ LIMIT 1",
 		}
 
 		// Generate message
-		$message = getMessage('SPONSOR_PAY_ENTRIES_CHANGED');
-	} elseif (isPostRequestParameterSet('remove')) {
+		$message = '{--SPONSOR_PAY_ENTRIES_CHANGED--}';
+	} elseif (isFormSent('remove')) {
 		// Remove entries here...
 		foreach (postRequestParameter('id') as $id => $sel) {
 			// Remove entry
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`='%s' LIMIT 1",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`=%s LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
 		}
 
 		// Generate message
-		$message = getMessage('SPONSOR_PAY_ENTRIES_REMOVED');
+		$message = '{--SPONSOR_PAY_ENTRIES_REMOVED--}';
 	}
 
 	if (!empty($message)) {
@@ -111,7 +109,7 @@ LIMIT 1",
 	} // END - if
 }
 
-if (isPostRequestParameterSet('add')) {
+if (isFormSent('add')) {
 	// Check if entry with same name does exists
 	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `pay_name`='%s' LIMIT 1",
 		array(postRequestParameter('pay_name')), __FILE__, __LINE__);
@@ -128,38 +126,27 @@ if (isPostRequestParameterSet('add')) {
 		// Payment type added!
 		$message = getMaskedMessage('ADMIN_SPONSOR_PAYTYPE_ADDED', postRequestParameter('pay_name'));
 	} else {
-		// Free memory
-		SQL_FREERESULT($result);
-
 		// Entry does already exists
 		$message = getMaskedMessage('ADMIN_SPONSOR_PAYTYPE_ALREADY', postRequestParameter('pay_name'));
 	}
 
+	// Free memory
+	SQL_FREERESULT($result);
+
 	// Output message
 	loadTemplate('admin_settings_saved', false, $message);
-} elseif ((isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('del'))) {
+} elseif ((isFormSent('edit')) || (isFormSent('delete'))) {
 	// Load all data
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	foreach (postRequestParameter('id') as $id => $sel) {
 		// Load entry
-		$result = SQL_QUERY_ESC("SELECT `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` WHERE `id`=%s LIMIT 1",
 			array(bigintval($id)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
 			// Load data
-			list($name, $rate, $min, $curr) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
-
-			// Transfer data to array
-			$content = array(
-				'id'   => bigintval($id),
-				'sw'   => bigintval($SW),
-				'name' => htmlspecialchars($name),
-				'rate' => translateComma($rate),
-				'min'  => bigintval($min),
-				'curr' => htmlspecialchars($curr)
-			);
-
-			if (isPostRequestParameterSet('edit')) {
+			$content = SQL_FETCHARRAY($result);
+
+			if (isFormSent('edit')) {
 				// Edit entry
 				$OUT .= loadTemplate('admin_list_sponsor_pay_edit_row', true, $content);
 			} else {
@@ -171,12 +158,12 @@ if (isPostRequestParameterSet('add')) {
 			$OUT .= loadTemplate('admin_list_sponsor_pay_404', true, $id);
 		}
 
-		// Switch colors
-		$SW = 3 - $SW;
+		// Free result
+		SQL_FREERESULT($result);
 	} // END - foreach
 
 	// Load main template depending on mode (edit/delete)
-	if (isPostRequestParameterSet('edit')) {
+	if (isFormSent('edit')) {
 		// Load main edit template
 		loadTemplate('admin_list_sponsor_pay_edit', false, $OUT);
 	} else {
@@ -185,43 +172,35 @@ if (isPostRequestParameterSet('add')) {
 	}
 } else {
 	// Load all payment types
-	$result = SQL_QUERY("SELECT `id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency` FROM `{?_MYSQL_PREFIX?}_sponsor_paytypes` ORDER BY `pay_name` ASC",
-	__FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT
+	`id`, `pay_name`, `pay_rate`, `pay_min_count`, `pay_currency`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_paytypes`
+ORDER BY
+	`pay_name` ASC",
+		__FILE__, __LINE__);
 
 	// Do we have some paytypes setup?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Prepare variables for listing
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 
 		// List alle found payment types
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Remember data in array
-			$content = array(
-				'sw'       => $SW,
-				'id'       => $content['id'],
-				'name'     => $content['pay_name'],
-				'rate'     => translateComma($content['pay_rate']),
-				'min'      => $content['pay_min_count'],
-				'currency' => $content['pay_currency']
-			);
-
 			// Add row
 			$OUT .= loadTemplate('admin_list_sponsor_pay_row', true, $content);
-
-			// Switch colors
-			$SW = 3 - $SW;
 		} // END - while
 
-		// Free memory
-		SQL_FREERESULT($result);
-
 		// Load list template
 		$content['list_out'] = loadTemplate('admin_list_sponsor_pay', true, $OUT);
 	} else {
 		// Noting setup so far!
-		$content['list_out'] = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_SPONSOR_NO_PAYTYPES'));
+		$content['list_out'] = loadTemplate('admin_settings_saved', true, '{--ADMIN_SPONSOR_NO_PAYTYPES--}');
 	}
 
+	// Free memory
+	SQL_FREERESULT($result);
+
 	// Add new payment types here
 	$content['add_out'] = loadTemplate('admin_add_sponsor_paytype', true);