X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=8a624faec50da212f601ac268175de4198459857;hb=e1235e719b767d6693976c3d24489beaa38a3667;hp=48ec07db39fa1ea46bfecb5799eeac9c1850e1b4;hpb=371c76216421ea999a58fde5be37a350aaf18f78;p=mailer.git

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 48ec07db39..8a624faec5 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
@@ -109,12 +107,12 @@ 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') {
@@ -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
@@ -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'));
@@ -181,7 +179,7 @@ LIMIT 1",
 		reduceRecipientReceivedMails('bonus_id', getRequestElement('bid'), $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,11 @@ 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['id']        = $id;
+		$content['subject']   = $subject;
+		$content['url']       = generateDerefererUrl($url);
+		$content['timestamp'] = generateDateTime($timestamp, 0);
+		$content['cnt']       = $cnt;
 
 		// Load template
 		loadTemplate('admin_del_email_bonus', false, $content);
@@ -218,7 +216,7 @@ LIMIT 1",
 		list ($id, $subject, $url, $timestamp) = SQL_FETCHROW($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 +227,11 @@ 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['id']        = $id;
+		$content['subject']   = $subject;
+		$content['url']       = generateDerefererUrl($url);
+		$content['timestamp'] = generateDateTime($timestamp, 0);
+		$content['cnt']       = $cnt;
 
 		// Load template
 		loadTemplate('admin_del_email_notify', false, $content);