X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=d5a2b824d8c93acf9c8c70b30c59766c6286035c;hp=6f9e35d92cae3d9076f7fc578bbe65ac2768a157;hb=74ea26a36ff202cfdca545025a17c9faf4d68efb;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 6f9e35d92c..d5a2b824d8 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/19/2003 *
- * ===============                              Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/19/2003 *
+ * ===================                          Last change: 07/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-unconfirmed.php                             *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,68 +42,86 @@ if (!defined('__SECURITY')) {
 	die();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
-} elseif ((!isExtensionActive('mailid')) && (!isAdmin())) {
-	redirectToUrl('modules.php?module=login');
 }
 
 // Add description as navigation point
 addMenuDescription('member', __FILE__);
 
 // Shall we display a mail?
-if ((isGetRequestElementSet(('bonusid'))) && (isExtensionActive('bonus'))) {
+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
-FROM `{?_MYSQL_PREFIX?}_bonus`
-WHERE `id`=%s LIMIT 1",
-	array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
+	$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__);
 
 	// Load data
 	$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['is_notify'] = translateYesNo($content['is_notify']);
-	$content['sender']    = getMessage('_ADMIN_SHORT');
-	$content['time']      = createFancyTime($content['time']);
-	$content['userid']    = getUserId();
-
-	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
-	generateDateTime(getTimestampFromUserStats('bonusid', $content['id']), '2')
-	);
+	$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']);
+
+	// 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)
+		);
+	} // END - if
 
 	// Display it depending on mail (data) type
 	loadTemplate('member_mail_bonus_'.strtolower($content['data_type']), false, $content);
 
 	// Free result
 	SQL_FREERESULT($result_data);
-} elseif (isGetRequestElementSet(('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
-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 LIMIT 1",
-	array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
+	$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
+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
+LIMIT 1",
+		array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
 
 	// Translate some data
-	$content['timestamp'] = generateDateTime($content['timestamp'], '2');
+	$content['timestamp'] = generateDateTime($content['timestamp'], 2);
 	$content['category']  = getCategory($content['cat_id']);
 	$content['points']    = translateComma($content['points']);
 	$content['time']      = createFancyTime($content['time']);
-	$content['userid']    = getUserId();
+	$content['userid']    = getMemberId();
+	$content['user_status'] = getMaskedMessage('MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN', $content['id']);
 
-	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-	generateDateTime(getTimestampFromUserStats('mailid', $content['id']), '2')
-	);
+	// 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)
+		);
+	} // END - if
 
 	// Display it depending on mail (data) type
 	loadTemplate('member_mail_normal_'.strtolower($content['data_type']), false, $content);
@@ -112,19 +131,19 @@ WHERE s.id=%s LIMIT 1",
 }
 
 if (isExtensionActive('bonus')) {
-	// Load bonus ID
-	$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(getUserId()), __FILE__, __LINE__);
+	// Load bonus id
+	$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",
-	array(getUserId()), __FILE__, __LINE__);
+	// 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",
+		array(getMemberId()), __FILE__, __LINE__);
 }
 
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
 	// Please confirm these mails!
-	$sum = 0; $OUT = ''; $SW = 2;
+	$sum = '0'; $OUT = ''; $SW = 2;
 
 	// Init content
 	$content = array();
@@ -132,25 +151,36 @@ if (SQL_NUMROWS($result) > 0) {
 	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 	while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
 		// Load data from stats table...
-		$cat = ''; $result_data = false;
-		switch ($type)
-		{
+		$cat = '';
+		$result_data = false;
+		$PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
+		$DATA = $id . '/' . $id2 . '/' . $type;
+		switch ($type) {
 			case 'NORMAL':
-				$result_data = SQL_QUERY_ESC("SELECT s.subject, s.timestamp_ordered, 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
-WHERE s.id=%s
+				$result_data = SQL_QUERY_ESC("SELECT
+	s.subject, s.timestamp_ordered, 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
+WHERE
+	s.id=%s
 LIMIT 1",
-				array(bigintval($id)), __FILE__, __LINE__);
-				$type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+					array(bigintval($id)), __FILE__, __LINE__);
+				$type = 'mailid';
+				$DATA = $id;
+				$PROBLEM = getMessage('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 = getMessage('BONUS_MAIL_PROBLEM');
-			 break;
+					array(bigintval($id2)), __FILE__, __LINE__);
+				$type = 'bonusid';
+				$DATA = $id2;
+				$PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+				break;
 
 			default: // Unknown type detected!
 				logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $type));
@@ -174,7 +204,7 @@ LIMIT 1",
 				$sender = bigintval($sender);
 			} elseif ($type == 'bonusid') {
 				// Is admin
-				$sender = getMessage('_ADMIN_SHORT');
+				$sender = getMessage('USERNAME_ADMIN_SHORT');
 			} else {
 				// Deleted
 				$sender = getMessage('EMAIL_STATUS_DELETED');
@@ -182,15 +212,15 @@ LIMIT 1",
 
 			// Prepare data for template
 			$content = array(
-				'sw'      => $SW,
-				'userid'     => getUserId(),
-				'data'    => bigintval($DATA),
-				'type'    => $type,
-				'subject' => $subject,
-				'sender'  => $sender,
-				'stamp'   => generateDateTime($timestamp, '2'),
-				'cat'     => getCategory($cat),
-				'points'  => translateComma($pay),
+				'sw'        => $SW,
+				'userid'    => getMemberId(),
+				'data'      => bigintval($DATA),
+				'type'      => $type,
+				'subject'   => $subject,
+				'sender'    => $sender,
+				'timestamp' => generateDateTime($timestamp, 2),
+				'cat'       => getCategory($cat),
+				'points'    => translateComma($pay),
 			);
 
 			// Load row template