X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=2d57bc67158630dc855c8bf3388982df3678ca88;hb=fd0bc034f4e10c4b0feb28e85dc302ddce919339;hp=2049183e5b4ec41219d41602944e1ddeca1d2e8b;hpb=c9510cf2a41f21f369e49f93ce9268d8bf1ace6b;p=mailer.git
diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 2049183e5b..2d57bc6715 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -14,8 +14,6 @@
* $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 *
@@ -43,7 +41,7 @@ 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'));
@@ -53,6 +51,9 @@ if (!isExtensionActive('mailid')) {
// 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')) {
// SQL query for mail data
@@ -67,7 +68,7 @@ ON
WHERE
p.`id`=%s
LIMIT 1",
- array(bigintval(getRequestParameter('mid')))
+ bigintval(getRequestParameter('mid'))
);
// Column, type and id for member's mail
@@ -86,7 +87,7 @@ FROM
WHERE
`id`=%s
LIMIT 1",
- array(bigintval(getRequestParameter('bid')))
+ bigintval(getRequestParameter('bid'))
);
// Column, type and id for member's mail
@@ -100,7 +101,7 @@ LIMIT 1",
}
// Shall I display links or not?
-if ($listed === true) {
+if (($listed === true) && (!empty($sql))) {
// Load mail data
$result_master = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -136,26 +137,26 @@ LIMIT %s",
),__FILE__, __LINE__);
// Do we have entries?
- if (SQL_NUMROWS($result) > 0) {
+ if (!SQL_HASZERONUMS($result)) {
// At least one link left to confirm
$OUT = '';
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($row = SQL_FETCHARRAY($result)) {
// User data found? We can take any field of u.
- if (!is_null($content['status'])) {
+ if (!is_null($row['status'])) {
// Prepare data for the row template
- $content = array(
- 'userid' => $content['userid'],
+ $row = array(
+ 'userid' => $row['userid'],
'link' => $LINK,
'id' => $ID,
- 'email' => '' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '',
- 'status' => $content['status'],
+ 'email' => '' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '',
+ 'status' => $row['status'],
);
// Load row template and switch colors
- $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
+ $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $row);
} else {
// No user data found
- $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $content);
+ $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $row);
}
} // END - while
@@ -167,6 +168,7 @@ LIMIT %s",
}
// Prepare content
+ $content = $poolData;
$content['unconfirmed'] = SQL_NUMROWS($result);
$content['timestamp'] = generateDateTime($poolData['timestamp'], 2);
$content['rows'] = $OUT;