X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=92cde69e485396bee22d27f3f12fec73defee97e;hb=ebb430722eb0418a8b14fe95a140a70423993318;hp=068e0cf8da6c370061894fb7e54d113e2d59d846;hpb=025d8e5864bcf681322dc9fa00774cb8c86c8a21;p=mailer.git

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 068e0cf8da..92cde69e48 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, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
 	return;
 } // END - if
 
@@ -72,16 +72,20 @@ LIMIT 1",
 	);
 
 	// Column, type and id for member's mail
-	$col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
+	$col = 'stats_id';
+	$type = 'NORMAL';
+	$ID = -1;
 
 	// Load admin_list_unconfirmed template
-	$listed = true; $DATA = getRequestParameter('mid'); $mailType = 'mailid';
+	$listed = true;
+	$DATA = getRequestParameter('mid');
+	$mailType = 'mailid';
 } elseif ((isGetRequestParameterSet('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
 	$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
@@ -91,13 +95,17 @@ LIMIT 1",
 	);
 
 	// Column, type and id for member's mail
-	$col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
+	$col = 'bonus_id';
+	$type = 'BONUS';
+	$ID = getRequestParameter('bid');
 
 	// Load admin_list_unconfirmed template
-	$listed = true; $DATA = $ID; $mailType = 'bonusid';
+	$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
-	loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}');
+	displayMessage('{--ADMIN_CALL_NOT_DIRECTLY--}');
 }
 
 // Shall I display links or not?
@@ -107,12 +115,18 @@ if (($listed === true) && (!empty($sql))) {
 
 	// Do we have an entry?
 	if (SQL_NUMROWS($result_master) == 1) {
-		// Mail order / bonus mail found!
+		// Mail order / bonus mail found
 		$poolData = SQL_FETCHARRAY($result_master);
 
-		// Transfer data to constants for the template
-		if (($poolData['id'] > 0) && ($ID == '-1')) $ID = $poolData['id'];
-		if ($col == 'bonus_id') $poolData['sender'] = '0';
+		// If there is a pool id and $ID is not set, we take it
+		if (($poolData['id'] > 0) && ($ID == '-1')) {
+			$ID = $poolData['id'];
+		} // END - if
+
+		// Bonus mails do always have a sender 'NULL'
+		if ($col == 'bonus_id') {
+			$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
@@ -148,7 +162,7 @@ LIMIT %s",
 						'userid' => $row['userid'],
 						'link'   => $mailType,
 						'id'     => $ID,
-						'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '</a>',
+						'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '</a>',
 						'status' => $row['status'],
 					);
 
@@ -164,7 +178,7 @@ 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 = loadTemplate('admin_settings_saved', true, '{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}');
+			$OUT = displayMessage('{--ADMIN_UNCONFIRMED_NO_LINK_LEFT--}', true);
 		}
 
 		// Prepare content
@@ -182,17 +196,17 @@ LIMIT %s",
 		// 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
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
+			displayMessage('{%message,ADMIN_UNCONFIRMED_POOL_MISSING=' . $ID . '%}');
 		} elseif (countSumTotalData(bigintval($ID), 'user_stats', 'id', 'pool_id', true) == 1) {
 			// user_stats table
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
+			displayMessage('{%message,ADMIN_UNCONFIRMED_STATS_MISSING=' . $ID . '%}');
 		} else {
 			// both or link is invalid
-			loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
+			displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
 		}
 	} elseif (isGetRequestParameterSet('bid')) {
 		// Data in bonus table not found
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
+		displayMessage('{--ADMIN_UNCONFIRMED_INVALID_LINK--}');
 	}
 
 	// Free result