X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_email.php;h=0ce3c74db965b7170007de3002941a8afa023668;hb=29157685184b9aa2ddbf42e9d2e49141af95f7e2;hp=1383d4e54a01a597f5a9037f075e220f5c24add9;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index 1383d4e54a..0ce3c74db9 100644
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -46,20 +46,20 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Remove empty array index
-if (!isPostRequestParameterSet(('max'))) unsetPostRequestParameter(('add_max'));
+if (!isPostRequestParameterSet('max')) unsetPostRequestParameter('add_max');
 
-if (isPostRequestParameterSet(('add_max'))) {
+if (isPostRequestParameterSet('add_max')) {
 	// Save all settings
 	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='%s' LIMIT 1",
 	array(bigintval(postRequestParameter('max'))), __FILE__, __LINE__);
 	if (SQL_HASZERONUMS($result)) {
 		// Add this value (including comment)
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (value, comment) VALUES ('%s','%s')",
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES ('%s','%s')",
 		array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__);
-		$content = '{--MAX_VALUE_SAVED--}';
+		$content = '{--ADMIN_MAX_VALUE_SAVED--}';
 	} else {
 		// Value does alread exists!
-		$content = '<span class="admin_failed">{--MAX_VALUE_ALREADY--}</span>';
+		$content = '<span class="admin_failed">{--ADMIN_MAX_VALUE_ALREADY--}</span>';
 	}
 
 	// Free memory
@@ -83,13 +83,13 @@ if (isPostRequestParameterSet(('add_max'))) {
 					postRequestParameter('comm', $id),
 					$id
 				),__FILE__, __LINE__);
-				$TEXT = '{--MRECEIVE_SAVED--}';
+				$TEXT = '{--ADMIN_MAX_RECEIVE_SAVED--}';
 				break;
 
 			case 'del':
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
 					array($id), __FILE__, __LINE__);
-				$TEXT = '{--MRECEIVE_DELETED--}';
+				$TEXT = '{--ADMIN_MAX_RECEIVE_DELETED--}';
 				break;
 		}
 	}
@@ -98,54 +98,36 @@ if (isPostRequestParameterSet(('add_max'))) {
 		// Display message
 		loadTemplate('admin_settings_saved', false, $TEXT);
 	} // END - if
-} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
 	// Delete entries
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
 		// Load data
-		$result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
-		list($value, $comment) = SQL_FETCHROW($result);
+		$result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
+		$content = SQL_FETCHARRAY($result);
 		SQL_FREERESULT($result);
 
-		// Prepare data for the row template
-		$content = array(
-			'sw'      => $SW,
-			'id'      => $id,
-			'value'   => $value,
-			'comment' => $comment,
-		);
-
 		// Load row template and switch color
 		$OUT .= loadTemplate('admin_config_email_del_row', true, $content);
-		$SW = 3 - $SW;
-	}
+	} // END - foreach
 	$content['rows'] = $OUT;
 
 	// Load main template
 	loadTemplate('admin_config_email_del', false, $content);
-} elseif ((isFormSent('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit entries
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	foreach (postRequestParameter('sel') as $id => $value) {
 		// Load data
-		$result = SQL_QUERY_ESC("SELECT value, comment FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
-		array(bigintval($id)), __FILE__, __LINE__);
-		list($value, $comment) = SQL_FETCHROW($result);
+		$result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
+		$content = SQL_FETCHARRAY($result);
 		SQL_FREERESULT($result);
 
-		// Prepare data for the row template
-		$content = array(
-			'sw'      => $SW,
-			'id'      => $id,
-			'value'   => $value,
-			'comment' => $comment,
-		);
-
 		// Load row template and switch color
 		$OUT .= loadTemplate('admin_config_email_edit_row', true, $content);
-		$SW = 3 - $SW;
-	}
+	} // END - foreach
 	$content['rows'] = $OUT;
 
 	// Load main template
@@ -153,16 +135,12 @@ if (isPostRequestParameterSet(('add_max'))) {
 } else {
 	$result = SQL_QUERY("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
 	__FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List already existing entries for editing
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Prepare data for the row template
-			$content['sw'] = $SW;
-
 			// Load row template and switch color
 			$OUT .= loadTemplate('admin_config_email_row', true, $content);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory