New naming convention applied to many functions, see #118 for details

[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 0f67efc615dfdd5a45a5b398e3581958fab399bc..7d9bbc2c929bec3e09e7eec96f560495037bd164 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -47,10 +47,10 @@ 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
@@ -61,14 +61,14 @@ if (REQUEST_ISSET_POST('edit')) {
                                // @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"';
                                        $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,7 +128,7 @@ 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",
+                               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))) {
@@ -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