X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=03cb14da6ee2d435e4f98ff9d9425eb9ac8de36b;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hp=1389c33d6abf03212bbd06436156cf4488b5860a;hpb=9b93cb80c13ee59fbd935b2988127cf4a1135000;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 1389c33d6a..03cb14da6e 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -45,73 +45,113 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('member', __FILE__);
 
+// Essential extension ext-mailid must be active
+if (!isExtensionActive('mailid')) {
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
+	return;
+} // END - if
+
 // Shall we display a mail?
-if ((isGetRequestParameterSet('bonusid')) && (isExtensionActive('bonus'))) {
+if ((isGetRequestElementSet('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`
+	$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__);
+LIMIT 1',
+		array(bigintval(getRequestElement('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'] . '%}';
+	$content['timestamp'] = generateDateTime($content['timestamp'], '2');
+	$content['userid'] = getMemberId();
+	$content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
 	// Is ext-user active?
 	if (isExtensionActive('user')) {
-		// Get timestamp from insert
-		$content['user_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('bonusid', $content['id']), '2') . '%}';
+		// Default is never confirmed
+		$content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_NEVER_CONFIRMED=' . $content['id'] . '%}';
+
+		// Get the timestamp from the mail
+		$confirmedStamp = getEpocheTimeFromUserStats('bonusid', $content['id']);
+
+		// Have confirmed it?
+		if ($confirmedStamp > 0) {
+			// Get timestamp from insert
+			$content['user_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}';
+		} // END - if
 	} // 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 (isGetRequestElementSet('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
+	`{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_pool` AS p
+	`{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
 	s.pool_id=p.id
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_payments` AS pay
+	`{?_MYSQL_PREFIX?}_payments` AS `pay`
 ON
-	p.payment_id=pay.id
+	p.`payment_id`=pay.`id`
 WHERE
-	s.id=%s
+	s.`id`=%s
 LIMIT 1",
-		array(bigintval(getRequestParameter('mailid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestElement('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'] . '%}';
+	$content['timestamp'] = generateDateTime($content['timestamp'], '2');
+	$content['userid'] = getMemberId();
+	$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
 
 	// Is ext-user active?
 	if (isExtensionActive('user')) {
-		// Get timestamp from insert
-		$content['user_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime(getEpocheTimeFromUserStats('mailid', $content['id']), '2') . '%}';
+		// Default is never confirmed
+		$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_NEVER_CONFIRMED=' . $content['id'] . '%}';
+
+		// Get the timestamp from the mail
+		$confirmedStamp = getEpocheTimeFromUserStats('mailid', $content['id']);
+
+		// Have confirmed it?
+		if ($confirmedStamp > 0) {
+			// Get timestamp from insert
+			$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_ON=' . generateDateTime($confirmedStamp, '2') . '%}';
+		} // END - if
 	} // 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);
@@ -139,21 +179,25 @@ if (!SQL_HASZERONUMS($result)) {
 	while ($row = SQL_FETCHARRAY($result)) {
 		// Load data from stats table...
 		$cat = '';
-		$result_data = false;
+		$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
+	s.`subject`,
+	s.`timestamp_ordered`,
+	s.`cat_id`,
+	s.`payment_id`,
+	p.`sender`
 FROM
-	`{?_MYSQL_PREFIX?}_user_stats` AS s
+	`{?_MYSQL_PREFIX?}_user_stats` AS `s`
 LEFT JOIN
-	`{?_MYSQL_PREFIX?}_pool` AS p
+	`{?_MYSQL_PREFIX?}_pool` AS `p`
 ON
-	s.pool_id=p.id
+	s.`pool_id`=p.`id`
 WHERE
-	s.id=%s
+	s.`id`=%s
 LIMIT 1",
 					array(bigintval($row['stats_id'])), __FILE__, __LINE__);
 				$row['link_type'] = 'mailid';
@@ -170,7 +214,7 @@ LIMIT 1",
 				break;
 
 			default: // Unknown type detected!
-				logDebugMessage(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
+				reportBug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
 				break;
 		}
 
@@ -211,9 +255,9 @@ LIMIT 1",
 
 			// Load row template
 			if (getConfig('show_points_unconfirmed') == 'Y') {
-				$OUT .= loadTemplate('member_unconfirmed_row', true, $content);
+				$OUT .= loadTemplate('member_unconfirmed_row', TRUE, $content);
 			} else {
-				$OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
+				$OUT .= loadTemplate('member_unconfirmed_row_nopoints', TRUE, $content);
 			}
 
 			// Count points
@@ -227,9 +271,9 @@ LIMIT 1",
 
 			// Display points or not?
 			if (getConfig('show_points_unconfirmed') == 'Y') {
-				$OUT .= loadTemplate('member_unconfirmed_404', true, $content);
+				$OUT .= loadTemplate('member_unconfirmed_404', TRUE, $content);
 			} else {
-				$OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
+				$OUT .= loadTemplate('member_unconfirmed_404_nopoints', TRUE, $content);
 			}
 		}
 
@@ -248,9 +292,9 @@ LIMIT 1",
 
 	// Load main template
 	if (getConfig('show_points_unconfirmed') == 'Y') {
-		loadTemplate('member_unconfirmed_table', false, $content);
+		loadTemplate('member_unconfirmed_table', FALSE, $content);
 	} else {
-		loadTemplate('member_unconfirmed_table_nopoints', false, $content);
+		loadTemplate('member_unconfirmed_table_nopoints', FALSE, $content);
 	}
 } else {
 	// No mails left to confirm... :)