X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=751148967430062c94db7ddb0cc2c39b013defbd;hp=bb59e8151c12e29adf10f5f97a6b02178467ad68;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=30ae22f62ae87c53a56baf0d134569ba91011111

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index bb59e8151c..7511489674 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -45,13 +43,13 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 // Shall we display a mail?
 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` AS `category`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
+	`id`, `subject`, `timestamp`, `cat_id`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
@@ -65,25 +63,24 @@ LIMIT 1",
 	// Translate some data
 	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
 	$content['userid']      = getMemberId();
-	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN', $content['id']);
+	$content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
 	// Is ext-user installed?
 	if (isExtensionInstalled('user')) {
 		// Get timestamp from insert
-		$content['user_status'] = getMaskedMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON',
-			generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), 2)
-		);
+		$content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('bonusid', $content['id']), '2') . '%}';
 	} // 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 (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
+	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
@@ -103,16 +100,14 @@ LIMIT 1",
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
+	$content['timestamp']   = generateDateTime($content['timestamp'], '2');
 	$content['userid']      = getMemberId();
-	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
+	$content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
 	// Is ext-user installed?
 	if (isExtensionInstalled('user')) {
 		// Get timestamp from insert
-		$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON',
-			generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-		);
+		$content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), '2') . '%}';
 	} // END - if
 
 	// Display it depending on mail (data) type
@@ -127,8 +122,8 @@ if (isExtensionActive('bonus')) {
 	$result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `bonus_id` DESC, stats_id DESC",
 		array(getMemberId()), __FILE__, __LINE__);
 } else {
-	// Don't load bonus id
-	$result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
+	// Don't load bonus id if ext-bonus is not installed
+	$result = SQL_QUERY_ESC("SELECT `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `stats_id` DESC",
 		array(getMemberId()), __FILE__, __LINE__);
 }
 
@@ -141,13 +136,13 @@ if (!SQL_HASZERONUMS($result)) {
 	$content = array();
 
 	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
-	while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
+	while ($row = SQL_FETCHARRAY($result)) {
 		// Load data from stats table...
 		$cat = '';
 		$result_data = false;
-		$PROBLEM = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
-		$DATA = $id . '/' . $id2 . '/' . $type;
-		switch ($type) {
+		$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
@@ -160,28 +155,28 @@ ON
 WHERE
 	s.id=%s
 LIMIT 1",
-					array(bigintval($id)), __FILE__, __LINE__);
-				$type = 'mailid';
-				$DATA = $id;
-				$PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
+					array(bigintval($row['stats_id'])), __FILE__, __LINE__);
+				$row['link_type'] = 'mailid';
+				$data = $row['stats_id'];
+				$message = '{--NORMAL_MAIL_PROBLEM--}';
 				break;
 
 			case 'BONUS':
-				$result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id, points, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-					array(bigintval($id2)), __FILE__, __LINE__);
-				$type = 'bonusid';
-				$DATA = $id2;
-				$PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
+				$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id`, `points`, 0 FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+					array(bigintval($row['bonus_id'])), __FILE__, __LINE__);
+				$row['link_type'] = 'bonusid';
+				$data = $row['bonus_id'];
+				$message = '{--BONUS_MAIL_PROBLEM--}';
 				break;
 
 			default: // Unknown type detected!
-				logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
+				logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
 				break;
 		}
 
 		// Data found to this mail?
-		if ((SQL_NUMROWS($result_data) == 1) && (($type == 'mailid') || ($type == 'bonusid'))) {
-			// Mail was found!
+		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);
 
 			// Subject line found?
@@ -191,10 +186,10 @@ LIMIT 1",
 			} // END - if
 
 			// Prepare sender id
-			if (($sender > 0) && ($type == 'mailid')) {
+			if ((isValidUserId($sender)) && ($row['link_type'] == 'mailid')) {
 				// Sender id
 				$sender = bigintval($sender);
-			} elseif ($type == 'bonusid') {
+			} elseif ($row['link_type'] == 'bonusid') {
 				// Is admin
 				$sender = '{--USERNAME_ADMIN_SHORT--}';
 			} else {
@@ -204,8 +199,10 @@ LIMIT 1",
 
 			// Prepare data for template
 			$content = array(
-				'data'      => bigintval($DATA),
-				'type'      => $type,
+				'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),
@@ -224,8 +221,8 @@ LIMIT 1",
 		} else {
 			// Prepare data for template
 			$content = array(
-				'data'  => $DATA,
-				'probl' => $PROBLEM,
+				'data'    => $data,
+				'message' => $message,
 			);
 
 			// Display points or not?
@@ -257,7 +254,7 @@ LIMIT 1",
 	}
 } else {
 	// No mails left to confirm... :)
-	loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}');
+	displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]