A lot code rewritten:

[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 568ebf4c63f6bba687a54c8f0fd23f6b40c6bd88..9ef88e563553176ffc2be97e1b7978411ed88b5b 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -73,7 +74,7 @@ LIMIT 1";
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
-       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--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`='".getRequestParameter('bid')."' LIMIT 1";
@@ -85,7 +86,7 @@ LIMIT 1";
        $listed = true; $DATA = $ID; $LINK = 'bonusid';
 } else {
        // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}');
 }
 
 // Shall I display links or not?
@@ -97,7 +98,7 @@ if ($listed === true) {
        if (SQL_NUMROWS($result_master) == 1) {
                // Mail order / bonus mail found!
                // @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
-               list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result_master);
+               list($stats_id, $sender, $subject, $text, $url, $stamp, $max) = SQL_FETCHROW($result_master);
 
                // Transfer data to constants for the template
                if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
@@ -115,31 +116,40 @@ LEFT JOIN
 ON
        l.userid=u.userid
 WHERE
-       l.%s='%s' ORDER BY l.userid LIMIT %s",
-                       array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+       l.%s='%s'
+ORDER BY
+       l.userid ASC
+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;
+                       $OUT = '';
                        while ($content = SQL_FETCHARRAY($result)) {
-                               // Prepare data for the row template
-                               // @TODO Rewritings: userid->userid
-                               $content = array(
-                                       'sw'     => $SW,
-                                       'u_link' => generateUserProfileLink($content['userid']),
-                                       'userid' => $content['userid'],
-                                       'link'   => $LINK,
-                                       'id'     => $ID,
-                                       '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 .= loadTemplate('admin_list_unconfirmed_row', true, $content);
-                               $SW = 3 - $SW;
+                               // User data found? We can take any field of u.
+                               if (!is_null($content['status'])) {
+                                       // Prepare data for the row template
+                                       $content = array(
+                                               'userid' => $content['userid'],
+                                               'link'   => $LINK,
+                                               'id'     => $ID,
+                                               'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
+                                               'status' => $content['status'],
+                                       );
+
+                                       // Load row template and switch colors
+                                       $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
+                               } else {
+                                       // No user data found
+                                       $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $content);
+                               }
                        } // END - while
 
                        // Render it in our new listing
@@ -149,18 +159,18 @@ WHERE
                        SQL_FREERESULT($result);
                } else {
                        // All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
-                       $OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT'));
+                       $OUT = loadTemplate('admin_settings_saved', true, '{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');
                }
 
                // Prepare content
                $content = array(
-                       'sender_link'   => generateUserProfileLink($sender),
-                       'subject'       => $subj,
-                       'text'          => $text,
-                       'url'           => generateFrametesterUrl($url),
-                       'unconfirmed'   => $unconfirmed,
-                       'stamp'         => generateDateTime($stamp, 2),
-                       'rows'          => $OUT
+                       'sender'      => $sender,
+                       'subject'     => $subject,
+                       'text'        => $text,
+                       'url'         => $url,
+                       'unconfirmed' => $unconfirmed,
+                       'stamp'       => generateDateTime($stamp, 2),
+                       'rows'        => $OUT
                );
 
                // Load final template
@@ -180,7 +190,7 @@ WHERE
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
                } else {
                        // both or link is invalid
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
                }
 
                // Free memory
@@ -188,12 +198,12 @@ WHERE
                SQL_FREERESULT($result2);
        } elseif (isGetRequestParameterSet('bid')) {
                // Data in bonus table not found
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
        }
 
        // Free result
        SQL_FREERESULT($result_master);
-}
+} // END - if
 
 // [EOF]
 ?>