X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=b09c9bbcfee3fdb57dc82191b7a035d097fd6477;hb=b20eb1c60e5d9eb2bd596bbd119d35d10ee46b20;hp=48ec07db39fa1ea46bfecb5799eeac9c1850e1b4;hpb=3c8df4406f9247182f4dbe4494d62ac229a7bd28;p=mailer.git

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 48ec07db39..b09c9bbcfe 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -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
@@ -114,7 +112,7 @@ LIMIT 1",
 
 					// 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') {
@@ -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'));
@@ -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);
@@ -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);