X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=ffa88d7eac8e003f866402f1a5f3e388b45ff068;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=d5a2b824d8c93acf9c8c70b30c59766c6286035c;hpb=aa330cd9a4ae150fcc623f69e0ee0281b046e1ae;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index d5a2b824d8..ffa88d7eac 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbestätigte Mails                              *
+ * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -51,7 +51,7 @@ addMenuDescription('member', __FILE__);
 if ((isGetRequestParameterSet('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`
+	`id`, `subject`, `timestamp`, `cat_id` AS `category`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
@@ -64,11 +64,6 @@ LIMIT 1",
 
 	// Translate some data
 	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
-	$content['category']    = getCategory($content['cat_id']);
-	$content['points']      = translateComma($content['points']);
-	$content['is_notify']   = translateYesNo($content['is_notify']);
-	$content['sender']      = getMessage('USERNAME_ADMIN_SHORT');
-	$content['time']        = createFancyTime($content['time']);
 	$content['userid']      = getMemberId();
 	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN', $content['id']);
 
@@ -85,7 +80,7 @@ LIMIT 1",
 
 	// Free result
 	SQL_FREERESULT($result_data);
-} elseif (isGetRequestParameterSet(('mailid'))) {
+} 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, pay.price AS points, p.sender, pay.time, p.data_type
@@ -108,11 +103,8 @@ LIMIT 1",
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp'] = generateDateTime($content['timestamp'], 2);
-	$content['category']  = getCategory($content['cat_id']);
-	$content['points']    = translateComma($content['points']);
-	$content['time']      = createFancyTime($content['time']);
-	$content['userid']    = getMemberId();
+	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
+	$content['userid']      = getMemberId();
 	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
 
 	// Is ext-user installed?
@@ -124,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);
@@ -141,9 +133,9 @@ if (isExtensionActive('bonus')) {
 }
 
 // Mails left for confirmation?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
 	// Please confirm these mails!
-	$sum = '0'; $OUT = ''; $SW = 2;
+	$sum = '0'; $OUT = '';
 
 	// Init content
 	$content = array();
@@ -153,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':
@@ -171,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':
@@ -179,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!
@@ -195,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
@@ -204,23 +196,20 @@ 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,
 				'sender'    => $sender,
 				'timestamp' => generateDateTime($timestamp, 2),
-				'cat'       => getCategory($cat),
-				'points'    => translateComma($pay),
+				'points'    => $pay,
 			);
 
 			// Load row template
@@ -235,7 +224,6 @@ LIMIT 1",
 		} else {
 			// Prepare data for template
 			$content = array(
-				'sw'    => $SW,
 				'data'  => $DATA,
 				'probl' => $PROBLEM,
 			);
@@ -250,16 +238,13 @@ LIMIT 1",
 
 		// Free result
 		SQL_FREERESULT($result_data);
-
-		// Switch color
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Remember total points
-	$content['total_points'] = translateComma($sum);
+	$content['total_points'] = $sum;
 
 	// Remember all generated rows in constant for the template
 	$content['rows'] = $OUT;
@@ -272,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]