X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=6d48d8ee22b8f74b6ab7fa994b8cd232d4e0d999;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hp=02479af987dbec95d27837c48284c8d0b90cac3c;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec;p=mailer.git

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 02479af987..6d48d8ee22 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,20 +55,26 @@ $listed = FALSE;
 $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
+	`s`.`pool_id`=%s
 LIMIT 1",
-		bigintval(getRequestElement('mid'))
+		bigintval(getRequestElement('id'))
 	);
 
 	// Column, type and id for member's mail
@@ -78,16 +84,12 @@ LIMIT 1",
 
 	// Load admin_list_unconfirmed template
 	$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--}');
-
+	$DATA = getRequestElement('id');
+} elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (isExtensionActive('bonus'))) {
 	// 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`,
+	NULL AS `sender`,
 	`subject`,
 	`text`,
 	`url`,
@@ -98,18 +100,17 @@ FROM
 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;
 	$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--}');
@@ -139,22 +140,22 @@ if (($listed === TRUE) && (!empty($sql))) {
 		// 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
 	`{?_MYSQL_PREFIX?}_user_data` AS `u`
 ON
-	l.`userid`=u.`userid`
+	`l`.`userid`=`u`.`userid`
 WHERE
-	l.`%s`=%s
+	`l`.`%s`=%s
 ORDER BY
-	l.`userid` ASC
+	`l`.`userid` ASC
 LIMIT %s",
 			array(
 				$col,
@@ -172,7 +173,7 @@ LIMIT %s",
 					// 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'],
@@ -204,7 +205,7 @@ LIMIT %s",
 
 		// Load final template
 		loadTemplate('admin_list_unconfirmed', FALSE, $content);
-	} elseif (getRequestElement('mid') > 0) {
+	} 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) {
 			// pool table
@@ -216,7 +217,7 @@ LIMIT %s",
 			// 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--}');
 	}