X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=46a1f82f1dc4c101f176b7082a2f414bcc74deee;hp=cd43aebdabe981e5a5973ed7b30bf676cac29c05;hb=09d80c9e9fab53408938a69f25e46dfb1fb7a6a1;hpb=c4823d28fd0bd22250b16d73f2034f36fc54abda

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index cd43aebdab..46a1f82f1d 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
 	return;
 } // END - if
 
@@ -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')));
+				$message = loadEmailTemplate('member_delete_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
 				sendEmail(getUserData('email'), '{--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,11 @@ 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
+					// Initializes all variables
 					$cat = '';
 					$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
@@ -161,11 +161,11 @@ if (isGetRequestParameterSet('userid')) {
 			}
 		} else {
 			// No mails left to confirm
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+			displayMessage(getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+		displayMessage(getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed