Old config.php is now automatically updated to new config-local.php format, several...

[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 95ab0b57ea55dcb2eab773725b9af0502afb16aa..1771aa54dfea63fcfe8d907691e4e72487f2d7d8 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -50,12 +50,12 @@ if (!REQUEST_ISSET_POST(('max'))) REQUEST_UNSET_POST(('add_max'));
 
 if (REQUEST_ISSET_POST(('add_max'))) {
        // Save all settings
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",
-        array(bigintval(REQUEST_POST('max'))), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE value='%s' LIMIT 1",
+       array(bigintval(REQUEST_POST('max'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Add this value (including comment)
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_max_receive` (value, comment) VALUES ('%s','%s')",
-                       array(bigintval(REQUEST_POST('max')), REQUEST_POST('comment')),__FILE__, __LINE__);
+               array(bigintval(REQUEST_POST('max')), REQUEST_POST('comment')),__FILE__, __LINE__);
                $content = MAX_VALUE_SAVED;
        } else {
                // Value does alread exists!
@@ -76,21 +76,21 @@ if (REQUEST_ISSET_POST(('add_max'))) {
 
                switch (REQUEST_GET('do'))
                {
-               case "edit": // Change entries
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_max_receive` SET value='%s', comment='%s' WHERE id=%s LIMIT 1",
+                       case 'edit': // Change entries
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_max_receive` SET value='%s', comment='%s' WHERE `id`=%s LIMIT 1",
                                array(
-                                       bigintval(REQUEST_POST('val', $id)),
-                                       REQUEST_POST('comm', $id),
-                                       $id
+                               bigintval(REQUEST_POST('val', $id)),
+                               REQUEST_POST('comm', $id),
+                               $id
                                ),__FILE__, __LINE__);
-                       $TEXT = MRECEIVE_SAVED;
-                       break;
+                               $TEXT = MRECEIVE_SAVED;
+                               break;
 
-               case "del":
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_max_receive` WHERE id=%s LIMIT 1",
+                       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;
-                       break;
+                               $TEXT = MRECEIVE_DELETED;
+                               break;
                }
        }
 
@@ -98,14 +98,14 @@ if (REQUEST_ISSET_POST(('add_max'))) {
                // Display message
                LOAD_TEMPLATE('admin_settings_saved', false, $TEXT);
        }
-} elseif ((REQUEST_ISSET_POST('del')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+} elseif ((REQUEST_ISSET_POST('del')) && (countPostSelection() > 0)) {
        // Delete entries
        $OUT = ''; $SW = 2;
        foreach (REQUEST_POST('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__);
+               $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);
                SQL_FREERESULT($result);
 
@@ -125,13 +125,13 @@ if (REQUEST_ISSET_POST(('add_max'))) {
 
        // Load main template
        LOAD_TEMPLATE("admin_config_email_del");
-} elseif ((REQUEST_ISSET_POST('edit')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+} elseif ((REQUEST_ISSET_POST('edit')) && (countPostSelection() > 0)) {
        // Edit entries
        $OUT = ''; $SW = 2;
        foreach (REQUEST_POST('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__);
+               $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);
                SQL_FREERESULT($result);
 
@@ -153,7 +153,7 @@ if (REQUEST_ISSET_POST(('add_max'))) {
        LOAD_TEMPLATE("admin_config_email_edit");
 } else {
        $result = SQL_QUERY("SELECT id, value, comment FROM `{!_MYSQL_PREFIX!}_max_receive` ORDER BY value",
-               __FILE__, __LINE__);
+       __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // List already existing entries for editing
                $OUT = ''; $SW = 2;