X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=2d57bc67158630dc855c8bf3388982df3678ca88;hb=fd0bc034f4e10c4b0feb28e85dc302ddce919339;hp=f4cc43fd957374cd535d1d23c0151fa6c2dde71b;hpb=a8bd79b725c4ce504d83be1e2ebb714d61927fb1;p=mailer.git

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index f4cc43fd95..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
@@ -76,7 +77,7 @@ 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', '{--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 = sprintf("SELECT
@@ -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__);
 
@@ -135,47 +136,46 @@ LIMIT %s",
 				bigintval($poolData['max_rec'])
 			),__FILE__, __LINE__);
 
-		// Total number of unconfirmed mails
-		$unconfirmed = SQL_NUMROWS($result);
-
-		if ($unconfirmed > 0) {
+		// Do we have entries?
+		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'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
-						'status' => $content['status'],
+						'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '</a>',
+						'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
 
 			// 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['unconfirmed'] = $unconfirmed;
+		$content                = $poolData;
+		$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) {