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

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 0307be89ea..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                               *
@@ -15,7 +15,7 @@
  *          web : http://mc-p.mcserver.de                               *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -35,21 +35,20 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Init counter for deleted mails
-$cnt = 0;
+$cnt = '0';
 
-if (REQUEST_ISSET_GET('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(REQUEST_GET('mid'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `id`, `sender`, `subject`, `url`, `timestamp`, `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) {
@@ -61,191 +60,187 @@ if (REQUEST_ISSET_GET('mid')) {
 		$price = getPaymentPoints($payId, 'price');
 
 		// Prepare data for the template
-		define('__ID'     , $id);
-		define('__SENDER' , generateUserProfileLink($sender));
-		define('__SUBJECT', $subject);
-		define('__URL'    , DEREFERER($url));
-		define('__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
-		LOAD_TEMPLATE("admin_del_email_normal");
-
-		// Transfer data to data array
-		$DATA = array('url' => $url, 'subject' => $subject);
+		loadTemplate('admin_del_email_normal', false, $content);
 
 		// Load email template and send the email away
-		$message_user = LOAD_EMAIL_TEMPLATE('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
 		$result_pool = SQL_QUERY_ESC("SELECT
 	s.id
 FROM
-	`{!_MYSQL_PREFIX!}_user_stats` AS s
+	`{?_MYSQL_PREFIX?}_user_stats` AS s
 LEFT JOIN
-	`{!_MYSQL_PREFIX!}_pool` AS p
+	`{?_MYSQL_PREFIX?}_pool` AS p
 ON
 	s.pool_id=p.id
 WHERE
-	s.pool_id=%s
+	s.`pool_id`=%s
 LIMIT 1",
-			array(bigintval(REQUEST_GET('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);
 
 			// Get all user links
-			$links = GET_TOTAL_DATA($stats_id, 'user_links', 'userid', 'stats_id', true);
+			$links = countSumTotalData($stats_id, 'user_links', 'userid', 'stats_id', true);
 
 			// Reset sent mails for recipient(s)
-			reduceRecipientReceivedMails('stats_id', REQUEST_GET('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: */ echo $stats_id.':'.$totalPoints.'/'.$links.'/'.$price."<br />\n";
+				//* 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;
+						$sender = '0';
 					} // END - if
 
 					// Pay back points
-					//* DEBUG: */ echo "PAYBACK:".$sender."<br />\n";
-					ADD_POINTS_REFSYSTEM('mail_deleted', $sender, $totalPoints, true, '0', false,'direct');
+					//* DEBUG: */ outputHtml("PAYBACK:".$sender."<br />");
+					addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
 
 					// Output message
 					if (getConfig('repay_deleted_mails') == 'REPAY') {
 						// Repayed
-						LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_REPAYED'),
-						translateComma($totalPoints)
+						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
+							translateComma($totalPoints)
 						));
 					} else {
 						// To jackpot
-						LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_TO_JACKPOT'),
-						translateComma($totalPoints)
+						loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
+							translateComma($totalPoints)
 						));
 					}
 				} else {
 					// No points repayed!
-					LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+					loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
 				}
 			} else {
 				// Points shredded!
-				LOAD_TEMPLATE('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
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `stats_id`=%s",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s",
 			array(bigintval($stats_id)), __FILE__, __LINE__);
 			$cnt += SQL_AFFECTEDROWS();
 
 			// Load template for link
-			LOAD_TEMPLATE('admin_settings_saved', false, "<a href=\"{!URL!}/modules.php?module=admin&amp;what=del_email&amp;pid=".bigintval(REQUEST_GET('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
 		SQL_FREERESULT($result_pool);
 
 		// Delete mail from queue
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
-			array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+			array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Output link for manually removing stats entry
-		OUTPUT_HTML(sprintf(ADMIN_DELETED_MAILS_COUNT, $cnt));
+		outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $cnt));
 	} else {
 		// Mail already deleted!
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
 	}
-} elseif (REQUEST_ISSET_GET('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(REQUEST_GET('pid'))), __FILE__, __LINE__);
+	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
+		array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
 
 	// Output message
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
-} elseif ((REQUEST_ISSET_GET('bid')) && (EXT_IS_ACTIVE('bonus'))) {
+	loadTemplate('admin_settings_saved', false, getMessage('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(REQUEST_GET('bid'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s",
+		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', REQUEST_GET('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(REQUEST_GET('bid'))), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+			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(REQUEST_GET('bid'))), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
+			array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		define('__ID'     , $id);
-		define('__SUBJECT', $subject);
-		define('__URL'    , DEREFERER($url));
-		define('__ORDERED', generateDateTime($timestamp, '0'));
-		define('__CNT'    , $cnt);
+		$content['url']       = generateDerefererUrl($content['url']);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
+		$content['cnt']       = $cnt;
 
 		// Load template
-		LOAD_TEMPLATE('admin_del_email_bonus');
+		loadTemplate('admin_del_email_bonus', false, $content);
 	} else {
 		// Mail already deleted!
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
-} elseif ((REQUEST_ISSET_GET('nid')) && (GET_EXT_VERSION('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(REQUEST_GET('nid'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s",
+		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);
-		SQL_FREERESULT($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(REQUEST_GET('nid'))), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+			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(REQUEST_GET('nid'))), __FILE__, __LINE__);
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
+			array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
-		define('__ID'     , $id);
-		define('__SUBJECT', $subject);
-		define('__URL'    , DEREFERER($url));
-		define('__ORDERED', generateDateTime($timestamp, '0'));
-		define('__CNT'    , $cnt);
+		$content['url']       = generateDerefererUrl($content['url']);
+		$content['timestamp'] = generateDateTime($content['timestamp'], 0);
+		$content['cnt']       = $cnt;
 
 		// Load template
-		LOAD_TEMPLATE('admin_del_email_notify');
+		loadTemplate('admin_del_email_notify', false, $content);
 	} else {
 		// Mail already deleted!
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));
 	}
+
+	// Free result
+	SQL_FREERESULT($result);
 } else {
 	// No mail orders fond
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
 }
 
 //