} // END - if
// Don't load the admin_list_unconfirmed template by default
-$listed = false;
+$listed = FALSE;
// Init query
$sql = '';
// List confirmation links from normal or bonus mails
-if (isGetRequestElementSet('mid')) {
+if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
// SQL query for mail data
$sql = sprintf("SELECT
- s.`id`, p.`sender`, p.`subject`, p.`text`, p.`url`, p.`timestamp`, s.`max_rec`
+ `s`.`id`,
+ `p`.`sender`,
+ `p`.`subject`,
+ `p`.`text`,
+ `p`.`url`,
+ `p`.`timestamp`,
+ `s`.`max_rec`
FROM
- `{?_MYSQL_PREFIX?}_pool` AS p
+ `{?_MYSQL_PREFIX?}_pool` AS `p`
LEFT JOIN
- `{?_MYSQL_PREFIX?}_user_stats` AS s
+ `{?_MYSQL_PREFIX?}_user_stats` AS `s`
ON
- p.id=s.pool_id
+ `p`.`id`=`s`.`pool_id`
WHERE
- p.`id`=%s
+ `p`.`id`=%s
LIMIT 1",
- bigintval(getRequestElement('mid'))
+ bigintval(getRequestElement('id'))
);
// Column, type and id for member's mail
$ID = -1;
// Load admin_list_unconfirmed template
- $listed = true;
- $DATA = getRequestElement('mid');
- $mailType = 'mailid';
-} elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
+ $listed = TRUE;
+ $DATA = getRequestElement('id');
+} elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (isExtensionActive('bonus'))) {
// @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
+ // @TODO `id` has been used two times???
$sql = sprintf("SELECT
- `id`,`id` AS `sender`,`subject`,`text`,`url`,`timestamp`,`mails_sent` AS `max_rec`
+ `id`,
+ `id` AS `sender`,
+ `subject`,
+ `text`,
+ `url`,
+ `timestamp`,
+ `mails_sent` AS `max_rec`
FROM
`{?_MYSQL_PREFIX?}_bonus`
WHERE
`id`=%s
LIMIT 1",
- bigintval(getRequestElement('bid'))
+ bigintval(getRequestElement('id'))
);
// Column, type and id for member's mail
$col = 'bonus_id';
$type = 'BONUS';
- $ID = getRequestElement('bid');
+ $ID = getRequestElement('id');
// Load admin_list_unconfirmed template
- $listed = true;
+ $listed = TRUE;
$DATA = $ID;
- $mailType = 'bonusid';
} else {
// @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
displayMessage('{--ADMIN_CALL_NOT_DIRECTLY--}');
}
// Shall I display links or not?
-if (($listed === true) && (!empty($sql))) {
+if (($listed === TRUE) && (!empty($sql))) {
// Load mail data
$result_master = SQL_QUERY($sql, __FILE__, __LINE__);
- // Do we have an entry?
+ // Is there an entry?
if (SQL_NUMROWS($result_master) == 1) {
// Mail order / bonus mail found
$poolData = SQL_FETCHARRAY($result_master);
// 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`
+ `u`.`status`,
+ `u`.`surname`,
+ `u`.`family`,
+ `u`.`gender`,
+ `u`.`email`
FROM
`{?_MYSQL_PREFIX?}_user_links` AS `l`
LEFT JOIN
`{?_MYSQL_PREFIX?}_user_data` AS `u`
ON
- l.`userid`=u.`userid`
+ l.`userid`=`u`.`userid`
WHERE
l.`%s`=%s
ORDER BY
bigintval($poolData['max_rec'])
),__FILE__, __LINE__);
- // Do we have entries?
+ // Are there entries?
if (!SQL_HASZERONUMS($result)) {
// At least one link left to confirm
$OUT = '';
// Prepare data for the row template
$row = array(
'userid' => $row['userid'],
- 'link' => $mailType,
+ 'type' => getRequestElement('type'),
'id' => $ID,
'email' => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
'status' => $row['status'],
);
// Load row template and switch colors
- $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $row);
+ $OUT .= loadTemplate('admin_list_unconfirmed_row', TRUE, $row);
} else {
// No user data found
- $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $row);
+ $OUT .= loadTemplate('admin_list_unconfirmed_row_404', TRUE, $row);
}
} // END - while
// Render it in our new listing
- $OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
+ $OUT = loadTemplate('admin_list_unconfirmed_list', TRUE, $OUT);
} else {
// All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
- $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', true);
+ $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', TRUE);
}
// Prepare content
SQL_FREERESULT($result);
// Load final template
- loadTemplate('admin_list_unconfirmed', false, $content);
- } elseif (getRequestElement('mid') > 0) {
+ loadTemplate('admin_list_unconfirmed', FALSE, $content);
+ } elseif (getRequestElement('id') > 0) {
// Data in pool or in user_stats not found, so let's find out where data is missing
- if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', true) == 1) {
+ if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', TRUE) == 1) {
// pool table
displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
- } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
+ } elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', TRUE) == 1) {
// user_stats table
displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
} else {
// both or link is invalid
displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
}
- } elseif (isGetRequestElementSet('bid')) {
+ } elseif ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) {
// Data in bonus table not found
displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
}
projects / mailer.git / blobdiff