X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=b02f602fbffa848c70f22180e692866a969b76a0;hp=d87a5109640e64b96bf023bcb36e4c02cf054ea2;hb=b6cf467cb0598f96529e46a9de5377f8218ff0dd;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index d87a510964..b02f602fbf 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/12/2004 *
- * ================                             Last change: 02/27/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 02/12/2004 *
+ * ===================                          Last change: 02/27/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-del_email.php                               *
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Init counter for deleted mails
-$cnt = 0;
+$cnt = '0';
 
 if (isGetRequestElementSet('mid')) {
 	// Load email data
@@ -60,20 +60,18 @@ if (isGetRequestElementSet('mid')) {
 		$price = getPaymentPoints($payId, 'price');
 
 		// Prepare data for the template
-		$content['id']      = $id;
-		$content['sender']  = generateUserProfileLink($sender);
-		$content['subject'] = $subject;
-		$content['url']     = generateDerefererUrl($url);
-		$content['ordered'] = generateDateTime($timestamp, '0');
+		$content['id']        = $id;
+		$content['sender']    = generateUserProfileLink($sender);
+		$content['subject']   = $subject;
+		$content['url']       = generateDerefererUrl($url);
+		$content['url_raw']   = $url;
+		$content['timestamp'] = generateDateTime($timestamp, 0);
 
 		// Load template
 		loadTemplate('admin_del_email_normal', false, $content);
 
-		// Transfer data to data array
-		$DATA = array('url' => $url, 'subject' => $subject);
-
 		// Load email template and send the email away
-		$message_user = loadEmailTemplate('order-deleted', array(), $sender);
+		$message_user = loadEmailTemplate('order-deleted', $content, $sender);
 		sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $message_user);
 
 		// Fetch right stats_id from pool
@@ -86,7 +84,7 @@ LEFT JOIN
 ON
 	s.pool_id=p.id
 WHERE
-	s.pool_id=%s
+	s.`pool_id`=%s
 LIMIT 1",
 			array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_pool) == 1) {
@@ -109,22 +107,22 @@ LIMIT 1",
 					// Shall we payback to user or jackpot?
 					if (getConfig('repay_deleted_mails') == 'JACKPOT') {
 						// Set jackpot
-						$sender = 0;
+						$sender = '0';
 					} // END - if
 
 					// Pay back points
 					//* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
-					addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, '0', false,'direct');
+					addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
 
 					// 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)
 						));
 					}
@@ -134,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
@@ -143,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
@@ -155,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'));
@@ -163,7 +161,7 @@ LIMIT 1",
 } elseif (isGetRequestElementSet('pid')) {
 	// Remove stats entries
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
-	array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
+		array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
 
 	// Output message
 	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
@@ -175,13 +173,13 @@ 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);
+		reduceRecipientReceivedMails('bonus_id', getRequestElement('bid'), $content['mails_sent']);
 
 		// Init counter for deleted mails
-		$cnt = 0;
+		$cnt = '0';
 
 		// Delete bonus mail entirely from database
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
@@ -192,11 +190,9 @@ LIMIT 1",
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		$content['id']      = $id;
-		$content['subject'] = $subject;
-		$content['url']     = generateDerefererUrl($url);
-		$content['ordered'] = generateDateTime($timestamp, '0');
-		$content['cnt']     = $cnt;
+		$content['url']       = generateDerefererUrl($content['url']);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
+		$content['cnt']       = $cnt;
 
 		// Load template
 		loadTemplate('admin_del_email_bonus', false, $content);
@@ -215,10 +211,10 @@ 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;
+		$cnt = '0';
 
 		// Delete bonus mail entirely from database
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
@@ -229,11 +225,9 @@ LIMIT 1",
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		$content['id']      = $id;
-		$content['subject'] = $subject;
-		$content['url']     = generateDerefererUrl($url);
-		$content['ordered'] = generateDateTime($timestamp, '0');
-		$content['cnt']     = $cnt;
+		$content['url']       = generateDerefererUrl($content['url']);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
+		$content['cnt']       = $cnt;
 
 		// Load template
 		loadTemplate('admin_del_email_notify', false, $content);