X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=9b566b697bf38f31cb06b30d5629445e81f1b3d4;hp=b4ede2da8621d1a0ad4f670cabf3f4aef99952f0;hb=e3934352dffa6eb9da59a137ae1a9414e5b4d80b;hpb=950e91ffc2d515dae357d4044294abe301c09b41

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index b4ede2da86..9b566b697b 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -1,22 +1,23 @@
 <?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                               *
  * -------------------------------------------------------------------- *
  * Short description : Delete a bonus or normal mail                    *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Bonus- / Normal-Mail loeschen                    *
+ * Kurzbeschreibung  : Bonus- / Mitglied-Mail loeschen                  *
  * -------------------------------------------------------------------- *
- *                                                                      *
- *  Module by Robert Niedziela, Megacomputing                           *
- *          web : http://mc-p.mcserver.de                               *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,42 +38,37 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init counter for deleted mails
-$cnt = 0;
+$count = '0';
 
 if (isGetRequestElementSet('mid')) {
 	// Load email data
-	$result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `id`,`sender`,`subject`,`url`,`timestamp`,`cat_id`,`payment_id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
 		array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data
-		list ($id, $sender, $subject, $url, $timestamp, $payId) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		$content = SQL_FETCHARRAY($result);
 
 		// Get points we shall pay back per mail
-		$price = getPaymentPoints($payId, 'price');
+		$content['price'] = getPaymentPoints($content['payment_id'], 'price');
+		// @TODO Unused: cat_id, payment_id
 
 		// Prepare data for the template
-		$content['id']      = $id;
-		$content['sender']  = generateUserProfileLink($sender);
-		$content['subject'] = $subject;
-		$content['url']     = generateDerefererUrl($url);
-		$content['url_raw'] = $url;
-		$content['ordered'] = generateDateTime($timestamp, '0');
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
 		// Load template
-		loadTemplate('admin_del_email_normal', false, $content);
+		loadTemplate('admin_delete_email_normal', false, $content);
 
 		// Load email template and send the email away
-		$message_user = loadEmailTemplate('order-deleted', $content, $sender);
-		sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $message_user);
+		$message_user = loadEmailTemplate('member_order_deleted', $content, $content['sender']);
+		sendEmail($content['sender'], '{--MEMBER_ORDER_DELETED--}', $message_user);
 
 		// Fetch right stats_id from pool
 		$result_pool = SQL_QUERY_ESC("SELECT
@@ -98,50 +94,44 @@ LIMIT 1",
 			reduceRecipientReceivedMails('stats_id', getRequestElement('mid'), $links);
 
 			// Calc total points and pay them back
-			$totalPoints = $links * $price;
+			$totalPoints = $links * $content['price'];
 
 			// Shall we pay the points back to the user?
-			if (getConfig('repay_deleted_mails') != 'SHRED') {
-				//* DEBUG: */ outputHtml($stats_id.':'.$totalPoints.'/'.$links.'/'.$price."<br />");
-				if ($totalPoints > 0) {
-					// Shall we payback to user or jackpot?
-					if (getConfig('repay_deleted_mails') == 'JACKPOT') {
-						// Set jackpot
-						$sender = 0;
-					} // END - if
-
-					// Pay back points
-					//* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
-					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'),
-							translateComma($totalPoints)
-						));
-					} else {
-						// To jackpot
-						loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_TO_JACKPOT'),
-							translateComma($totalPoints)
-						));
-					}
+			if ($totalPoints == 0) {
+				// No points repayed!
+				displayMessage('{--ADMIN_NO_POINTS_REPAYED--}');
+			} elseif (getConfig('repay_deleted_mails') != 'SHRED') {
+				//* DEBUG: */ debugOutput($stats_id . ':' . $totalPoints . '/' . $links . '/' . $content['price']);
+				// Shall we payback to user or jackpot?
+				if (getConfig('repay_deleted_mails') == 'JACKPOT') {
+					// Set jackpot
+					$content['sender'] = '0';
+				} // END - if
+
+				// Pay back points
+				initReferralSystem();
+				addPointsThroughReferralSystem('mail_deleted', $content['sender'], $totalPoints);
+
+				// Output message
+				if (getConfig('repay_deleted_mails') == 'REPAY') {
+					// Repayed
+					displayMessage('{%message,ADMIN_POINTS_REPAYED=' . $totalPoints . '%}');
 				} else {
-					// No points repayed!
-					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+					// To jackpot
+					displayMessage('{%message,ADMIN_POINTS_TO_JACKPOT=' . $totalPoints . '%}');
 				}
 			} else {
 				// Points shredded!
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_SHREDDED'), $totalPoints));
+				displayMessage('{%message,ADMIN_POINTS_SHREDDED=' . $totalPoints . '%}');
 			}
 
 			// Remove links from DB
 			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
-			array(bigintval($stats_id)), __FILE__, __LINE__);
-			$cnt += SQL_AFFECTEDROWS();
+				array(bigintval($stats_id)), __FILE__, __LINE__);
+			$count += 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>");
+			displayMessage('<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
@@ -150,102 +140,99 @@ LIMIT 1",
 		// Delete mail from queue
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
 			array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
-		$cnt += SQL_AFFECTEDROWS();
+		$count += SQL_AFFECTEDROWS();
 
 		// Output link for manually removing stats entry
-		outputHtml(sprintf(getMessage('ADMIN_DELETED_MAILS_COUNT'), $cnt));
+		outputHtml('{%message,ADMIN_DELETED_MAILS_COUNT=' . $count . '%}');
 	} else {
 		// Mail already deleted!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
+		displayMessage('{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
 	}
+
+	// Free result
+	SQL_FREERESULT($result);
 } 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'));
+	displayMessage('{--ADMIN_USER_STATS_REMOVED--}');
 } elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
 	// Load data from bonus mail
-	$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s",
+	$result = SQL_QUERY_ESC("SELECT `id`,`subject`,`url`,`timestamp`,`mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 		array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
 
 	// 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;
+		$count = '0';
 
 		// Delete bonus mail entirely from database
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 			array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
-		$cnt += SQL_AFFECTEDROWS();
+		$count += SQL_AFFECTEDROWS();
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
 			array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
-		$cnt += SQL_AFFECTEDROWS();
+		$count += 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['timestamp'] = generateDateTime($content['timestamp'], '0');
+		$content['count']     = $count;
 
 		// Load template
-		loadTemplate('admin_del_email_bonus', false, $content);
+		loadTemplate('admin_delete_email_bonus', false, $content);
 	} else {
 		// Mail already deleted!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
+		displayMessage('{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
-} elseif ((isGetRequestElementSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
+} elseif ((isGetRequestElementSet('nid')) && (isExtensionInstalledAndNewer('bonus', '0.8.7'))) {
 	// Load data from bonus mail
-	$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s",
+	$result = SQL_QUERY_ESC("SELECT `id`,`subject`,`url`,`timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 		array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
 
 	// 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;
+		$count = '0';
 
 		// Delete bonus mail entirely from database
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 			array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
-		$cnt += SQL_AFFECTEDROWS();
+		$count += SQL_AFFECTEDROWS();
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
 			array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
-		$cnt += SQL_AFFECTEDROWS();
+		$count += 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['timestamp'] = generateDateTime($content['timestamp'], '0');
+		$content['count']     = $count;
 
 		// Load template
-		loadTemplate('admin_del_email_notify', false, $content);
+		loadTemplate('admin_delete_email_notify', false, $content);
 	} else {
 		// Mail already deleted!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));
+		displayMessage('{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
 } else {
 	// No mail orders fond
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+	displayMessage('{--ADMIN_WRONG_CALL--}');
 }
 
-//
+// [EOF]
 ?>