X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=b1ef76e919167274f062d112ddd6daede52349cb;hp=eb3cd2fd4cfb39da59ad45c79046fd8aaa9c94c4;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=566cbcf381d60410b4c5b3a2fc4cd7bfdf49b8fc

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index eb3cd2fd4c..b1ef76e919 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -8,17 +8,16 @@
  * -------------------------------------------------------------------- *
  * Short description : Unconfirmed mails                                *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Unbestä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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 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 *
@@ -38,232 +37,259 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+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 ((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 = sqlQueryEscaped('SELECT
+	`id`,
+	`subject`,
+	`timestamp`,
+	`cat_id`,
+	`points`,
+	`text`,
+	`is_notify`,
+	`data_type`,
+	`time`,
+	`url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 WHERE
 	`id`=%s
-LIMIT 1",
+LIMIT 1',
 		array(bigintval(getRequestElement('bonusid'))), __FILE__, __LINE__);
 
 	// Load data
-	$content = SQL_FETCHARRAY($result_data);
+	$content = sqlFetchArray($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']    = getMemberId();
-
-	// 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_mail_status'] = '{%message,MEMBER_MAIL_BONUS_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
+
+	// Is ext-user active?
+	if (isExtensionActive('user')) {
+		// 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 (isGetRequestElementSet(('mailid'))) {
+	sqlFreeResult($result_data);
+} 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
+	$result_data = sqlQueryEscaped("SELECT
+	`id` AS `stats_id`,
+	`pool_id`,
+	`subject`,
+	`timestamp_ordered`,
+	`cat_id`,
 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
+	`{?_MYSQL_PREFIX?}_user_stats` AS `s`
 WHERE
-	s.id=%s
+	`id`=%s
 LIMIT 1",
 		array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
 
 	// Load data
-	$content = SQL_FETCHARRAY($result_data);
+	$content = sqlFetchArray($result_data);
+	$content = merge_array($content, getPoolDataFromId($content['pool_id']));
 
 	// 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']    = getMemberId();
-
-	// Get timestamp from insert
-	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
-		generateDateTime(getTimestampFromUserStats('mailid', $content['id']), 2)
-	);
+	$content['timestamp_ordered'] = generateDateTime($content['timestamp_ordered'], '2');
+	// @TODO This call cannot be saved as EL code cannot be "framed" in other EL code
+	$content['userid'] = getMemberId();
+	$content['user_mail_status'] = '{%message,MEMBER_MAIL_NORMAL_CONFIRMED_UNKNOWN=' . $content['id'] . '%}';
+
+	// Is ext-user active?
+	if (isExtensionActive('user')) {
+		// 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);
+	sqlFreeResult($result_data);
 }
 
 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",
+	$result = sqlQueryEscaped("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 = sqlQueryEscaped("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 (!ifSqlHasZeroNumRows($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 = sqlFetchArray($result)) {
 		// Load data from stats table...
 		$cat = '';
-		$result_data = false;
-		$PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
-		$DATA = $id . '/' . $id2 . '/' . $type;
-		switch ($type) {
+		$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
+				$result_data = sqlQueryEscaped("SELECT
+	`s`.`subject`,
+	`s`.`timestamp_ordered` AS `timestamp`,
+	`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($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 = sqlQueryEscaped("SELECT `subject`, `timestamp`, `cat_id`, `points`, NULL 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));
+				reportBug(__FILE__, __LINE__, sprintf("Unknown mail type %s detected.", $row['link_type']));
 				break;
-		}
+		} // END - switch
 
 		// Data found to this mail?
-		if ((SQL_NUMROWS($result_data) == 1) && (($type == 'mailid') || ($type == 'bonusid'))) {
-			// Mail was found!
-			list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
+		if ((sqlNumRows($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
+			// Mail was found
+			$rowData = sqlFetchArray($result_data);
 
 			// Subject line found?
-			if (empty($subject)) {
+			if (empty($rowData['subject'])) {
 				// No subject line!
-				$subject = getMessage('DEFAULT_SUBJECT_LINE');
+				$rowData['subject'] = '{--DEFAULT_SUBJECT--}';
 			} // END - if
 
 			// Prepare sender id
-			if (($sender > 0) && ($type == 'mailid')) {
+			if ((isValidId($rowData['sender'])) && ($row['link_type'] == 'mailid')) {
 				// Sender id
-				$sender = bigintval($sender);
-			} elseif ($type == 'bonusid') {
+				$rowData['sender'] = bigintval($rowData['sender']);
+			} elseif ($row['link_type'] == 'bonusid') {
 				// Is admin
-				$sender = getMessage('USERNAME_ADMIN_SHORT');
+				$rowData['sender'] = '{--USERNAME_ADMIN_SHORT--}';
 			} else {
 				// Deleted
-				$sender = getMessage('EMAIL_STATUS_DELETED');
+				$rowData['sender'] = '{--EMAIL_STATUS_DELETED--}';
 			}
 
 			// Prepare data for template
-			$content = array(
-				'sw'        => $SW,
-				'userid'    => getMemberId(),
-				'data'      => bigintval($DATA),
-				'type'      => $type,
-				'subject'   => $subject,
-				'sender'    => $sender,
-				'timestamp' => generateDateTime($timestamp, 2),
-				'cat'       => getCategory($cat),
-				'points'    => translateComma($pay),
+			// @TODO cat_id is unused
+			$rowData = array(
+				'data'              => bigintval($data),
+				// @TODO This 'userid' cannot be saved because of encapsulated EL code
+				'userid'            => getMemberId(),
+				'link_type'         => $row['link_type'],
+				'subject'           => $rowData['subject'],
+				'sender'            => $rowData['sender'],
+				'timestamp_ordered' => generateDateTime($rowData['timestamp_ordered'], 2),
+				'payment_id'        => $rowData['payment_id'],
 			);
 
 			// Load row template
-			if (getConfig('show_points_unconfirmed') == 'Y') {
-				$OUT .= loadTemplate('member_unconfirmed_row', true, $content);
+			if (isShowPointsUnconfirmedEnabled()) {
+				$OUT .= loadTemplate('member_list_unconfirmed_row', TRUE, $rowData);
 			} else {
-				$OUT .= loadTemplate('member_unconfirmed_row_nopoints', true, $content);
+				$OUT .= loadTemplate('member_list_unconfirmed_nopoints_row', TRUE, $rowData);
 			}
 
-			// Count points
-			$sum += $pay;
+			// Count points (price)
+			$sum += getPaymentPrice($rowData['payment_id']);
 		} else {
 			// Prepare data for template
-			$content = array(
-				'sw'    => $SW,
-				'data'  => $DATA,
-				'probl' => $PROBLEM,
+			$rowData = array(
+				'data'    => $data,
+				'message' => $message,
 			);
 
 			// Display points or not?
-			if (getConfig('show_points_unconfirmed') == 'Y') {
-				$OUT .= loadTemplate('member_unconfirmed_404', true, $content);
+			if (isShowPointsUnconfirmedEnabled()) {
+				$OUT .= loadTemplate('member_list_unconfirmed_404_row', TRUE, $rowData);
 			} else {
-				$OUT .= loadTemplate('member_unconfirmed_404_nopoints', true, $content);
+				$OUT .= loadTemplate('member_list_unconfirmed_nopoints_404_row', TRUE, $rowData);
 			}
 		}
 
 		// Free result
-		SQL_FREERESULT($result_data);
-
-		// Switch color
-		$SW = 3 - $SW;
+		sqlFreeResult($result_data);
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($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;
 
 	// Load main template
-	if (getConfig('show_points_unconfirmed') == 'Y') {
-		loadTemplate('member_unconfirmed_table', false, $content);
+	if (isShowPointsUnconfirmedEnabled()) {
+		loadTemplate('member_list_unconfirmed', FALSE, $content);
 	} else {
-		loadTemplate('member_unconfirmed_table_nopoints', false, $content);
+		loadTemplate('member_list_unconfirmed_nopoints', FALSE, $content);
 	}
 } else {
 	// No mails left to confirm... :)
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+	displayMessage('{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]