X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=2cad2b449d48c892b095099c379141d9795fa742;hp=287077856b2ce8c3cc74c7f312bdecf947d2f97f;hb=391c98ab7233ff3e640d8b9fad8df92ce45e9b31;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;ds=sidebyside

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 287077856b..2cad2b449d 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -1,23 +1,22 @@
 <?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                             *
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbest&auml;tigte Mails                              *
+ * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $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 - 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 *
@@ -41,15 +40,13 @@ if (!defined('__SECURITY')) {
 	die();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
-} elseif ((!isExtensionActive('mailid')) && (!isAdmin())) {
-	redirectToUrl('modules.php?module=login');
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('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`
@@ -58,34 +55,34 @@ FROM
 WHERE
 	`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
+		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('USERNAME_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['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
+	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
@@ -99,25 +96,26 @@ ON
 WHERE
 	s.id=%s
 LIMIT 1",
-		array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestParameter('mailid'))), __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['time']      = createFancyTime($content['time']);
-	$content['userid']    = getUserId();
-
-	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-		generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-	);
+	$content['timestamp']   = generateDateTime($content['timestamp'], 2);
+	$content['userid']      = getMemberId();
+	$content['user_status'] = getMaskedMessage('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)
+		);
+	} // 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);
@@ -126,29 +124,29 @@ 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__);
+		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 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__);
 }
 
 // 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();
 
 	// @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 = getMessage('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
@@ -161,59 +159,58 @@ ON
 WHERE
 	s.id=%s
 LIMIT 1",
-					array(bigintval($id)), __FILE__, __LINE__);
-				$type = 'mailid';
-				$DATA = $id;
-				$PROBLEM = getMessage('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 = getMessage('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?
 			if (empty($subject)) {
 				// No subject line!
-				$subject = getMessage('DEFAULT_SUBJECT_LINE');
+				$subject = '{--DEFAULT_SUBJECT_LINE--}';
 			} // 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 = 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'  => getUserId(),
-				'data'    => bigintval($DATA),
-				'type'    => $type,
-				'subject' => $subject,
-				'sender'  => $sender,
-				'stamp'   => generateDateTime($timestamp, 2),
-				'cat'     => getCategory($cat),
-				'points'  => translateComma($pay),
+				'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,
 			);
 
 			// Load row template
@@ -228,9 +225,8 @@ LIMIT 1",
 		} else {
 			// Prepare data for template
 			$content = array(
-				'sw'    => $SW,
-				'data'  => $DATA,
-				'probl' => $PROBLEM,
+				'data'    => $data,
+				'message' => $message,
 			);
 
 			// Display points or not?
@@ -243,16 +239,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;
@@ -265,7 +258,7 @@ LIMIT 1",
 	}
 } else {
 	// No mails left to confirm... :)
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+	displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]