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

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index b4ede2da86..ea385836ba 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,12 +43,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Init counter for deleted mails
-$cnt = 0;
+$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__);
+		array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
@@ -60,12 +60,12 @@ 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['url_raw'] = $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);
@@ -86,7 +86,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,7 +95,7 @@ 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;
@@ -107,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)
 						));
 					}
@@ -132,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
@@ -141,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(getRequestParameter('mid')) . '%}">{--ADMIN_REMOVE_STATS_ENTRY--}</a>');
 		} // END - if
 
 		// Free the result
@@ -149,52 +149,50 @@ 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'));
 	}
-} elseif (isGetRequestElementSet('pid')) {
+} 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'))) {
+} 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__);
+		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;
+		$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['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);
@@ -205,33 +203,31 @@ LIMIT 1",
 
 	// Free result
 	SQL_FREERESULT($result);
-} elseif ((isGetRequestElementSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
+} elseif ((isGetRequestParameterSet('nid')) && (getExtensionVersion('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__);
+		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;
+		$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['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);