X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=cc6a5e6760eca1abd19075711bae832c4f68a287;hp=8a624faec50da212f601ac268175de4198459857;hb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;hpb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 8a624faec5..cc6a5e6760 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -117,12 +117,12 @@ LIMIT 1",
 					// Output message
 					if (getConfig('repay_deleted_mails') == 'REPAY') {
 						// Repayed
-						loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_REPAYED'),
+						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
 							translateComma($totalPoints)
 						));
 					} else {
 						// To jackpot
-						loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_TO_JACKPOT'),
+						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
 							translateComma($totalPoints)
 						));
 					}
@@ -132,7 +132,7 @@ LIMIT 1",
 				}
 			} else {
 				// Points shredded!
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_SHREDDED'), $totalPoints));
+				loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', translateComma($totalPoints)));
 			}
 
 			// Remove links from DB
@@ -141,7 +141,7 @@ LIMIT 1",
 			$cnt += SQL_AFFECTEDROWS();
 
 			// Load template for link
-			loadTemplate('admin_settings_saved', false, "<a href=\"{%url=modules.php?module=admin&amp;what=del_email&amp;pid=" . bigintval(getRequestElement('mid')) . "%}\">{--ADMIN_REMOVE_STATS_ENTRY--}</a>");
+			loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=del_email&amp;pid=' . bigintval(getRequestElement('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
 		} // END - if
 
 		// Free the result
@@ -153,7 +153,7 @@ LIMIT 1",
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Output link for manually removing stats entry
-		outputHtml(sprintf(getMessage('ADMIN_DELETED_MAILS_COUNT'), $cnt));
+		outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $cnt));
 	} else {
 		// Mail already deleted!
 		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
@@ -173,7 +173,7 @@ LIMIT 1",
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data
-		list($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
+		$content = SQL_FETCHARRAY($result);
 
 		// Reset sent mails for recipient(s)
 		reduceRecipientReceivedMails('bonus_id', getRequestElement('bid'), $sent);
@@ -190,10 +190,8 @@ LIMIT 1",
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		$content['id']        = $id;
-		$content['subject']   = $subject;
-		$content['url']       = generateDerefererUrl($url);
-		$content['timestamp'] = generateDateTime($timestamp, 0);
+		$content['url']       = generateDerefererUrl($content['url']);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
 		$content['cnt']       = $cnt;
 
 		// Load template
@@ -213,7 +211,7 @@ LIMIT 1",
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data
-		list ($id, $subject, $url, $timestamp) = SQL_FETCHROW($result);
+		$content = SQL_FETCHARRAY($result);
 
 		// Init counter for deleted mails
 		$cnt = '0';
@@ -227,10 +225,8 @@ LIMIT 1",
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		$content['id']        = $id;
-		$content['subject']   = $subject;
-		$content['url']       = generateDerefererUrl($url);
-		$content['timestamp'] = generateDateTime($timestamp, 0);
+		$content['url']       = generateDerefererUrl($content['url']);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
 		$content['cnt']       = $cnt;
 
 		// Load template