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

[mailer.git] / inc / modules / admin / what-unlock_emails.php

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 6d26db812cfefc04a2b7a5d512797b2b2793e51b..20687f46a648aab96097cca5fb99abebe77b9406 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -61,7 +61,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (REQUEST_ISSET_POST(('lock')))) {
                // Are there checked boxes?
                if (count(REQUEST_POST('sel')) > 0) {
                        // Count now... We use an own function for now
-                       $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
+                       $SEL = countPostSelection();
                } // END - if
        } // END - if
 
@@ -109,19 +109,19 @@ LIMIT 1",
                                        $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", array(), $DATA['sender']);
 
                                        // Send email
-                                       SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
+                                       sendEmail($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
 
                                        // Unlock selected email
-                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='NEW' WHERE `id`=%s AND data_type='ADMIN' LIMIT 1",
                                                array($id), __FILE__, __LINE__);
                                } // END - if
                        } // END - foreach
 
                        // Set message
-                       $message = ADMIN_MAILS_ACTIVATED;
+                       $message = getMessage('ADMIN_MAILS_ACTIVATED');
                } else {
                        // Nothing checked!
-                       $message = ADMIN_MAILS_NOTHING_CHECKED;
+                       $message = getMessage('ADMIN_MAILS_NOTHING_CHECKED');
                }
 
                // Mails unlocked for mail delivery
@@ -135,7 +135,7 @@ LIMIT 1",
                                $id = bigintval($id);
 
                                // Load URL and subject from pool
-                               $result = SQL_QUERY_ESC("SELECT url, subject, sender FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT url, subject, sender FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
                                        array($id), __FILE__, __LINE__);
 
                                // Load data
@@ -146,13 +146,13 @@ LIMIT 1",
 
                                // Load email template and send it away
                                $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", array(), $DATA['sender']);
-                               SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
+                               sendEmail($DATA['sender'], getMessage('MEMBER_ORDER_REJECTED'), $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                if ((!REQUEST_ISSET_POST(('redirect'))) || (REQUEST_POST('redirect') == "http://")) REQUEST_SET_POST('redirect', constant('URL'));
 
                                // Redirect URL
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE `id`=%s LIMIT 1",
                                        array(REQUEST_POST('redirect'), $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
@@ -204,15 +204,15 @@ LIMIT 1",
                                'sw'        => $SW,
                                'id'        => $content['id'],
                                'sender'    => $content['sender'],
-                               'u_link'    => ADMIN_USER_PROFILE_LINK($content['sender']),
+                               'u_link'    => generateUserProfileLink($content['sender']),
                                'subj'      => COMPILE_CODE($content['subject']),
                                'tester'    => FRAMETESTER($content['url']),
                                'url'       => $content['url'],
-                               'cat_title' => str_replace("\"", """, GET_CATEGORY($content['category'])),
+                               'cat_title' => str_replace("\"", """, getCategory($content['category'])),
                                'cat_link'  => $content['category'],
-                               'pay_title' => str_replace("\"", """, GET_PAYMENT($content['payment'], true)),
+                               'pay_title' => str_replace("\"", """, getPaymentTitlePrice($content['payment'], true)),
                                'pay_link'  => $content['payment'],
-                               'ordered'   => MAKE_DATETIME($content['timestamp'], "2"),
+                               'ordered'   => generateDateTime($content['timestamp'], "2"),
                                'tsend'     => $content['target_send'],
                        );