X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=c337642ab1d8b4734e2e784864ecdc5413725767;hb=f8edd98ca34b49528284a22bd27aa937844f25ac;hp=394508fa856d1443ed1ae92348b8f4e247173f7d;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 394508fa85..c337642ab1 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -41,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('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
 	return;
 } // END - if
 
@@ -64,7 +64,7 @@ if (isGetRequestParameterSet('userid')) {
 		}
 
 		// Do we have some entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Some unconfirmed mails left
 			if (getRequestParameter('delete') == "all") {
 				// Delete all unconfirmed mails by this user
@@ -72,11 +72,11 @@ if (isGetRequestParameterSet('userid')) {
 					array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
 
 				// Prepare mail and send it away
-				$message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
-				sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
+				$message = loadEmailTemplate('member_delete_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+				sendEmail(getUserData('userid'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
 				// Display message
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
+				displayMessage('{--ADMIN_LINKS_DELETED--}');
 			} else {
 				// Init variables
 				$OUT = '';
@@ -84,11 +84,10 @@ if (isGetRequestParameterSet('userid')) {
 				// 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
-					$cat = '';
+					// Initializes all variables
 					$DATA = '';
 					$PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
-					$result_data = false; // Closes Bug #58
+					$result_data = false;
 
 					// Load data from stats table...
 					// @TODO Rewrite this to includes/filter
@@ -115,7 +114,7 @@ if (isGetRequestParameterSet('userid')) {
 
 					// 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
@@ -161,11 +160,11 @@ if (isGetRequestParameterSet('userid')) {
 			}
 		} else {
 			// No mails left to confirm
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+			displayMessage('{%message,ADMIN_MEMBER_LINKS=' . bigintval(getRequestParameter('userid')) . '%}');
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+		displayMessage('{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed