Heavy rewrite:

[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 521cc90c12149b13d5a78719e5d1edf927fb9ef7..083b193efc07275ac255ef0300641b8b752ba009 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -52,27 +52,34 @@ ADD_DESCR('admin', __FILE__);
 $listed = false;
 
 // List confirmation links from normal or bonus mails
-if (REQUEST_ISSET_GET(('mid'))) {
+if (REQUEST_ISSET_GET('mid')) {
        // SQL query for mail data
-       $sql = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec  FROM `{!_MYSQL_PREFIX!}_pool` AS p
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_stats` AS s
-ON p.id=s.pool_id
-WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
+       $sql = "SELECT
+       s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec
+FROM
+       `{!_MYSQL_PREFIX!}_pool` AS p
+LEFT JOIN
+       `{!_MYSQL_PREFIX!}_user_stats` AS s
+ON
+       p.id=s.pool_id
+WHERE
+       p.id='".REQUEST_GET('mid')."'
+LIMIT 1";
 
        // Column, type and ID for member's mail
-       $col = "stats_id"; $type = "NORMAL"; $ID = '-1';
+       $col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = REQUEST_GET('mid'); $LINK = 'mailid';
-} elseif ((REQUEST_ISSET_GET(('bid'))) && (EXT_IS_ACTIVE('bonus'))) {
+} elseif ((REQUEST_ISSET_GET('bid')) && (EXT_IS_ACTIVE('bonus'))) {
        // @TODO This constant might be unused?
        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');
+       $col = 'bonus_id'; $type = 'BONUS'; $ID = REQUEST_GET('bid');
 
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = $ID; $LINK = 'bonusid';
@@ -98,18 +105,23 @@ if ($listed === true) {
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
-               //
-               $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email
-FROM `{!_MYSQL_PREFIX!}_user_links` AS l
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u
-ON l.userid=u.userid
-WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
-               array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT
+       l.userid, u.status, u.surname, u.family, u.gender, u.email
+FROM
+       `{!_MYSQL_PREFIX!}_user_links` AS l
+LEFT JOIN
+       `{!_MYSQL_PREFIX!}_user_data` AS u
+ON
+       l.userid=u.userid
+WHERE
+       l.%s='%s' ORDER BY l.userid LIMIT %s",
+                       array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+
+               // Total number of unconfirmed mails
                $unconfirmed = SQL_NUMROWS($result);
 
                if ($unconfirmed > 0) {
                        // At least one link left to confirm
-
                        $OUT = ''; $SW = 2;
                        while ($content = SQL_FETCHARRAY($result)) {
                                // Prepare data for the row template
@@ -120,17 +132,17 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                                        'uid'    => $content['userid'],
                                        'link'   => $LINK,
                                        'id'     => $ID,
-                                       'email'  => "<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
+                                       'email'  => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
                                        'status' => translateUserStatus($content['status']),
                                );
 
                                // Load row template and switch colors
-                               $OUT .= LOAD_TEMPLATE("admin_list_unconfirmed_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_list_unconfirmed_row', true, $content);
                                $SW = 3 - $SW;
                        }
 
                        // Render it in our new listing
-                       $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_list", true, $OUT);
+                       $OUT = LOAD_TEMPLATE('admin_list_unconfirmed_list', true, $OUT);
 
                        // Free memory
                        SQL_FREERESULT($result);
@@ -152,13 +164,14 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                );
 
                // Load final template
-               LOAD_TEMPLATE("admin_list_unconfirmed", false, $content);
+               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",
-               array(bigintval($ID)), __FILE__, __LINE__);
-               $result2 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
-               array(bigintval($ID)), __FILE__, __LINE__);
+                       array(bigintval($ID)), __FILE__, __LINE__);
+               $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
                        LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
@@ -173,7 +186,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                // Free memory
                SQL_FREERESULT($result1);
                SQL_FREERESULT($result2);
-       } elseif (REQUEST_ISSET_GET(('bid'))) {
+       } elseif (REQUEST_ISSET_GET('bid')) {
                // Data in bonus table not found
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
        }