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 1a2fc7f55fbd8726e571bceea9b5b18d0bf19cb4..3242fcc33517ac3f13ee901a4d7ea40c0ebf7c98 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,20 +46,20 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Remove empty array index
-if (!isPostRequestElementSet(('max'))) unsetPostRequestElement(('add_max'));
+if (!isPostRequestParameterSet('max')) unsetPostRequestParameter('add_max');
 
-if (isPostRequestElementSet(('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(postRequestElement('max'))), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == '0') {
+       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')",
-               array(bigintval(postRequestElement('max')), postRequestElement('comment')),__FILE__, __LINE__);
-               $content = getMessage('MAX_VALUE_SAVED');
+               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 {
                // 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
@@ -66,29 +67,29 @@ if (isPostRequestElementSet(('add_max'))) {
 
        // Display message
        loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent()) && (isGetRequestElementSet('do'))) {
+} elseif ((isFormSent()) && (isGetRequestParameterSet('do'))) {
        // Change or delete entries...
        $TEXT = '';
-       foreach (postRequestElement('id') as $id => $value) {
+       foreach (postRequestParameter('id') as $id => $value) {
                // Secure id
                $id = bigintval($id);
 
-               switch (getRequestElement('do'))
+               switch (getRequestParameter('do'))
                {
                        case 'edit': // Change entries
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_max_receive` SET value='%s', comment='%s' WHERE `id`=%s LIMIT 1",
                                array(
-                                       bigintval(postRequestElement('val', $id)),
-                                       postRequestElement('comm', $id),
+                                       bigintval(postRequestParameter('val', $id)),
+                                       postRequestParameter('comm', $id),
                                        $id
                                ),__FILE__, __LINE__);
-                               $TEXT = getMessage('MRECEIVE_SAVED');
+                               $TEXT = '{--MRECEIVE_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 = getMessage('MRECEIVE_DELETED');
+                               $TEXT = '{--MRECEIVE_DELETED--}';
                                break;
                }
        }
@@ -97,54 +98,36 @@ if (isPostRequestElementSet(('add_max'))) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
        } // END - if
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
        // Delete entries
-       $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       $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 ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit entries
-       $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       $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
@@ -152,16 +135,12 @@ if (isPostRequestElementSet(('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