Updated copyright notice as there are changes in this year

[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 4a87666826a430d99a2ddff5ef2f26486f9a8397..6d48d8ee22b8f74b6ab7fa994b8cd232d4e0d999 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -58,21 +58,21 @@ $sql = '';
 if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
        // SQL query for mail data
        $sql = sprintf("SELECT
-       s.`id`,
+       `s`.`id`,
        `p`.`sender`,
        `p`.`subject`,
        `p`.`text`,
        `p`.`url`,
        `p`.`timestamp`,
-       s.`max_rec`
+       `s`.`max_rec`
 FROM
        `{?_MYSQL_PREFIX?}_pool` AS `p`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_stats` AS `s`
 ON
-       `p`.`id`=s.`pool_id`
+       `p`.`id`=`s`.`pool_id`
 WHERE
-       `p`.`id`=%s
+       `s`.`pool_id`=%s
 LIMIT 1",
                bigintval(getRequestElement('id'))
        );
@@ -86,13 +86,10 @@ LIMIT 1",
        $listed = TRUE;
        $DATA = getRequestElement('id');
 } elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (isExtensionActive('bonus'))) {
-       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
-
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
-       // @TODO `id` has been used two times???
        $sql = sprintf("SELECT
        `id`,
-       `id` AS `sender`,
+       NULL AS `sender`,
        `subject`,
        `text`,
        `url`,
@@ -143,7 +140,7 @@ if (($listed === TRUE) && (!empty($sql))) {
                // 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
-       l.`userid`,
+       `l`.`userid`,
        `u`.`status`,
        `u`.`surname`,
        `u`.`family`,
@@ -154,11 +151,11 @@ FROM
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `u`
 ON
-       l.`userid`=`u`.`userid`
+       `l`.`userid`=`u`.`userid`
 WHERE
-       l.`%s`=%s
+       `l`.`%s`=%s
 ORDER BY
-       l.`userid` ASC
+       `l`.`userid` ASC
 LIMIT %s",
                        array(
                                $col,