Now debug_report_bug() will be called if ext_name or ext_ver is empty which should...

[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 a39dedae8851c90a75e7daeed55a34b4b1d7b9da..a004f02bf099fc905dd0aa66bdbb87eee81e23a5 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -47,28 +47,28 @@ ADD_DESCR('admin', __FILE__);
 
 if (REQUEST_ISSET_POST('edit')) {
        // Check if entires are checked
-       $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+       $SEL = countPostSelection();
        if ($SEL > 0) {
                // Add option for events
-               $GLOBALS['cache_array']['admins'] = ADD_OPTION_LINES('admins', "id", "login", '', 'email');
+               $GLOBALS['cache_array']['admins'] = generateOptionList('admins', 'id', "login", '', 'email');
                $SW = 2; $rowNameS = '';
                foreach (REQUEST_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`",
-                               array($template), __FILE__, __LINE__);
+                       array($template), __FILE__, __LINE__);
                        $OUT = ''; $aid2 = 0;
                        while ($content = SQL_FETCHARRAY($result)) {
                                // @TODO Can this be rewritten???
                                $OUT .= "<select name=\"admin_id[".$content['id']."]\" size=\"1\" class=\"admin_select\">
 <option value=\"0\"";
-                               if ($content['admin_id'] == "0") $OUT .= " selected=\"selected\"";
+                               if ($content['admin_id'] == '0') $OUT .= ' selected="selected"';
                                $OUT .=">{--ADMINS_ALL_ADMINS--}</option>\n";
                                if (EXT_IS_ACTIVE('events')) {
                                        $OUT .= "<option value=\"-1\"";
-                                       if ($content['admin_id'] == "-1") $OUT .= " selected=\"selected\"";
+                                       if ($content['admin_id'] == '-1') $OUT .= ' selected="selected"';
                                        $OUT .= ">{--ADMINS_TO_USER_EVENTS--}</option>\n";
                                }
-                               $OUT .= ADD_OPTION_LINES('admins', "id", "login", $content['admin_id'], 'email');
+                               $OUT .= generateOptionList('admins', 'id', "login", $content['admin_id'], 'email');
                                $OUT .= "</select>\n<br />\n";
                                $aid2 = $content['admin_id']; $id2 = $content['id'];
                        }
@@ -128,19 +128,19 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
                                $content['admin_id'] = bigintval($content['admin_id']);
 
                                // Update entry
-                               ADD_SQL(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));
+                               ADD_SQL(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 (($content['admin_id'] < 1) && (REQUEST_ISSET_POST('template', $id))) {
                                        // Remove any other admin entries
                                        ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
-                                               array(REQUEST_POST('template', $id), $id), __FILE__, __LINE__, false));
+                                       array(REQUEST_POST('template', $id), $id), __FILE__, __LINE__, false));
                                } // END - if
 
                                if (REQUEST_POST('admin_new', REQUEST_POST('template', $id)) > 0) {
                                        // Add new admin
                                        ADD_SQL(SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
-                                               array($content['admin_id'], REQUEST_POST('template', $id)), __FILE__, __LINE__, false));
+                                       array($content['admin_id'], REQUEST_POST('template', $id)), __FILE__, __LINE__, false));
                                } // END - if
                        } // END - foreach
 
@@ -159,7 +159,7 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
                                'sw'   => $SW,
                                'id'   => $data['id'],
                                'tpl'  => $data['mail_template'],
-                               'alnk' => GENERATE_AID_LINK($data['admin_id'])
+                               'alnk' => generateAdminLink($data['admin_id'])
                        );
 
                        // Load row template