Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 71c09abaa73b3a97e596e81bec7d7e2007b85b95..45ad9068406ab4a4b41e92b8b5a5b90f11f5467b 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -52,7 +52,7 @@ if (isset($_POST['edit']))
                foreach ($_POST['sel'] as $template => $sel)
                {
                        // First of all load data from DB
-                       $result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY id",
+                       $result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY `id`",
                         array($template), __FILE__, __LINE__);
                        $OUT = ""; $aid = 0; $aid2 = 0;
                        while (list($aid, $id) = SQL_FETCHROW($result))
@@ -110,8 +110,8 @@ if (isset($_POST['edit']))
 {
        // Load all assigned mails
        $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template
-FROM `{!MYSQL_PREFIX!}_admins_mails` AS m
-LEFT JOIN `{!MYSQL_PREFIX!}_admins` AS a
+FROM `{!_MYSQL_PREFIX!}_admins_mails` AS m
+LEFT JOIN `{!_MYSQL_PREFIX!}_admins` AS a
 ON m.admin_id=a.id
 WHERE (m.admin_id=a.id OR m.admin_id < 1) AND m.mail_template != ''
 ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
@@ -129,35 +129,35 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
                                $aid = bigintval($aid);
 
                                // Update entry
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE id=%s ORDER BY id LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE id=%s ORDER BY `id` LIMIT 1",
                                        array($aid, $id), __FILE__, __LINE__);
 
                                if (($aid < 1) && (!empty($_POST['template'][$id])))
                                {
                                        // Remove any other admin entries
-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
                                                array($_POST['template'][$id], $id), __FILE__, __LINE__);
                                }
                                if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
                                {
                                        // Add new admin
-                                       SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
+                                       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
                                                array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
                                }
                        }
 
                        // Query again...
-                       $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template FROM `{!MYSQL_PREFIX!}_admins_mails` AS m, `{!MYSQL_PREFIX!}_admins` AS a WHERE m.admin_id=a.id OR m.admin_id < 1 ORDER BY m.admin_id", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT DISTINCT m.id, m.admin_id, a.login, m.mail_template FROM `{!_MYSQL_PREFIX!}_admins_mails` AS m, `{!_MYSQL_PREFIX!}_admins` AS a WHERE m.admin_id=a.id OR m.admin_id < 1 ORDER BY m.admin_id", __FILE__, __LINE__);
                }
 
                // List found entries
                $SW = 2; $OUT = "";
-               while(list($id, $aid, $admin, $templ) = SQL_FETCHROW($result))
+               while (list($id, $aid, $admin, $templ) = SQL_FETCHROW($result))
                {
                        if ($aid > 0)
                        {
                                // Admin assigned
-                               $admin_link = "<a href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</a>";
+                               $admin_link = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$aid."\">".$admin."</a>";
                        }
                         elseif ($aid == 0)
                        {