X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=5e4f9f5db0031b54c9ec36709a877aca3f6ca08b;hb=refs%2Fheads%2F0.2.1-FINAL;hp=4a87666826a430d99a2ddff5ef2f26486f9a8397;hpb=77669502ccc2779d32a842f6d523fb68169fadda;p=mailer.git

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 4a87666826..5e4f9f5db0 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 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,23 +57,23 @@ $sql = '';
 // List confirmation links from normal or bonus mails
 if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
 	// SQL query for mail data
-	$sql = sprintf("SELECT
-	s.`id`,
+	$sql = sprintf('SELECT
+	`s`.`id`,
 	`p`.`sender`,
 	`p`.`subject`,
 	`p`.`text`,
 	`p`.`url`,
 	`p`.`timestamp`,
-	s.`max_rec`
+	`s`.`max_rec`
 FROM
 	`{?_MYSQL_PREFIX?}_pool` AS `p`
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_user_stats` AS `s`
 ON
-	`p`.`id`=s.`pool_id`
+	`p`.`id`=`s`.`pool_id`
 WHERE
-	`p`.`id`=%s
-LIMIT 1",
+	`s`.`pool_id`=%s
+LIMIT 1',
 		bigintval(getRequestElement('id'))
 	);
 
@@ -86,13 +86,10 @@ LIMIT 1",
 	$listed = TRUE;
 	$DATA = getRequestElement('id');
 } elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (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
+	$sql = sprintf('SELECT
 	`id`,
-	`id` AS `sender`,
+	NULL AS `sender`,
 	`subject`,
 	`text`,
 	`url`,
@@ -102,7 +99,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
 	`id`=%s
-LIMIT 1",
+LIMIT 1',
 		bigintval(getRequestElement('id'))
 	);
 
@@ -122,12 +119,12 @@ LIMIT 1",
 // Shall I display links or not?
 if (($listed === TRUE) && (!empty($sql))) {
 	// Load mail data
-	$result_master = SQL_QUERY($sql, __FILE__, __LINE__);
+	$result_master = sqlQuery($sql, __FILE__, __LINE__);
 
 	// Is there an entry?
-	if (SQL_NUMROWS($result_master) == 1) {
+	if (sqlNumRows($result_master) == 1) {
 		// Mail order / bonus mail found
-		$poolData = SQL_FETCHARRAY($result_master);
+		$poolData = sqlFetchArray($result_master);
 
 		// If there is a pool id and $ID is not set, we take it
 		if (($poolData['id'] > 0) && ($ID == '-1')) {
@@ -142,23 +139,23 @@ if (($listed === TRUE) && (!empty($sql))) {
 		// 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`,
+		$result = sqlQueryEscaped("SELECT
+	`l`.`userid`,
 	`u`.`status`,
 	`u`.`surname`,
 	`u`.`family`,
-	`u`.`gender`,
+	`u`.`sex`,
 	`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,
@@ -167,10 +164,10 @@ LIMIT %s",
 			),__FILE__, __LINE__);
 
 		// Are there entries?
-		if (!SQL_HASZERONUMS($result)) {
+		if (!ifSqlHasZeroNumRows($result)) {
 			// At least one link left to confirm
 			$OUT = '';
-			while ($row = SQL_FETCHARRAY($result)) {
+			while ($row = sqlFetchArray($result)) {
 				// User data found? We can take any field of u.
 				if (!is_null($row['status'])) {
 					// Prepare data for the row template
@@ -178,7 +175,7 @@ LIMIT %s",
 						'userid' => $row['userid'],
 						'type'   => getRequestElement('type'),
 						'id'     => $ID,
-						'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
+						'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateSex=' . $row['sex'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
 						'status' => $row['status'],
 					);
 
@@ -194,17 +191,17 @@ LIMIT %s",
 			$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 = returnMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');
 		}
 
 		// Prepare content
 		$content                = $poolData;
-		$content['unconfirmed'] = SQL_NUMROWS($result);
+		$content['unconfirmed'] = sqlNumRows($result);
 		$content['timestamp']   = generateDateTime($poolData['timestamp'], 2);
 		$content['rows']        = $OUT;
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Load final template
 		loadTemplate('admin_list_unconfirmed', FALSE, $content);
@@ -226,7 +223,7 @@ LIMIT %s",
 	}
 
 	// Free result
-	SQL_FREERESULT($result_master);
+	sqlFreeResult($result_master);
 } // END - if
 
 // [EOF]