X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=568ebf4c63f6bba687a54c8f0fd23f6b40c6bd88;hp=a331e22230506b05a6648d85e00c757e6f8c34d3;hb=57227d33e870ec5cd271209c4a978a52b45c2dd6;hpb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index a331e22230..568ebf4c63 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -53,7 +53,7 @@ if (!isExtensionActive('mailid')) {
 $listed = false;
 
 // List confirmation links from normal or bonus mails
-if (isGetRequestElementSet('mid')) {
+if (isGetRequestParameterSet('mid')) {
 	// SQL query for mail data
 	$sql = "SELECT
 	s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec
@@ -64,22 +64,22 @@ LEFT JOIN
 ON
 	p.id=s.pool_id
 WHERE
-	p.id='".getRequestElement('mid')."'
+	p.id='".getRequestParameter('mid')."'
 LIMIT 1";
 
 	// Column, type and id for member's mail
 	$col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
 
 	// Load admin_list_unconfirmed template
-	$listed = true; $DATA = getRequestElement('mid'); $LINK = 'mailid';
-} elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
+	$listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
+} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
 	// @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 
 	// SQL query for mail data (both ids are required for compatiblity to above normal mail
-	$sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestElement('bid')."' LIMIT 1";
+	$sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
 
 	// Column, type and id for member's mail
-	$col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestElement('bid');
+	$col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
 
 	// Load admin_list_unconfirmed template
 	$listed = true; $DATA = $ID; $LINK = 'bonusid';
@@ -133,14 +133,14 @@ WHERE
 					'userid' => $content['userid'],
 					'link'   => $LINK,
 					'id'     => $ID,
-					'email'  => "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
+					'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
 					'status' => translateUserStatus($content['status']),
 				);
 
 				// Load row template and switch colors
 				$OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
 				$SW = 3 - $SW;
-			}
+			} // END - while
 
 			// Render it in our new listing
 			$OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
@@ -165,7 +165,7 @@ WHERE
 
 		// Load final template
 		loadTemplate('admin_list_unconfirmed', false, $content);
-	} elseif (getRequestElement('mid') > 0) {
+	} elseif (getRequestParameter('mid') > 0) {
 		// Data in pool or in user_stats not found, so let's find out where data is missing
 		$result1 = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
 			array(bigintval($ID)), __FILE__, __LINE__);
@@ -174,10 +174,10 @@ WHERE
 
 		if (SQL_NUMROWS($result1) == 1) {
 			// pool table
-			loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
 		} elseif (SQL_NUMROWS($result2) == 1) {
 			// user_stats table
-			loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING'), $ID));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
 		} else {
 			// both or link is invalid
 			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
@@ -186,7 +186,7 @@ WHERE
 		// Free memory
 		SQL_FREERESULT($result1);
 		SQL_FREERESULT($result2);
-	} elseif (isGetRequestElementSet('bid')) {
+	} elseif (isGetRequestParameterSet('bid')) {
 		// Data in bonus table not found
 		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
 	}