X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=252a22e156282d5469b9288d3b80831f7834d2dd;hp=60b4e041b6240e0ab516bcc214c331397f6d8811;hb=c5fcebd3d76023296ffc643be8736ac5a9c3dbb6;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 60b4e041b6..252a22e156 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -14,11 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,10 +41,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
 	return;
 } // END - if
 
@@ -65,34 +63,32 @@ if (isGetRequestParameterSet('userid')) {
 				array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 		}
 
-		// Get number of rows from the query
-		$nums = SQL_NUMROWS($result);
-
-		if ($nums > 0) {
+		// Do we have some entries?
+		if (!SQL_HASZERONUMS($result)) {
 			// Some unconfirmed mails left
-			if (getRequestParameter('del') == "all") {
+			if (getRequestParameter('delete') == "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(getRequestParameter('userid')), $nums), __FILE__, __LINE__);
+					array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
 
 				// Prepare mail and send it away
-				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-				sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+				$message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+				sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
 				// Display message
-				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
+				displayMessage('{--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
 				while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
-					// Initializes some variables
+					// Initializes all variables
 					$cat = '';
 					$DATA = '';
-					$PROBLEM = getMessage('GENERAL_MAIL_PROBLEM');
-					$result_data = false; // Closes Bug #58
+					$PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
+					$result_data = false;
 
 					// Load data from stats table...
 					// @TODO Rewrite this to includes/filter
@@ -100,14 +96,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;
 
@@ -117,20 +113,20 @@ if (isGetRequestParameterSet('userid')) {
 							break;
 					} // END - switch
 
+					// Do we have an entry?
 					if (SQL_NUMROWS($result_data) == 1) {
-						// Mail was found!
+						// Mail was found
 						$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
@@ -139,39 +135,37 @@ 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
 
-				// Free memory
-				SQL_FREERESULT($result);
-
 				// 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['rows']    = $OUT;
-				$content['nums']    = $nums;
+				$content['nums']    = SQL_NUMROWS($result);
 				$content['userid']  = bigintval(getRequestParameter('userid'));
 
+				// Free memory
+				SQL_FREERESULT($result);
+
 				// Load final template
 				loadTemplate('admin_list_links', false, $content);
 			}
 		} else {
 			// No mails left to confirm
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
+			displayMessage(getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
+		displayMessage(getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed