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 c0314f3313cdfd2059be97a0ada72550c53fe54a..32587a5840258770dc057b5a93b2333c49854652 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -87,7 +87,7 @@ if (isFormSent('edit')) {
                        $content['mail_template'] = $template;
                        $content['admins']        = generateOptions('admins', 'id', 'login', '', 'email');;
 
-                       if (isValidUserId($adminId2)) {
+                       if (isValidId($adminId2)) {
                                // Add form for an additional admin
                                $OUT .= loadTemplate('admin_admins_mails_edit_form', TRUE, $content);
                        } // END - if
@@ -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?
@@ -140,7 +140,7 @@ ORDER BY
                                addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_mails` SET `admin_id`=%s WHERE `id`=%s ORDER BY `id` LIMIT 1",
                                        array($content['admin_id'], $id), __FILE__, __LINE__, FALSE));
 
-                               if ((!isValidUserId($content['admin_id'])) && (isPostRequestElementSet('template', $id))) {
+                               if ((!isValidId($content['admin_id'])) && (isPostRequestElementSet('template', $id))) {
                                        // Remove any other admin entries
                                        addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
                                        array(postRequestElement('template', $id), $id), __FILE__, __LINE__, FALSE));
@@ -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