X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=3d375c350fd9746650ab1a8576a31ac1721264c6;hp=69c19b7ae209d42fd12a7d455f99cf4d727609ed;hb=cf3765c38cf0a76f396aca291f71858936e92956;hpb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 69c19b7ae2..3d375c350f 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/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,20 +70,20 @@ 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')));
-				sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
+				sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJECT--}', $message);
 
 				// Display message
-				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
 			} else {
 				// Init variables
-				$OUT = ''; $SW = 2;
+				$OUT = '';
 
 				// List all unconfirmed mails
 				// @TODO Find a way to rewrite this. See some lines above for different queries
@@ -90,7 +91,7 @@ if (isGetRequestElementSet('userid')) {
 					// Initializes some variables
 					$cat = '';
 					$DATA = '';
-					$PROBLEM = getMessage('GENERAL_MAIL_PROBLEM');
+					$PROBLEM = '{--GENERAL_MAIL_PROBLEM--}';
 					$result_data = false; // Closes Bug #58
 
 					// Load data from stats table...
@@ -99,15 +100,15 @@ if (isGetRequestElementSet('userid')) {
 						case 'NORMAL':
 							$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>";
+							$type = 'mailid'; $DATA = $id; $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
+							$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>";
+							$type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
+							$LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
 							break;
 
 						default: // Problem in application detected!
@@ -121,11 +122,10 @@ if (isGetRequestElementSet('userid')) {
 						$content = SQL_FETCHARRAY($result_data);
 
 						// Fix empty subject
-						if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+						if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
 						// Prepare data for the row template
 						$content = array(
-							'sw'        => $SW,
 							'link'      => $LINK,
 							'subject'   => $content['subject'],
 							'timestamp' => generateDateTime($content['timestamp'], 0),
@@ -136,17 +136,15 @@ if (isGetRequestElementSet('userid')) {
 						$OUT .= loadTemplate('admin_list_links_row', true, $content);
 					} else {
 						// Load template for error
-						$OUT .= loadTemplate('admin_list_links_problem',
+						$OUT .= loadTemplate('admin_list_links_problem', true,
 							array(
-								'sw'		=> $SW,
 								'problem'	=> $PROBLEM,
 								'data'		=> $DATA
 							)
 						);
 					}
 
-					// Switch color and free result
-					$SW = 3 - $SW;
+					// Free result
 					SQL_FREERESULT($result_data);
 				} // END - while
 
@@ -156,21 +154,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