X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=5c137d098cd5c03741ce1ac4aeb2fba42755cd98;hp=9d2ec8d61e87554377095133d3004ade6b55ad82;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=b04bf0b2a4e9b50d35ef0d1e470a2497c420519b
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 9d2ec8d61e..5c137d098c 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -14,12 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -43,18 +41,21 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
if (!isExtensionActive('mailid')) {
- loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+ displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
return;
} // END - if
// Don't load the admin_list_unconfirmed template by default
$listed = false;
+// Init query
+$sql = '';
+
// List confirmation links from normal or bonus mails
-if (isGetRequestParameterSet('mid')) {
+if (isGetRequestElementSet('mid')) {
// SQL query for mail data
$sql = sprintf("SELECT
s.`id`, p.`sender`, p.`subject`, p.`text`, p.`url`, p.`timestamp`, s.`max_rec`
@@ -67,57 +68,76 @@ ON
WHERE
p.`id`=%s
LIMIT 1",
- bigintval(getRequestParameter('mid'))
+ bigintval(getRequestElement('mid'))
);
// Column, type and id for member's mail
- $col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
+ $col = 'stats_id';
+ $type = 'NORMAL';
+ $ID = -1;
// Load admin_list_unconfirmed template
- $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
-} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
+ $listed = true;
+ $DATA = getRequestElement('mid');
+ $mailType = 'mailid';
+} elseif ((isGetRequestElementSet('bid')) && (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
$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(getRequestParameter('bid'))
+ bigintval(getRequestElement('bid'))
);
// Column, type and id for member's mail
- $col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
+ $col = 'bonus_id';
+ $type = 'BONUS';
+ $ID = getRequestElement('bid');
// Load admin_list_unconfirmed template
- $listed = true; $DATA = $ID; $LINK = 'bonusid';
+ $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
- loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}');
+ displayMessage('{--ADMIN_CALL_NOT_DIRECTLY--}');
}
// Shall I display links or not?
-if ($listed === true) {
+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!
+ // Mail order / bonus mail found
$poolData = SQL_FETCHARRAY($result_master);
- // Transfer data to constants for the template
- if (($poolData['id'] > 0) && ($ID == '-1')) $ID = $poolData['id'];
- if ($col == 'bonus_id') $poolData['sender'] = '0';
+ // If there is a pool id and $ID is not set, we take it
+ if (($poolData['id'] > 0) && ($ID == '-1')) {
+ $ID = $poolData['id'];
+ } // END - if
+
+ // Bonus mails do always have a sender 'NULL'
+ if ($col == 'bonus_id') {
+ $poolData['sender'] = NULL;
+ } // END - if
// 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`
LEFT JOIN
@@ -135,8 +155,8 @@ LIMIT %s",
bigintval($poolData['max_rec'])
),__FILE__, __LINE__);
- // Do we have entries?
- if (SQL_NUMROWS($result) > 0) {
+ // Are there entries?
+ if (!SQL_HASZERONUMS($result)) {
// At least one link left to confirm
$OUT = '';
while ($row = SQL_FETCHARRAY($result)) {
@@ -145,9 +165,9 @@ LIMIT %s",
// Prepare data for the row template
$row = array(
'userid' => $row['userid'],
- 'link' => $LINK,
+ 'link' => $mailType,
'id' => $ID,
- 'email' => '' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '',
+ 'email' => '{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '',
'status' => $row['status'],
);
@@ -163,7 +183,7 @@ LIMIT %s",
$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 = loadTemplate('admin_settings_saved', true, '{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');
+ $OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', true);
}
// Prepare content
@@ -177,21 +197,21 @@ LIMIT %s",
// Load final template
loadTemplate('admin_list_unconfirmed', false, $content);
- } elseif (getRequestParameter('mid') > 0) {
+ } elseif (getRequestElement('mid') > 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) {
// pool table
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
+ displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
} 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));
+ displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
} else {
// both or link is invalid
- loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
+ displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
}
- } elseif (isGetRequestParameterSet('bid')) {
+ } elseif (isGetRequestElementSet('bid')) {
// Data in bonus table not found
- loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
+ displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
}
// Free result