X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=420a0852c41cbb42d6ceec3076a51158223770f1;hp=2049183e5b4ec41219d41602944e1ddeca1d2e8b;hb=c4823d28fd0bd22250b16d73f2034f36fc54abda;hpb=6bb119cb426a2ab3998a5c3dfe250d748f786a1c

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 2049183e5b..420a0852c4 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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,14 +68,14 @@ ON
 WHERE
 	p.`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestParameter('mid')))
+		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';
+	$listed = true; $DATA = getRequestParameter('mid'); $mailType = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
 	// @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
 
@@ -86,32 +87,38 @@ FROM
 WHERE
 	`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestParameter('bid')))
+		bigintval(getRequestParameter('bid'))
 	);
 
 	// Column, type and id for member's mail
 	$col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('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--}');
 }
 
 // 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?
 	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
@@ -136,26 +143,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'],
-						'link'   => $LINK,
+					$row = array(
+						'userid' => $row['userid'],
+						'link'   => $mailType,
 						'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
 
@@ -167,6 +174,7 @@ LIMIT %s",
 		}
 
 		// Prepare content
+		$content                = $poolData;
 		$content['unconfirmed'] = SQL_NUMROWS($result);
 		$content['timestamp']   = generateDateTime($poolData['timestamp'], 2);
 		$content['rows']        = $OUT;