Some more wrappers added, code cleanups:

[mailer.git] / inc / modules / admin / what-config_email.php

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index f72905d1bcb0278c8c4dc76be30351470a6cab3d..3242fcc33517ac3f13ee901a4d7ea40c0ebf7c98 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -46,15 +46,15 @@ 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 = '{--ADMIN_MAX_VALUE_SAVED--}';
        } else {
@@ -98,9 +98,9 @@ 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 `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
@@ -108,20 +108,16 @@ if (isPostRequestParameterSet(('add_max'))) {
                $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
 
-               // Add color switch
-               $content['sw'] = $SW;
-
                // 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 `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
@@ -129,13 +125,9 @@ if (isPostRequestParameterSet(('add_max'))) {
                $content = SQL_FETCHARRAY($result);
                SQL_FREERESULT($result);
 
-               // Add color switch
-               $content['sw'] = $SW;
-
                // 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
@@ -143,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