X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=1b8996f0b6daa761fa9a69d94159ae0fb4d2a058;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=3ce87e6a67716f1b235bd71c243f04f8704cc11f;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 3ce87e6a67..1b8996f0b6 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                               *
@@ -16,6 +16,7 @@
  *                                                                      *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +38,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -45,34 +46,29 @@ addMenuDescription('admin', __FILE__);
 // Init counter for deleted mails
 $cnt = '0';
 
-if (isGetRequestElementSet('mid')) {
+if (isGetRequestParameterSet('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",
-		array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
+	$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(getRequestParameter('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');
+		// @TODO Unused: $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['timestamp'] = 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);
+		sendEmail($sender, '{--MEMBER_ORDER_DELETED--}', $message_user);
 
 		// Fetch right stats_id from pool
 		$result_pool = SQL_QUERY_ESC("SELECT
@@ -86,7 +82,7 @@ ON
 WHERE
 	s.`pool_id`=%s
 LIMIT 1",
-			array(bigintval(getRequestElement('mid'))), __FILE__, __LINE__);
+			array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_pool) == 1) {
 			// Fetch stats id
 			list($stats_id) = SQL_FETCHROW($result_pool);
@@ -95,53 +91,51 @@ LIMIT 1",
 			$links = countSumTotalData($stats_id, 'user_links', 'userid', 'stats_id', true);
 
 			// Reset sent mails for recipient(s)
-			reduceRecipientReceivedMails('stats_id', getRequestElement('mid'), $links);
+			reduceRecipientReceivedMails('stats_id', getRequestParameter('mid'), $links);
 
 			// Calc total points and pay them back
 			$totalPoints = $links * $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!
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_POINTS_REPAYED--}');
+			} elseif (getConfig('repay_deleted_mails') != 'SHRED') {
+				//* DEBUG: */ debugOutput($stats_id.':'.$totalPoints.'/'.$links.'/'.$price);
+				// Shall we payback to user or jackpot?
+				if (getConfig('repay_deleted_mails') == 'JACKPOT') {
+					// Set jackpot
+					$sender = '0';
+				} // END - if
+
+				// Pay back points
+				//* DEBUG: */ debugOutput('PAYBACK:'.$sender);
+				addPointsDirectly('mail_deleted', $sender, $totalPoints);
+
+				// Output message
+				if (getConfig('repay_deleted_mails') == 'REPAY') {
+					// Repayed
+					loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
+						'{%pipe,translateComma=' . $totalPoints . '%}'
+					));
 				} else {
-					// No points repayed!
-					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+					// To jackpot
+					loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
+						'{%pipe,translateComma=' . $totalPoints . '%}'
+					));
 				}
 			} else {
 				// Points shredded!
-				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_SHREDDED'), $totalPoints));
+				loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $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__);
+				array(bigintval($stats_id)), __FILE__, __LINE__);
 			$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(getRequestParameter('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
 		} // END - if
 
 		// Free the result
@@ -149,103 +143,100 @@ 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__);
+			array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 		$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'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
 	}
-} elseif (isGetRequestElementSet('pid')) {
+
+	// Free result
+	SQL_FREERESULT($result);
+} elseif (isGetRequestParameterSet('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(getRequestParameter('pid'))), __FILE__, __LINE__);
 
 	// Output message
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
-} elseif ((isGetRequestElementSet('bid')) && (isExtensionActive('bonus'))) {
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_STATS_REMOVED--}');
+} elseif ((isGetRequestParameterSet('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",
-		array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+		array(bigintval(getRequestParameter('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', getRequestParameter('bid'), $content['mails_sent']);
 
 		// Init counter for deleted mails
 		$cnt = '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__);
+			array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
-			array(bigintval(getRequestElement('bid'))), __FILE__, __LINE__);
+			array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		$content['id']        = $id;
-		$content['subject']   = $subject;
-		$content['url']       = generateDerefererUrl($url);
-		$content['timestamp'] = generateDateTime($timestamp, 0);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
 		$content['cnt']       = $cnt;
 
 		// 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'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
-} elseif ((isGetRequestElementSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
+} elseif ((isGetRequestParameterSet('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",
-		array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+		array(bigintval(getRequestParameter('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';
 
 		// 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__);
+			array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
-			array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
+			array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		$content['id']        = $id;
-		$content['subject']   = $subject;
-		$content['url']       = generateDerefererUrl($url);
-		$content['timestamp'] = generateDateTime($timestamp, 0);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
 		$content['cnt']       = $cnt;
 
 		// 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'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
 } else {
 	// No mail orders fond
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
 }
 
-//
+// [EOF]
 ?>