X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=4a587650fef264db9ac372ae78d4a9823add474f;hb=528cb262219d23d8023ec549cd168edb71ef409c;hp=57cb5aea2da6787f3789f65d1d2805aee93a748d;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 57cb5aea2d..4a587650fe 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;
- if ($col == 'bonus_id') $sender = '0';
+ if (($poolData['id'] > 0) && ($ID == '-1')) $ID = $poolData['id'];
+ if ($col == 'bonus_id') $poolData['sender'] = '0';
// 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
- l.userid, u.status, u.surname, u.family, u.gender, u.email
+ l.`userid`, u.`status`, u.`surname`, u.`family`, u.`gender`, u.`email`
FROM
- `{?_MYSQL_PREFIX?}_user_links` AS l
+ `{?_MYSQL_PREFIX?}_user_links` AS `l`
LEFT JOIN
- `{?_MYSQL_PREFIX?}_user_data` AS u
+ `{?_MYSQL_PREFIX?}_user_data` AS `u`
ON
- l.userid=u.userid
+ 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($poolData['max_rec'])
+ ),__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,51 +168,36 @@ 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
- );
+ $content['unconfirmed'] = $unconfirmed;
+ $content['timestamp'] = generateDateTime($poolData['timestamp'], 2);
+ $content['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__);
- $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) {
+ if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', true) == 1) {
// pool table
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
- } elseif (SQL_NUMROWS($result2) == 1) {
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
+ } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 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]
?>