// 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
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';
// 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', '{--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');
// 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, $subject, $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'
+ l.`%s`=%s
ORDER BY
- l.userid ASC
+ l.`userid` ASC
LIMIT %s",
array(
$col,
$ID,
- bigintval($max)
+ bigintval($poolData['max_rec'])
),__FILE__, __LINE__);
- // Total number of unconfirmed mails
- $unconfirmed = SQL_NUMROWS($result);
-
- if ($unconfirmed > 0) {
+ // Do we have entries?
+ if (SQL_NUMROWS($result) > 0) {
// At least one link left to confirm
- $OUT = ''; $SW = 2;
+ $OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
// User data found? We can take any field of u.
if (!is_null($content['status'])) {
// Prepare data for the row template
$content = array(
- 'sw' => $SW,
'userid' => $content['userid'],
'link' => $LINK,
'id' => $ID,
// Load row template and switch colors
$OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
} else {
- // Insert color-switch
- $content['sw'] = $SW;
-
// No user data found
$OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $content);
}
-
- // Switch color
- $SW = 3 - $SW;
} // END - while
// Render it in our new listing
$OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
-
- // Free memory
- 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, '{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');
}
// Prepare content
- $content = array(
- 'sender' => $sender,
- 'subject' => $subject,
- 'text' => $text,
- 'url' => $url,
- 'unconfirmed' => $unconfirmed,
- 'stamp' => generateDateTime($stamp, 2),
- 'rows' => $OUT
- );
+ $content['unconfirmed'] = SQL_NUMROWS($result);
+ $content['timestamp'] = generateDateTime($poolData['timestamp'], 2);
+ $content['rows'] = $OUT;
+
+ // Free memory
+ SQL_FREERESULT($result);
// 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, '{--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, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
projects / mailer.git / blobdiff