X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=53de7682da4a1022b4c0066103b0e2221ae083ac;hp=5add439d216a3b14b34a89f42ee5faad3cac5b00;hb=4f7df133f736da124e6f7bd02008b9093f736451;hpb=330dbb3e2b34450cd1665497506455e195a0a166

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 5add439d21..53de7682da 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 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 *
@@ -44,31 +44,37 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
 	return;
 } // END - if
 
 // Don't load the admin_list_unconfirmed template by default
-$listed = false;
+$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`
+	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
+	`p`.`id`=%s
 LIMIT 1",
-		bigintval(getRequestParameter('mid'))
+		bigintval(getRequestElement('mid'))
 	);
 
 	// Column, type and id for member's mail
@@ -77,30 +83,37 @@ LIMIT 1",
 	$ID = -1;
 
 	// Load admin_list_unconfirmed template
-	$listed = true;
-	$DATA = getRequestParameter('mid');
+	$listed = TRUE;
+	$DATA = getRequestElement('mid');
 	$mailType = 'mailid';
-} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
+} 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
+	// @TODO `id` has been used two times???
 	$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');
+	$ID = getRequestElement('bid');
 
 	// Load admin_list_unconfirmed template
-	$listed = true;
+	$listed = TRUE;
 	$DATA = $ID;
 	$mailType = 'bonusid';
 } else {
@@ -109,11 +122,11 @@ LIMIT 1",
 }
 
 // Shall I display links or not?
-if (($listed === true) && (!empty($sql))) {
+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
 		$poolData = SQL_FETCHARRAY($result_master);
@@ -125,20 +138,25 @@ if (($listed === true) && (!empty($sql))) {
 
 		// Bonus mails do always have a sender 'NULL'
 		if ($col == 'bonus_id') {
-			$poolData['sender'] = null;
+			$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
 	`{?_MYSQL_PREFIX?}_user_data` AS `u`
 ON
-	l.`userid`=u.`userid`
+	l.`userid`=`u`.`userid`
 WHERE
 	l.`%s`=%s
 ORDER BY
@@ -150,7 +168,7 @@ LIMIT %s",
 				bigintval($poolData['max_rec'])
 			),__FILE__, __LINE__);
 
-		// Do we have entries?
+		// Are there entries?
 		if (!SQL_HASZERONUMS($result)) {
 			// At least one link left to confirm
 			$OUT = '';
@@ -167,18 +185,18 @@ LIMIT %s",
 					);
 
 					// Load row template and switch colors
-					$OUT .= loadTemplate('admin_list_unconfirmed_row', true, $row);
+					$OUT .= loadTemplate('admin_list_unconfirmed_row', TRUE, $row);
 				} else {
 					// No user data found
-					$OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $row);
+					$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);
+			$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 = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', true);
+			$OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', TRUE);
 		}
 
 		// Prepare content
@@ -191,20 +209,20 @@ LIMIT %s",
 		SQL_FREERESULT($result);
 
 		// Load final template
-		loadTemplate('admin_list_unconfirmed', false, $content);
-	} elseif (getRequestParameter('mid') > 0) {
+		loadTemplate('admin_list_unconfirmed', FALSE, $content);
+	} 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) {
+		if (countSumTotalData(bigintval($ID), 'pool', 'id', 'id', TRUE) == 1) {
 			// pool table
 			displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
-		} elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
+		} elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', TRUE) == 1) {
 			// user_stats table
 			displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
 		} else {
 			// both or link is invalid
 			displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
 		}
-	} elseif (isGetRequestParameterSet('bid')) {
+	} elseif (isGetRequestElementSet('bid')) {
 		// Data in bonus table not found
 		displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
 	}