Listing of coupons rewritten to more clear

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

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index c337642ab1d8b4734e2e784864ecdc5413725767..34e5aeeb039410a2b73404bc4399291202f04caf 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -55,11 +55,11 @@ if (isGetRequestParameterSet('userid')) {
                // @TODO Try to rewrite this to a filter
                if (isExtensionActive('bonus')) {
                        // Load bonus id
-                       $result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+                       $result = SQL_QUERY_ESC("SELECT `stats_id`,`bonus_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
                                array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
                } else {
                        // Load stats id (2nd will be ignored later! But it is needed for the same fetchrow command)
-                       $result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+                       $result = SQL_QUERY_ESC("SELECT `stats_id`,`stats_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
                                array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
                }
 
@@ -93,14 +93,14 @@ if (isGetRequestParameterSet('userid')) {
                                        // @TODO Rewrite this to includes/filter
                                        switch ($type) {
                                                case 'NORMAL':
-                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`,`timestamp_ordered` AS `timestamp`,`cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id)), __FILE__, __LINE__);
                                                        $type = 'mailid'; $DATA = $id; $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;mailid=' . $id . '%}" target="_blank">' . $id . '</a>';
                                                        break;
 
                                                case 'BONUS':
-                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`,`timestamp`,`cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id2)), __FILE__, __LINE__);
                                                        $type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
@@ -145,8 +145,6 @@ if (isGetRequestParameterSet('userid')) {
                                } // END - while
 
                                // Remember list in constant for the template
-                               $content['surname'] = getUserData('surname');
-                               $content['family']  = getUserData('family');
                                $content['email']   = '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>';
                                $content['rows']    = $OUT;
                                $content['nums']    = SQL_NUMROWS($result);
@@ -160,7 +158,7 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       displayMessage('{%message,ADMIN_MEMBER_LINKS=' . bigintval(getRequestParameter('userid')) . '%}');
+                       displayMessage('{%message,ADMIN_NO_UNCONFIRMED_MAILS_LEFT=' . bigintval(getRequestParameter('userid')) . '%}');
                }
        } else {
                // User not found