X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=32aa9857ab617fc5f06f64d2c2159555dcb30498;hb=1cbf289d059637cb2707b0f5384637f081ad6402;hp=9374445cd938706a3b7f02e60c1f96b317c0b718;hpb=e5fe5afb17a5c8106f4c890234dfa39419e70f5d;p=mailer.git

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 9374445cd9..32aa9857ab 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/09/2004 *
- * ================                             Last change: 10/31/2004 *
+ * ===================                          Last change: 10/31/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_unconfirmed.php                        *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,7 +54,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 +65,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';
@@ -115,8 +116,15 @@ LEFT JOIN
 ON
 	l.userid=u.userid
 WHERE
-	l.%s='%s' ORDER BY l.userid LIMIT %s",
-			array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+	l.%s='%s'
+ORDER BY
+	l.userid ASC
+LIMIT %s",
+			array(
+				$col,
+				$ID,
+				bigintval($max)
+			),__FILE__, __LINE__);
 
 		// Total number of unconfirmed mails
 		$unconfirmed = SQL_NUMROWS($result);
@@ -125,22 +133,32 @@ WHERE
 			// At least one link left to confirm
 			$OUT = ''; $SW = 2;
 			while ($content = SQL_FETCHARRAY($result)) {
-				// Prepare data for the row template
-				// @TODO Rewritings: userid->userid
-				$content = array(
-					'sw'     => $SW,
-					'u_link' => generateUserProfileLink($content['userid']),
-					'userid' => $content['userid'],
-					'link'   => $LINK,
-					'id'     => $ID,
-					'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);
+				// User data found? We can take any field of u.
+				if (!is_null($content['status'])) {
+					// Prepare data for the row template
+					$content = array(
+						'sw'     => $SW,
+						'u_link' => generateUserProfileLink($content['userid']),
+						'userid' => $content['userid'],
+						'link'   => $LINK,
+						'id'     => $ID,
+						'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);
+				} else {
+					// Insert color-switch
+					$content['sw'] = $SW;
+
+					// No user data found
+					$OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $content);
+				}
+
+				// Switch color
 				$SW = 3 - $SW;
-			}
+			} // END - while
 
 			// Render it in our new listing
 			$OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
@@ -165,7 +183,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 +192,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,14 +204,14 @@ 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'));
 	}
 
 	// Free result
 	SQL_FREERESULT($result_master);
-}
+} // END - if
 
 // [EOF]
 ?>