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

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index ade5361525..7511489674 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                             *
@@ -10,9 +10,13 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Unbestaetigte Mails                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -32,122 +36,226 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-	LOAD_URL("modules.php?module=index");
+if (!defined('__SECURITY')) {
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
-
-OPEN_TABLE("100%", "member_content member_content_align", "");
-if (EXT_IS_ACTIVE("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",
-	 array($GLOBALS['userid']), __FILE__, __LINE__);
+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`, `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['userid']      = getMemberId();
+	$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'] = '{%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);
+
+	// Free result
+	SQL_FREERESULT($result_data);
+} 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(getRequestParameter('mailid'))), __FILE__, __LINE__);
+
+	// Load data
+	$content = SQL_FETCHARRAY($result_data);
+
+	// Translate some data
+	$content['timestamp']   = generateDateTime($content['timestamp'], '2');
+	$content['userid']      = getMemberId();
+	$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'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), '2') . '%}';
+	} // END - if
+
+	// Display it depending on mail (data) type
+	loadTemplate('member_mail_normal_' . strtolower($content['data_type']), false, $content);
+
+	// Free result
+	SQL_FREERESULT($result_data);
 }
- 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($GLOBALS['userid']), __FILE__, __LINE__);
+
+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(getMemberId()), __FILE__, __LINE__);
+} else {
+	// 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__);
 }
 
-if (SQL_NUMROWS($result) > 0)
-{
+// Mails left for confirmation?
+if (!SQL_HASZERONUMS($result)) {
 	// Please confirm these mails!
-	$sum = "0"; $SW = 2; $OUT = "";
-	while (list($id, $id2, $type) = SQL_FETCHROW($result))
-	{
+	$sum = '0'; $OUT = '';
+
+	// Init content
+	$content = array();
+
+	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+	while ($row = SQL_FETCHARRAY($result)) {
 		// Load data from stats table...
-		$cat = "";
-		switch ($type)
-		{
-		case "NORMAL":
-			$result_data = SQL_QUERY_ESC("SELECT subject, subject, timestamp_ordered, cat_id, payment_id, pool_id FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
-			$type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
-			break;
-
-		case "BONUS":
-			$result_data = SQL_QUERY_ESC("SELECT subject, text, timestamp, cat_id, points, id FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
-			 array(bigintval($id2)), __FILE__, __LINE__);
-			$type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
-			break;
+		$cat = '';
+		$result_data = false;
+		$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
+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($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($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.", $row['link_type']));
+				break;
 		}
 
-		if (SQL_NUMROWS($result_data) == 1)
-		{
-			// Mail was found!
-			list($subject, $text, $timestamp, $cat, $pay, $pool) = SQL_FETCHROW($result_data);
-			SQL_FREERESULT($result_data);
-			if ($type == "NORMAL")
-			{
-				$pay = GET_PAY_POINTS($pay, "payment");
-				$result_text = SQL_QUERY_ESC("SELECT text FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
-				 array(bigintval($pool)), __FILE__, __LINE__);
-				list($text) = SQL_FETCHROW($result_text);
-				SQL_FREERESULT($result_text);
+		// Data found to this mail?
+		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 = '{--DEFAULT_SUBJECT_LINE--}';
+			} // END - if
+
+			// Prepare sender id
+			if ((isValidUserId($sender)) && ($row['link_type'] == 'mailid')) {
+				// Sender id
+				$sender = bigintval($sender);
+			} elseif ($row['link_type'] == 'bonusid') {
+				// Is admin
+				$sender = '{--USERNAME_ADMIN_SHORT--}';
+			} else {
+				// Deleted
+				$sender = '{--EMAIL_STATUS_DELETED--}';
 			}
-			if (empty($subject)) $subject = DEFAULT_SUBJECT_LINE;
-			if (empty($text))    $text    = "---";
-			$subject = COMPILE_CODE($subject);
 
 			// Prepare data for template
 			$content = array(
-				'sw'     => $SW,
-				'uid'    => $GLOBALS['userid'],
-				'data'   => $DATA,
-				'type'   => $type,
-				'subj'   => $subject,
-				'text'   => COMPILE_CODE($text),
-				'stamp'  => MAKE_DATETIME($timestamp, "0"),
-				'cat'    => GET_CATEGORY($cat),
-				'points' => TRANSLATE_COMMA($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 and count points
-			$OUT .= LOAD_TEMPLATE("member_unconfirmed_row", true, $content);
+			// Load row template
+			if (getConfig('show_points_unconfirmed') == 'Y') {
+				$OUT .= loadTemplate('member_unconfirmed_row', true, $content);
+			} else {
+				$OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
+			}
+
+			// Count points
 			$sum += $pay;
-		}
-		 else
-		{
+		} else {
 			// Prepare data for template
 			$content = array(
-				'sw'    => $SW,
-				'data'  => $DATA,
-				'probl' => $PROBLEM,
+				'data'    => $data,
+				'message' => $message,
 			);
 
-			// Problem with mail detected
-			$OUT .= LOAD_TEMPLATE("member_unconfirmed_404", true, $content);
+			// Display points or not?
+			if (getConfig('show_points_unconfirmed') == 'Y') {
+				$OUT .= loadTemplate('member_unconfirmed_404', true, $content);
+			} else {
+				$OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
+			}
 		}
-		$SW = 3 - $SW;
-	}
+
+		// Free result
+		SQL_FREERESULT($result_data);
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Remember total points
-	define('__TOTAL_POINTS', TRANSLATE_COMMA($sum));
+	$content['total_points'] = $sum;
 
 	// Remember all generated rows in constant for the template
-	define('__UNCONFIRMED_ROWS', $OUT);
+	$content['rows'] = $OUT;
 
 	// Load main template
-	LOAD_TEMPLATE("member_unconfirmed_table");
-}
- else
-{
+	if (getConfig('show_points_unconfirmed') == 'Y') {
+		loadTemplate('member_unconfirmed_table', false, $content);
+	} else {
+		loadTemplate('member_unconfirmed_table_nopoints', false, $content);
+	}
+} else {
 	// No mails left to confirm... :)
-	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_TO_CONFIRM);
+	displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
-CLOSE_TABLE();
-//
+
+// [EOF]
 ?>