X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=568ebf4c63f6bba687a54c8f0fd23f6b40c6bd88;hp=2e44fc37c9617e5b071d9ef612fabe8307d13524;hb=57227d33e870ec5cd271209c4a978a52b45c2dd6;hpb=b8c86fa12322603c24a88ea2b0fd3dbeba612752

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 2e44fc37c9..568ebf4c63 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/09/2004 *
- * ================                             Last change: 10/31/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/09/2004 *
+ * ===================                          Last change: 10/31/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_unconfirmed.php                        *
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Unbest. Mail-Links auflisten                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,142 +37,163 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif (!EXT_IS_ACTIVE("mailid")) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mailid");
-	return;
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+addMenuDescription('admin', __FILE__);
+
+if (!isExtensionActive('mailid')) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+	return;
+} // END - if
 
 // Don't load the admin_list_unconfirmed template by default
 $listed = false;
 
-if (REQUEST_ISSET_GET(('mid'))) {
-	// List confirmation links from your member's mail orders
-	define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_MEMBER_LINKS'));
-
+// List confirmation links from normal or bonus mails
+if (isGetRequestParameterSet('mid')) {
 	// SQL query for mail data
-	$SQL = "SELECT DISTINCT s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec  FROM `{!_MYSQL_PREFIX!}_pool` AS p
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_stats` AS s
-ON p.id=s.pool_id
-WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
-
-	// Column, type and ID for member's mail
-	$col = "stats_id"; $type = "NORMAL"; $ID = "-1";
+	$sql = "SELECT
+	s.id, p.sender, p.subject, p.text, p.url, p.timestamp, s.max_rec
+FROM
+	`{?_MYSQL_PREFIX?}_pool` AS p
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_user_stats` AS s
+ON
+	p.id=s.pool_id
+WHERE
+	p.id='".getRequestParameter('mid')."'
+LIMIT 1";
+
+	// Column, type and id for member's mail
+	$col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
 
 	// Load admin_list_unconfirmed template
-	$listed = true; $DATA = REQUEST_GET('mid'); $LINK = "mailid";
-} elseif ((REQUEST_ISSET_GET(('bid'))) && (EXT_IS_ACTIVE("bonus"))) {
-	// List confirmation links from bonus mails
-	define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+	$listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
+} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
+	// @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 
 	// SQL query for mail data (both ids are required for compatiblity to above normal mail
-	$SQL = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".REQUEST_GET('bid')."' LIMIT 1";
+	$sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
 
-	// Column, type and ID for member's mail
-	$col = "bonus_id"; $type = "BONUS"; $ID = REQUEST_GET('bid');
+	// Column, type and id for member's mail
+	$col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
 
 	// Load admin_list_unconfirmed template
-	$listed = true; $DATA = $ID; $LINK = "bonusid";
+	$listed = true; $DATA = $ID; $LINK = 'bonusid';
 } else {
-	// "Please do not call me directly."
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
+	// @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
 }
 
 // Shall I display links or not?
 if ($listed === true) {
 	// Load mail data
-	$result = SQL_QUERY($SQL, __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
+	$result_master = SQL_QUERY($sql, __FILE__, __LINE__);
+
+	// Do we have an entry?
+	if (SQL_NUMROWS($result_master) == 1) {
 		// Mail order / bonus mail found!
-		list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		// @TODO Rewrite this to $content = SQL_FETCHARRAY(), look some lines above for two differrent queries
+		list($stats_id, $sender, $subj, $text, $url, $stamp, $max) = SQL_FETCHROW($result_master);
 
 		// Transfer data to constants for the template
-		if (($stats_id > 0) && ($ID == "-1")) $ID = $stats_id;
-		if ($col == "bonus_id") $sender = 0;
-		define('__LIST_UNCON_SENDER' , $sender);
-		define('__LIST_UNCON_SUBJECT', COMPILE_CODE($subj));
-		define('__LIST_UNCON_TEXT'   , COMPILE_CODE($text));
-		define('__LIST_UNCON_URL'    , encodeString($url));
-		define('__LIST_UNCON_STAMP'  , MAKE_DATETIME($stamp, "2"));
+		if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
+		if ($col == 'bonus_id') $sender = '0';
 
 		// Load unconfirmed mail links. Hmmm, this select query is pretty cool
 		// but it does only show unconfirmed mail links from existing user
 		// accounts. So if you have delete one you did not see those links
-		//
-		$result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email
-FROM `{!_MYSQL_PREFIX!}_user_links` AS l
-LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u
-ON l.userid=u.userid
-WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
+		$result = SQL_QUERY_ESC("SELECT
+	l.userid, u.status, u.surname, u.family, u.gender, u.email
+FROM
+	`{?_MYSQL_PREFIX?}_user_links` AS l
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_user_data` AS u
+ON
+	l.userid=u.userid
+WHERE
+	l.%s='%s' ORDER BY l.userid LIMIT %s",
 			array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+
+		// Total number of unconfirmed mails
 		$unconfirmed = SQL_NUMROWS($result);
-		define('__LIST_UNCO_UNCONFIRMED', $unconfirmed);
 
 		if ($unconfirmed > 0) {
 			// At least one link left to confirm
-			$OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
-			$SW = 2;
-			while (list($uid, $status, $sname, $fname, $gender, $email) = SQL_FETCHROW($result)) {
+			$OUT = ''; $SW = 2;
+			while ($content = SQL_FETCHARRAY($result)) {
 				// Prepare data for the row template
+				// @TODO Rewritings: userid->userid
 				$content = array(
 					'sw'     => $SW,
-					'u_link' => ADMIN_USER_PROFILE_LINK($uid),
-					'uid'    => $uid,
+					'u_link' => generateUserProfileLink($content['userid']),
+					'userid' => $content['userid'],
 					'link'   => $LINK,
 					'id'     => $ID,
-					'email'  => "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>",
-					'status' => TRANSLATE_STATUS($status),
+					'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
+					'status' => translateUserStatus($content['status']),
 				);
 
 				// Load row template and switch colors
-				$OUT .= LOAD_TEMPLATE("admin_list_unconfirmed_row", true, $content);
+				$OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
 				$SW = 3 - $SW;
-			}
-			$OUT .= "</table>\n";
+			} // END - while
+
+			// Render it in our new listing
+			$OUT = loadTemplate('admin_list_unconfirmed_list', true, $OUT);
 
 			// Free memory
 			SQL_FREERESULT($result);
-
-			// Store table rows in a constant
-			define('__LIST_UNCON_LISTING', $OUT);
 		} else {
 			// All links are confirmed... strange, you shall normally not get a link to this place in this scenario... hmmm.
-			define('__LIST_UNCON_LISTING', LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT')));
+			$OUT = loadTemplate('admin_settings_saved', true, getMessage('ADMIN_UNCONFIRMED_NO_LINK_LEFT'));
 		}
 
+		// Prepare content
+		$content = array(
+			'sender_link'   => generateUserProfileLink($sender),
+			'subject'       => $subj,
+			'text'          => $text,
+			'url'           => generateFrametesterUrl($url),
+			'unconfirmed'   => $unconfirmed,
+			'stamp'         => generateDateTime($stamp, 2),
+			'rows'          => $OUT
+		);
+
 		// Load final template
-		LOAD_TEMPLATE("admin_list_unconfirmed");
-	} elseif (REQUEST_GET('mid') > 0) {
+		loadTemplate('admin_list_unconfirmed', false, $content);
+	} elseif (getRequestParameter('mid') > 0) {
 		// Data in pool or in user_stats not found, so let's find out where data is missing
-		$result1 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
+		$result1 = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
 			array(bigintval($ID)), __FILE__, __LINE__);
-		$result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+		$result2 = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
 			array(bigintval($ID)), __FILE__, __LINE__);
+
 		if (SQL_NUMROWS($result1) == 1) {
 			// pool table
-			LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID)));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_POOL_MISSING', $ID));
 		} elseif (SQL_NUMROWS($result2) == 1) {
 			// user_stats table
-			LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID)));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNCONFIRMED_STATS_MISSING', $ID));
 		} else {
 			// both or link is invalid
-			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
 		}
 
 		// Free memory
 		SQL_FREERESULT($result1);
 		SQL_FREERESULT($result2);
-	} elseif (REQUEST_ISSET_GET(('bid'))) {
+	} elseif (isGetRequestParameterSet('bid')) {
 		// Data in bonus table not found
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_UNCONFIRMED_INVALID_LINK'));
 	}
+
+	// Free result
+	SQL_FREERESULT($result_master);
 }
 
-//
+// [EOF]
 ?>