X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=d2fe6db28ba3467557ed849761b221e96b704b05;hp=af971c9247ccee4f912790b756a10121bcf05c03;hb=e70440e1164db8bbeeccd90df305bfa0efb641e1;hpb=7973c37a5d7b2d1730e45e921396cfe3f627763d

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index af971c9247..d2fe6db28b 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -52,16 +52,25 @@ if (!isExtensionActive('mailid')) {
 } // END - if
 
 // Shall we display a mail?
-if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
+if ((isGetRequestElementSet('bonusid')) && (isExtensionActive('bonus'))) {
 	// Display bonus mail by loading it's full data
-	$result_data = SQL_QUERY_ESC("SELECT
-	`id`, `subject`, `timestamp`, `cat_id`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
+	$result_data = SQL_QUERY_ESC('SELECT
+	`id`,
+	`subject`,
+	`timestamp`,
+	`cat_id`,
+	`points`,
+	`text`,
+	`is_notify`,
+	`data_type`,
+	`time`,
+	`url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
 	`id`=%s
-LIMIT 1",
-		array(bigintval(getRequestParameter('bonusid'))), __FILE__, __LINE__);
+LIMIT 1',
+		array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
@@ -87,33 +96,39 @@ LIMIT 1",
 	} // END - if
 
 	// Display it depending on mail (data) type
-	loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), false, $content);
+	loadTemplate('member_mail_bonus_' . strtolower($content['data_type']), FALSE, $content);
 
 	// Free result
 	SQL_FREERESULT($result_data);
-} elseif (isGetRequestParameterSet('mailid')) {
+} elseif (isGetRequestElementSet('mailid')) {
 	// Display regular member mail by loading its full data
 	$result_data = SQL_QUERY_ESC("SELECT
-	s.id, s.subject, p.text, s.timestamp_ordered AS `timestamp`,
-	s.cat_id, pay.price AS `points`, p.sender, pay.time, p.data_type
+	`s`.`id`,
+	`s`.`subject`,
+	`p`.`text`,
+	`s`.`timestamp_ordered` AS `timestamp`,
+	`s`.`cat_id`,
+	`p`.`payment_id`,
+	`p`.`sender`,
+	`p`.`data_type`
 FROM
-	`{?_MYSQL_PREFIX?}_user_stats` AS s
+	`{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_pool` AS p
+	`{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
 	s.pool_id=p.id
-LEFT JOIN
-	`{?_MYSQL_PREFIX?}_payments` AS pay
-ON
-	p.payment_id=pay.id
 WHERE
-	s.id=%s
+	`s`.`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
 
+	// Get price/time to avoid one JOIN
+	$content['price'] = getPaymentPrice($content['payment_id']);
+	$content['time']  = getPaymentData($content['payment_id'], 'time');
+
 	// Translate some data
 	$content['timestamp'] = generateDateTime($content['timestamp'], '2');
 	$content['userid'] = getMemberId();
@@ -135,7 +150,7 @@ LIMIT 1",
 	} // END - if
 
 	// Display it depending on mail (data) type
-	loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content);
+	loadTemplate('member_mail_normal_' . strtolower($content['data_type']), FALSE, $content);
 
 	// Free result
 	SQL_FREERESULT($result_data);
@@ -163,21 +178,25 @@ if (!SQL_HASZERONUMS($result)) {
 	while ($row = SQL_FETCHARRAY($result)) {
 		// Load data from stats table...
 		$cat = '';
-		$result_data = false;
+		$result_data = FALSE;
 		$message = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
 		$data = $row['stats_id'] . '/' . $row['bonus_id'] . '/' . $row['link_type'];
 		switch ($row['link_type']) {
 			case 'NORMAL':
 				$result_data = SQL_QUERY_ESC("SELECT
-	s.subject, s.timestamp_ordered, s.cat_id, s.payment_id, p.sender
+	`s`.`subject`,
+	`s`.`timestamp_ordered` AS `timestamp`,
+	`s`.`cat_id`,
+	`s`.`payment_id`,
+	`p`.`sender`
 FROM
-	`{?_MYSQL_PREFIX?}_user_stats` AS s
+	`{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_pool` AS p
+	`{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
-	s.pool_id=p.id
+	`s`.`pool_id`=`p`.`id`
 WHERE
-	s.id=%s
+	`s`.`id`=%s
 LIMIT 1",
 					array(bigintval($row['stats_id'])), __FILE__, __LINE__);
 				$row['link_type'] = 'mailid';
@@ -186,7 +205,7 @@ LIMIT 1",
 				break;
 
 			case 'BONUS':
-				$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+				$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, NULL FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 					array(bigintval($row['bonus_id'])), __FILE__, __LINE__);
 				$row['link_type'] = 'bonusid';
 				$data = $row['bonus_id'];
@@ -194,66 +213,67 @@ LIMIT 1",
 				break;
 
 			default: // Unknown type detected!
-				debug_report_bug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
+				reportBug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
 				break;
-		}
+		} // END - switch
 
 		// Data found to this mail?
 		if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
 			// Mail was found
-			list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
+			$rowData = SQL_FETCHARRAY($result_data);
 
 			// Subject line found?
-			if (empty($subject)) {
+			if (empty($rowData['subject'])) {
 				// No subject line!
-				$subject = '{--DEFAULT_SUBJECT_LINE--}';
+				$rowData['subject'] = '{--DEFAULT_SUBJECT--}';
 			} // END - if
 
 			// Prepare sender id
-			if ((isValidUserId($sender)) && ($row['link_type'] == 'mailid')) {
+			if ((isValidId($rowData['sender'])) && ($row['link_type'] == 'mailid')) {
 				// Sender id
-				$sender = bigintval($sender);
+				$rowData['sender'] = bigintval($rowData['sender']);
 			} elseif ($row['link_type'] == 'bonusid') {
 				// Is admin
-				$sender = '{--USERNAME_ADMIN_SHORT--}';
+				$rowData['sender'] = '{--USERNAME_ADMIN_SHORT--}';
 			} else {
 				// Deleted
-				$sender = '{--EMAIL_STATUS_DELETED--}';
+				$rowData['sender'] = '{--EMAIL_STATUS_DELETED--}';
 			}
 
 			// Prepare data for template
-			$content = array(
-				'data'      => bigintval($data),
+			// @TODO cat_id is unused
+			$rowData = array(
+				'data'              => bigintval($data),
 				// @TODO This 'userid' cannot be saved because of encapsulated EL code
-				'userid'    => getMemberId(),
-				'link_type' => $row['link_type'],
-				'subject'   => $subject,
-				'sender'    => $sender,
-				'timestamp' => generateDateTime($timestamp, 2),
-				'points'    => $pay,
+				'userid'            => getMemberId(),
+				'link_type'         => $row['link_type'],
+				'subject'           => $rowData['subject'],
+				'sender'            => $rowData['sender'],
+				'timestamp_ordered' => generateDateTime($rowData['timestamp_ordered'], 2),
+				'payment_id'        => $rowData['payment_id'],
 			);
 
 			// Load row template
-			if (getConfig('show_points_unconfirmed') == 'Y') {
-				$OUT .= loadTemplate('member_unconfirmed_row', true, $content);
+			if (isShowPointsUnconfirmedEnabled()) {
+				$OUT .= loadTemplate('member_list_unconfirmed_row', TRUE, $rowData);
 			} else {
-				$OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
+				$OUT .= loadTemplate('member_list_unconfirmed_nopoints_row', TRUE, $rowData);
 			}
 
-			// Count points
-			$sum += $pay;
+			// Count points (price)
+			$sum += getPaymentPrice($rowData['payment_id']);
 		} else {
 			// Prepare data for template
-			$content = array(
+			$rowData = array(
 				'data'    => $data,
 				'message' => $message,
 			);
 
 			// Display points or not?
-			if (getConfig('show_points_unconfirmed') == 'Y') {
-				$OUT .= loadTemplate('member_unconfirmed_404', true, $content);
+			if (isShowPointsUnconfirmedEnabled()) {
+				$OUT .= loadTemplate('member_list_unconfirmed_404_row', TRUE, $rowData);
 			} else {
-				$OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
+				$OUT .= loadTemplate('member_list_unconfirmed_nopoints_404_row', TRUE, $rowData);
 			}
 		}
 
@@ -271,10 +291,10 @@ LIMIT 1",
 	$content['rows'] = $OUT;
 
 	// Load main template
-	if (getConfig('show_points_unconfirmed') == 'Y') {
-		loadTemplate('member_unconfirmed_table', false, $content);
+	if (isShowPointsUnconfirmedEnabled()) {
+		loadTemplate('member_list_unconfirmed', FALSE, $content);
 	} else {
-		loadTemplate('member_unconfirmed_table_nopoints', false, $content);
+		loadTemplate('member_list_unconfirmed_nopoints', FALSE, $content);
 	}
 } else {
 	// No mails left to confirm... :)