X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=4a587650fef264db9ac372ae78d4a9823add474f;hb=cd926dbdfbb2b3b16ecc932f17ecf4f367bc73e4;hp=ffbde1c309d580a5f2d62b010981ffc67172b91e;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index ffbde1c309..4a587650fe 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -56,8 +56,8 @@ $listed = false;
// List confirmation links from normal or bonus mails
if (isGetRequestParameterSet('mid')) {
// SQL query for mail data
- $sql = "SELECT
- s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec
+ $sql = sprintf("SELECT
+ s.`id`, p.`sender`, p.`subject`, p.`text`, p.`url`, p.`timestamp`, s.`max_rec`
FROM
`{?_MYSQL_PREFIX?}_pool` AS p
LEFT JOIN
@@ -65,8 +65,10 @@ LEFT JOIN
ON
p.id=s.pool_id
WHERE
- p.id='".getRequestParameter('mid')."'
-LIMIT 1";
+ p.`id`=%s
+LIMIT 1",
+ array(bigintval(getRequestParameter('mid')))
+ );
// Column, type and id for member's mail
$col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
@@ -74,10 +76,18 @@ 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', '{--ADMIN_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";
+ $sql = sprintf("SELECT
+ `id`, `id` AS `sender`, `subject`, `text`, `url`, `timestamp`, `mails_sent` AS `max_rec`
+FROM
+ `{?_MYSQL_PREFIX?}_bonus`
+WHERE
+ `id`=%s
+LIMIT 1",
+ array(bigintval(getRequestParameter('bid')))
+ );
// Column, type and id for member's mail
$col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
@@ -86,7 +96,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,50 +107,58 @@ if ($listed === true) {
// Do we have an entry?
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);
+ $poolData = SQL_FETCHARRAY($result_master);
// Transfer data to constants for the template
- if (($stats_id > 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
@@ -150,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 (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, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
- } elseif (SQL_NUMROWS($result2) == 1) {
+ } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
// user_stats table
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 (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]
?>