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

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

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index cc64e36d48208b2838b1cd0c46b5dee4ea14edff..da4767d126da84a912920583403dcc0375417081 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -69,7 +69,7 @@ WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
        define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
-       $sql = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".REQUEST_GET('bid')."' LIMIT 1";
+       $sql = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`='".REQUEST_GET('bid')."' LIMIT 1";
 
        // Column, type and ID for member's mail
        $col = 'bonus_id'; $type = "BONUS"; $ID = REQUEST_GET('bid');
@@ -116,12 +116,12 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                                // @TODO Rewritings: uid->userid
                                $content = array(
                                        'sw'     => $SW,
-                                       'u_link' => ADMIN_USER_PROFILE_LINK($content['userid']),
+                                       'u_link' => generateUserProfileLink($content['userid']),
                                        'uid'    => $content['userid'],
                                        'link'   => $LINK,
                                        'id'     => $ID,
-                                       'email'  => "<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".TRANSLATE_GENDER($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
-                                       'status' => TRANSLATE_STATUS($content['status']),
+                                       'email'  => "<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
+                                       'status' => translateUserStatus($content['status']),
                                );
 
                                // Load row template and switch colors
@@ -147,7 +147,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                        'text'          => COMPILE_CODE($text),
                        'url'           => FRAMETESTER($url),
                        'unconfirmed'   => $unconfirmed,
-                       'stamp'         => MAKE_DATETIME($stamp, "2"),
+                       'stamp'         => generateDateTime($stamp, "2"),
                        'rows'          => $OUT
                );
 
@@ -155,9 +155,9 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                LOAD_TEMPLATE("admin_list_unconfirmed", false, $content);
        } elseif (REQUEST_GET('mid') > 0) {
                // Data in pool or in user_stats not found, so let's find out where data is missing
-               $result1 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+               $result1 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
                        array(bigintval($ID)), __FILE__, __LINE__);
-               $result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+               $result2 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
                        array(bigintval($ID)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result1) == 1) {
                        // pool table