X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=ffa88d7eac8e003f866402f1a5f3e388b45ff068;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hp=1e7e55cb04c0128f5dc38bfbe0640803bde2916f;hpb=916bba4f00ee924f0d88b8fc273dee5bfb798aed;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 1e7e55cb04..ffa88d7eac 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -1,14 +1,14 @@
 <?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::                                                            $ *
@@ -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,48 +42,45 @@ 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`
+	`id`, `subject`, `timestamp`, `cat_id` AS `category`, `points`, `text`, `is_notify`, `data_type`, `time`, `url`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus`
 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']    = 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_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
@@ -99,25 +97,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']    = getMemberId();
-
-	// 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);
@@ -134,9 +133,9 @@ if (isExtensionActive('bonus')) {
 }
 
 // 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();
@@ -146,7 +145,7 @@ if (SQL_NUMROWS($result) > 0) {
 		// Load data from stats table...
 		$cat = '';
 		$result_data = false;
-		$PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
+		$PROBLEM = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
 		$DATA = $id . '/' . $id2 . '/' . $type;
 		switch ($type) {
 			case 'NORMAL':
@@ -164,7 +163,7 @@ LIMIT 1",
 					array(bigintval($id)), __FILE__, __LINE__);
 				$type = 'mailid';
 				$DATA = $id;
-				$PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+				$PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
 				break;
 
 			case 'BONUS':
@@ -172,7 +171,7 @@ LIMIT 1",
 					array(bigintval($id2)), __FILE__, __LINE__);
 				$type = 'bonusid';
 				$DATA = $id2;
-				$PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+				$PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
 				break;
 
 			default: // Unknown type detected!
@@ -188,7 +187,7 @@ LIMIT 1",
 			// Subject line found?
 			if (empty($subject)) {
 				// No subject line!
-				$subject = getMessage('DEFAULT_SUBJECT_LINE');
+				$subject = '{--DEFAULT_SUBJECT_LINE--}';
 			} // END - if
 
 			// Prepare sender id
@@ -197,23 +196,20 @@ LIMIT 1",
 				$sender = bigintval($sender);
 			} elseif ($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'  => getMemberId(),
-				'data'    => bigintval($DATA),
-				'type'    => $type,
-				'subject' => $subject,
-				'sender'  => $sender,
-				'stamp'   => generateDateTime($timestamp, 2),
-				'cat'     => getCategory($cat),
-				'points'  => translateComma($pay),
+				'data'      => bigintval($DATA),
+				'type'      => $type,
+				'subject'   => $subject,
+				'sender'    => $sender,
+				'timestamp' => generateDateTime($timestamp, 2),
+				'points'    => $pay,
 			);
 
 			// Load row template
@@ -228,7 +224,6 @@ LIMIT 1",
 		} else {
 			// Prepare data for template
 			$content = array(
-				'sw'    => $SW,
 				'data'  => $DATA,
 				'probl' => $PROBLEM,
 			);
@@ -243,16 +238,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 +257,7 @@ LIMIT 1",
 	}
 } else {
 	// No mails left to confirm... :)
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+	loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_MAILS_TO_CONFIRM--}');
 }
 
 // [EOF]