X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=c74ec6ca251d8fe92d689a43a6b8779057064f39;hb=995488beda665a1fc3de65df95f2d1ae236d1245;hp=731b4edc61f6fc60b5d75859b4f7a24d7399adab;hpb=9f6c30cc0e06098171d773d671292081ecee3d29;p=mailer.git

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 731b4edc61..c74ec6ca25 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 01/28/2004 *
- * ================                             Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 01/28/2004 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_links.php                              *
@@ -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 *
@@ -49,19 +50,19 @@ if (!isExtensionActive('mailid')) {
 	return;
 } // END - if
 
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
 	// Check if the user already exists
-	if (fetchUserData(getRequestElement('userid'))) {
+	if (fetchUserData(getRequestParameter('userid'))) {
 		// Grab user's all unconfirmed mails
 		// @TODO Try to rewrite this to a filter
 		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 `id`",
-				array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+				array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 		} else {
 			// Load stats id (2nd will be ignored later! But it is needed for the same fetchrow command)
 			$result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
-				array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+				array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 		}
 
 		// Get number of rows from the query
@@ -69,13 +70,13 @@ if (isGetRequestElementSet('userid')) {
 
 		if ($nums > 0) {
 			// Some unconfirmed mails left
-			if (getRequestElement('del') == "all") {
+			if (getRequestParameter('del') == "all") {
 				// Delete all unconfirmed mails by this user
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s LIMIT %s",
-					array(bigintval(getRequestElement('userid')), $nums), __FILE__, __LINE__);
+					array(bigintval(getRequestParameter('userid')), $nums), __FILE__, __LINE__);
 
 				// Prepare mail and send it away
-				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestElement('userid')));
+				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
 				sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
 
 				// Display message
@@ -97,17 +98,17 @@ if (isGetRequestElementSet('userid')) {
 					// @TODO Rewrite this to includes/filter
 					switch ($type) {
 						case 'NORMAL':
-							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 								array(bigintval($id)), __FILE__, __LINE__);
 							$type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
-							$LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
+							$LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;mailid=' . $id . '%}" target="_blank">' . $id . '</a>';
 							break;
 
 						case 'BONUS':
 							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array(bigintval($id2)), __FILE__, __LINE__);
 							$type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
-							$LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+							$LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
 							break;
 
 						default: // Problem in application detected!
@@ -118,28 +119,30 @@ if (isGetRequestElementSet('userid')) {
 
 					if (SQL_NUMROWS($result_data) == 1) {
 						// Mail was found!
-						list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
-						if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');
+						$content = SQL_FETCHARRAY($result_data);
+
+						// Fix empty subject
+						if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
 
 						// Prepare data for the row template
 						$content = array(
-							'sw'      => $SW,
-							'link'    => $LINK,
-							'subject' => $subject,
-							'stamp'   => generateDateTime($timestamp, 0),
-							'cat'     => getCategory($cat),
+							'sw'        => $SW,
+							'link'      => $LINK,
+							'subject'   => $content['subject'],
+							'timestamp' => generateDateTime($content['timestamp'], 0),
+							'cat'       => getCategory($content['cat_id']),
 						);
 
 						// Load row template
 						$OUT .= loadTemplate('admin_list_links_row', true, $content);
 					} else {
 						// Load template for error
-						$OUT .= loadTemplate('admin_list_links_problem',
-						array(
+						$OUT .= loadTemplate('admin_list_links_problem', true,
+							array(
 								'sw'		=> $SW,
 								'problem'	=> $PROBLEM,
 								'data'		=> $DATA
-						)
+							)
 						);
 					}
 
@@ -154,21 +157,21 @@ if (isGetRequestElementSet('userid')) {
 				// Remember list in constant for the template
 				$content['surname'] = getUserData('surname');
 				$content['family']  = getUserData('family');
-				$content['email']   = "<a href=\"" . generateEmailLink(getUserData('email'), 'user_data') . "\">".getUserData('email')."</a>";
+				$content['email']   = '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>';
 				$content['rows']    = $OUT;
 				$content['nums']    = $nums;
-				$content['userid']  = bigintval(getRequestElement('userid'));
+				$content['userid']  = bigintval(getRequestParameter('userid'));
 
 				// Load final template
 				loadTemplate('admin_list_links', false, $content);
 			}
 		} else {
 			// No mails left to confirm
-			loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_LINKS'), getRequestElement('userid')));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid')));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed