Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 71d9a7b5e45a2a2a021d0fe6dd5fd3ae2d96742c..a02228e75abf5693ae70f2b1cd3a3f1b7c4e7d1a 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -44,11 +44,11 @@ if ((isset($_POST['ok'])) && (empty($_POST['id']))) {
        unset($_POST['ok']);
 }
 
-$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM "._MYSQL_PREFIX."_pool ORDER BY timestamp", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!_MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0) {
        if (isset($_POST['ok'])) {
                // Make mail editable...
-               $result = SQL_QUERY_ESC("SELECT subject, text, url FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
                 array(bigintval($_POST['id'])), __FILE__, __LINE__);
                list($subj, $text, $url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -61,7 +61,7 @@ if (SQL_NUMROWS($result) > 0) {
                LOAD_TEMPLATE("admin_edit_email");
        } elseif (!empty($_POST['save'])) {
                // Save changes
-               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
 subject='%s',
 text='%s',
 url='%s'
@@ -76,7 +76,7 @@ WHERE id=%s LIMIT 1",
                if (SQL_AFFECTEDROWS() == 1) {
                        $content = SETTINGS_SAVED;
                } else {
-                       $content = "<SPAN class=\"admin_failed\">".SETTINGS_NOT_SAVED."</SPAN>";
+                       $content = "<span class=\"admin_failed\">".SETTINGS_NOT_SAVED."</span>";
                }
 
                // Display message
@@ -109,7 +109,7 @@ WHERE id=%s LIMIT 1",
        }
 } else {
        // No mail orders left in pool
-       OUTPUT_HTML("<SPAN class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</SPAN>");
+       OUTPUT_HTML("<span class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</span>");
 }
 
 //