X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-unconfirmed.php;h=2c4f10bef5412746b29a2cb24fc5f2d4ca9152b7;hb=a090e351c49fe021fb3064325694da03402332e0;hp=2ea5c6d34a34f602e48c76e20a8df721a0861f2f;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 2ea5c6d34a..2c4f10bef5 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -36,21 +41,21 @@ if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif (!IS_MEMBER()) {
-	LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("mailid")) && (!IS_ADMIN())) {
+	LOAD_URL('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('mailid')) && (!IS_ADMIN())) {
 	LOAD_URL("modules.php?module=login");
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 // Shall we display a mail?
-if ((isset($_GET['bonusid'])) && (EXT_IS_ACTIVE("bonus"))) {
+if ((REQUEST_ISSET_GET(('bonusid'))) && (EXT_IS_ACTIVE('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($_GET['bonusid'])), __FILE__, __LINE__);
+		array(bigintval(REQUEST_GET('bonusid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
@@ -64,11 +69,11 @@ WHERE id=%s LIMIT 1",
 	$content['is_notify'] = TRANSLATE_YESNO($content['is_notify']);
 	$content['sender']    = _ADMIN_SHORT;
 	$content['time']      = CREATE_FANCY_TIME($content['time']);
-	$content['uid']       = $GLOBALS['userid'];
+	$content['uid']       = getUserId();
 
 	// Get timestamp from insert
-	$content['user_status'] = sprintf(MEMBER_MAIL_BONUS_CONFIRMED_ON,
-		MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("bonusid", $content['id']), "2")
+	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_BONUS_CONFIRMED_ON'),
+		MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('bonusid', $content['id']), "2")
 	);
 
 	// Display it depending on mail (data) type
@@ -76,7 +81,7 @@ WHERE id=%s LIMIT 1",
 
 	// Free result
 	SQL_FREERESULT($result_data);
-} elseif (isset($_GET['mailid'])) {
+} elseif (REQUEST_ISSET_GET(('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
@@ -85,7 +90,7 @@ 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($_GET['mailid'])), __FILE__, __LINE__);
+		array(bigintval(REQUEST_GET('mailid'))), __FILE__, __LINE__);
 
 	// Load data
 	$content = SQL_FETCHARRAY($result_data);
@@ -97,11 +102,11 @@ WHERE s.id=%s LIMIT 1",
 	$content['category']  = GET_CATEGORY($content['cat_id']);
 	$content['points']    = TRANSLATE_COMMA($content['points']);
 	$content['time']      = CREATE_FANCY_TIME($content['time']);
-	$content['uid']       = $GLOBALS['userid'];
+	$content['uid']       = getUserId();
 
 	// Get timestamp from insert
-	$content['user_status'] = sprintf(MEMBER_MAIL_NORMAL_CONFIRMED_ON,
-		MAKE_DATETIME(USER_STATS_GET_TIMESTAMP("mailid", $content['id']), "2")
+	$content['user_status'] = sprintf(getMessage('MEMBER_MAIL_NORMAL_CONFIRMED_ON'),
+		MAKE_DATETIME(USER_STATS_GET_TIMESTAMP('mailid', $content['id']), "2")
 	);
 
 	// Display it depending on mail (data) type
@@ -111,23 +116,25 @@ WHERE s.id=%s LIMIT 1",
 	SQL_FREERESULT($result_data);
 }
 
-if (EXT_IS_ACTIVE("bonus")) {
+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, stats_id DESC",
-		array($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __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($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 }
 
 // Mails left for confirmation?
 if (SQL_NUMROWS($result) > 0) {
 	// Please confirm these mails!
-	$sum = 0; $SW = 2; $OUT = "";
+	$sum = 0; $OUT = ''; $SW = 2;
+
+	// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 	while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
 		// Load data from stats table...
-		$cat = ""; $result_data = false;
+		$cat = ''; $result_data = false;
 		switch ($type)
 		{
 		case "NORMAL":
@@ -138,13 +145,13 @@ ON s.pool_id=p.id
 WHERE s.id=%s
 LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__);
-			$type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
+			$type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('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 = BONUS_MAIL_PROBLEM;
+			$type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
 			break;
 
 		default: // Unknown type detected!
@@ -153,35 +160,35 @@ LIMIT 1",
 		}
 
 		// Data found to this mail?
-		if ((SQL_NUMROWS($result_data) == 1) && (($type == "mailid") || ($type == "bonusid"))) {
+		if ((SQL_NUMROWS($result_data) == 1) && (($type == 'mailid') || ($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;
+				$subject = getMessage('DEFAULT_SUBJECT_LINE');
 			} else {
 				// Compile it
 				$subject = COMPILE_CODE($subject);
 			}
 
 			// Prepare sender id
-			if (($sender > 0) && ($type == "mailid")) {
+			if (($sender > 0) && ($type == 'mailid')) {
 				// Sender id
 				$sender = bigintval($sender);
-			} elseif ($type == "bonusid") {
+			} elseif ($type == 'bonusid') {
 				// Is admin
-				$sender = _ADMIN_SHORT;
+				$sender = getMessage('_ADMIN_SHORT');
 			} else {
 				// Deleted
-				$sender = EMAIL_STATUS_DELETED;
+				$sender = getMessage('EMAIL_STATUS_DELETED');
 			}
 
 			// Prepare data for template
 			$content = array(
 				'sw'      => $SW,
-				'uid'     => $GLOBALS['userid'],
+				'uid'     => getUserId(),
 				'data'    => bigintval($DATA),
 				'type'    => $type,
 				'subject' => $subject,
@@ -192,7 +199,7 @@ LIMIT 1",
 			);
 
 			// Load row template
-			if (getConfig('show_points_unconfirmed') == "Y") {
+			if (getConfig('show_points_unconfirmed') == 'Y') {
 				$OUT .= LOAD_TEMPLATE("member_unconfirmed_row", true, $content);
 			} else {
 				$OUT .= LOAD_TEMPLATE("member_unconfirmed_row_nopoints", true, $content);
@@ -209,7 +216,7 @@ LIMIT 1",
 			);
 
 			// Display points or not?
-			if (getConfig('show_points_unconfirmed') == "Y") {
+			if (getConfig('show_points_unconfirmed') == 'Y') {
 				$OUT .= LOAD_TEMPLATE("member_unconfirmed_404", true, $content);
 			} else {
 				$OUT .= LOAD_TEMPLATE("member_unconfirmed_404_nopoints", true, $content);
@@ -233,14 +240,14 @@ LIMIT 1",
 	define('__UNCONFIRMED_ROWS', $OUT);
 
 	// Load main template
-	if (getConfig('show_points_unconfirmed') == "Y") {
+	if (getConfig('show_points_unconfirmed') == 'Y') {
 		LOAD_TEMPLATE("member_unconfirmed_table");
 	} else {
 		LOAD_TEMPLATE("member_unconfirmed_table_nopoints");
 	}
 } else {
 	// No mails left to confirm... :)
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
+	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_NO_MAILS_TO_CONFIRM'));
 }
 
 //