X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=9ef88e563553176ffc2be97e1b7978411ed88b5b;hb=e5dde615db05fb62ebe91bd1c030f40c9b91fe17;hp=9374445cd938706a3b7f02e60c1f96b317c0b718;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 9374445cd9..9ef88e5635 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -1,7 +1,7 @@
0) && ($ID == '-1')) $ID = $stats_id;
@@ -115,32 +116,41 @@ 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' => "".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."",
- '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' => '' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '',
+ '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
$OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
@@ -149,23 +159,23 @@ 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
loadTemplate('admin_list_unconfirmed', false, $content);
- } elseif (getRequestElement('mid') > 0) {
+ } elseif (getRequestParameter('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__);
@@ -174,26 +184,26 @@ WHERE
if (SQL_NUMROWS($result1) == 1) {
// pool table
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
} elseif (SQL_NUMROWS($result2) == 1) {
// user_stats table
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING'), $ID));
+ 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
SQL_FREERESULT($result1);
SQL_FREERESULT($result2);
- } elseif (isGetRequestElementSet('bid')) {
+ } 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]
?>