Introduced padLeftZero()

[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 47f0fa9dfab9324916e8901d787ffa0d2bc47dcc..879559439057e743f9c00757bab9013576322fc9 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -50,7 +50,7 @@ if (isFormSent('edit')) {
                $rows = '';
                foreach (postRequestElement('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` ASC",
+                       $result = SQL_QUERY_ESC("SELECT `admin_id`, `id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `id` ASC",
                                array($template), __FILE__, __LINE__);
                        $OUT = '';
                        $adminId2 = '0'; $id = '0';
@@ -87,20 +87,20 @@ 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);
+                               $OUT .= loadTemplate('admin_admins_mails_edit_form', TRUE, $content);
                        } // END - if
 
                        // Save full rendered content
                        $content['content'] = $OUT;
 
                        // Start outputing line
-                       $rows .= loadTemplate('admin_admins_mails_edit_row', true, $content);
+                       $rows .= loadTemplate('admin_admins_mails_edit_row', TRUE, $content);
                } // END - foreach
 
                // Edit checked entries
-               loadTemplate('admin_admins_mails_edit', false, $rows);
+               loadTemplate('admin_admins_mails_edit', FALSE, $rows);
        } else {
                // Nothing selected
                displayMessage('{--ADMINS_NO_MAIL_CHECKED--}');
@@ -108,18 +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
+       `{?_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__);
 
        if (!SQL_HASZERONUMS($result)) {
                // Shall I change entries?
@@ -135,18 +138,18 @@ ORDER BY
 
                                // Update entry
                                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));
+                                       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));
+                                       array(postRequestElement('template', $id), $id), __FILE__, __LINE__, FALSE));
                                } // END - if
 
                                if (postRequestElement('admin_new', postRequestElement('template', $id)) > 0) {
                                        // Add new admin
                                        addSql(SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
-                                       array($content['admin_id'], postRequestElement('template', $id)), __FILE__, __LINE__, false));
+                                       array($content['admin_id'], postRequestElement('template', $id)), __FILE__, __LINE__, FALSE));
                                } // END - if
                        } // END - foreach
 
@@ -173,14 +176,14 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Load row template
-                       $OUT .= loadTemplate('admin_admins_mails_list_row', true, $content);
+                       $OUT .= loadTemplate('admin_admins_mails_list_row', TRUE, $content);
                } // END - while
 
                // Free result
                SQL_FREERESULT($result);
 
                // Load template
-               loadTemplate('admin_admins_mails_list', false, $OUT);
+               loadTemplate('admin_admins_mails_list', FALSE, $OUT);
        } else {
                // No entries found
                displayMessage('{--ADMIN_ADMINS_MAILS_NO_ENTRIES--}');