X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=48178e2cfe4c32670163ab66bbc227bc6c359e81;hb=c72268213d4d4829d845d39c101bb08fbe4ed79a;hp=12ecfd5da861333b2b2eda5a701fd4ddd9f8c860;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 12ecfd5da8..48178e2cfe 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -83,7 +83,7 @@ LIMIT 1",
 } elseif (isGetRequestParameterSet(('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 AS `category`, 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, pay.price AS points, p.sender, pay.time, p.data_type
 FROM
 	`{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
@@ -116,7 +116,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);
@@ -135,7 +135,7 @@ if (isExtensionActive('bonus')) {
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
 	// Please confirm these mails!
-	$sum = '0'; $OUT = ''; $SW = 2;
+	$sum = '0'; $OUT = '';
 
 	// Init content
 	$content = array();
@@ -145,7 +145,7 @@ if (SQL_NUMROWS($result) > 0) {
 		// Load data from stats table...
 		$cat = '';
 		$result_data = false;
-		$PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
+		$PROBLEM = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
 		$DATA = $id . '/' . $id2 . '/' . $type;
 		switch ($type) {
 			case 'NORMAL':
@@ -163,7 +163,7 @@ LIMIT 1",
 					array(bigintval($id)), __FILE__, __LINE__);
 				$type = 'mailid';
 				$DATA = $id;
-				$PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+				$PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
 				break;
 
 			case 'BONUS':
@@ -171,7 +171,7 @@ LIMIT 1",
 					array(bigintval($id2)), __FILE__, __LINE__);
 				$type = 'bonusid';
 				$DATA = $id2;
-				$PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+				$PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
 				break;
 
 			default: // Unknown type detected!
@@ -187,7 +187,7 @@ LIMIT 1",
 			// Subject line found?
 			if (empty($subject)) {
 				// No subject line!
-				$subject = getMessage('DEFAULT_SUBJECT_LINE');
+				$subject = '{--DEFAULT_SUBJECT_LINE--}';
 			} // END - if
 
 			// Prepare sender id
@@ -196,16 +196,14 @@ LIMIT 1",
 				$sender = bigintval($sender);
 			} elseif ($type == 'bonusid') {
 				// Is admin
-				$sender = getMessage('USERNAME_ADMIN_SHORT');
+				$sender = '{--USERNAME_ADMIN_SHORT--}';
 			} else {
 				// Deleted
-				$sender = getMessage('EMAIL_STATUS_DELETED');
+				$sender = '{--EMAIL_STATUS_DELETED--}';
 			}
 
 			// Prepare data for template
 			$content = array(
-				'sw'        => $SW,
-				'userid'    => getMemberId(),
 				'data'      => bigintval($DATA),
 				'type'      => $type,
 				'subject'   => $subject,
@@ -226,7 +224,6 @@ LIMIT 1",
 		} else {
 			// Prepare data for template
 			$content = array(
-				'sw'    => $SW,
 				'data'  => $DATA,
 				'probl' => $PROBLEM,
 			);
@@ -241,9 +238,6 @@ LIMIT 1",
 
 		// Free result
 		SQL_FREERESULT($result_data);
-
-		// Switch color
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Free memory
@@ -263,7 +257,7 @@ LIMIT 1",
 	}
 } else {
 	// No mails left to confirm... :)
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+	loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]