X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=d2fe6db28ba3467557ed849761b221e96b704b05;hb=e70440e1164db8bbeeccd90df305bfa0efb641e1;hp=03cb14da6ee2d435e4f98ff9d9425eb9ac8de36b;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 03cb14da6e..d2fe6db28b 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -103,33 +103,32 @@ LIMIT 1',
 } 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`
 LEFT JOIN
 	`{?_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(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();
@@ -185,19 +184,19 @@ if (!SQL_HASZERONUMS($result)) {
 		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`
 LEFT JOIN
 	`{?_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';
@@ -206,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'];
@@ -216,64 +215,65 @@ LIMIT 1",
 			default: // Unknown type detected!
 				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);
 			}
 		}
 
@@ -291,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... :)