X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=667017a36de03590d0849b1699de6b782b1ff0c7;hb=e6766e4386b48732a43282c1ffd23e176cbb8949;hp=cd186ce69aefffb94bfa4107e675ad3033e3bed9;hpb=63292e4d81307117912793820b0064319d50a611;p=mailer.git

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index cd186ce69a..667017a36d 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 *
@@ -56,7 +57,7 @@ if (isGetRequestParameterSet('userid')) {
 		// @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`",
+			$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)
@@ -76,13 +77,13 @@ if (isGetRequestParameterSet('userid')) {
 
 				// Prepare mail and send it away
 				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-				sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+				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 (isGetRequestParameterSet('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,14 +100,14 @@ if (isGetRequestParameterSet('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');
+							$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');
+							$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;
 
@@ -121,15 +122,14 @@ if (isGetRequestParameterSet('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),
-							'cat'       => getCategory($content['cat_id']),
+							'cat_id'    => $content['cat_id'],
 						);
 
 						// Load row template
@@ -138,15 +138,13 @@ if (isGetRequestParameterSet('userid')) {
 						// Load template for error
 						$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
 
@@ -166,11 +164,11 @@ if (isGetRequestParameterSet('userid')) {
 			}
 		} else {
 			// No mails left to confirm
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed