Filters for configurable userid exclusion added:

[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 879559439057e743f9c00757bab9013576322fc9..32587a5840258770dc057b5a93b2333c49854652 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -108,21 +108,21 @@ if (isFormSent('edit')) {
 } else {
        // Load all assigned mails
        $result = SQL_QUERY("SELECT
-       m.`id`,
-       m.`admin_id`,
-       a.`login`,
-       m.`mail_template`
+       `m`.`id`,
+       `m`.`admin_id`,
+       `a`.`login`,
+       `m`.`mail_template`
 FROM
        `{?_MYSQL_PREFIX?}_admins_mails` AS `m`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_admins` AS `a`
 ON
-       m.`admin_id`=a.`id`
+       `m`.`admin_id`=`a`.`id`
 WHERE
-       (m.`admin_id`=a.`id` OR m.`admin_id` < 1) AND m.`mail_template` != ''
+       (`m`.`admin_id`=`a`.`id` OR `m`.`admin_id` < 1) AND `m`.`mail_template` != ''
 ORDER BY
-       m.`admin_id` ASC,
-       m.`mail_template` ASC", __FILE__, __LINE__);
+       `m`.`admin_id` ASC,
+       `m`.`mail_template` ASC", __FILE__, __LINE__);
 
        if (!SQL_HASZERONUMS($result)) {
                // Shall I change entries?
@@ -158,18 +158,21 @@ ORDER BY
 
                        // Query again...
                        $result = SQL_QUERY("SELECT
-       m.id, m.admin_id, a.login, m.mail_template
+       `m`.`id`,
+       `m`.`admin_id`,
+       `a`.`login`,
+       `m`.`mail_template`
 FROM
-       `{?_MYSQL_PREFIX?}_admins_mails` AS m
+       `{?_MYSQL_PREFIX?}_admins_mails` AS `m`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_admins` AS a
+       `{?_MYSQL_PREFIX?}_admins` AS `a`
 ON
-       m.admin_id=a.id
+       `m`.`admin_id`=`a`.`id`
 WHERE
-       (m.admin_id=a.id OR m.admin_id < 1) AND m.mail_template != ''
+       (`m`.`admin_id`=`a`.`id` OR `m`.`admin_id` < 1) AND `m`.`mail_template` != ''
 ORDER BY
-       m.admin_id ASC,
-       m.mail_template ASC", __FILE__, __LINE__);
+       `m`.`admin_id` ASC,
+       `m`.`mail_template` ASC", __FILE__, __LINE__);
                } // END - if
 
                // List found entries