X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=df46ffd24fad7f51f4ba348c64fdcaa36c2a7da7;hb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6;hp=b5a3fedd71c5ff454768cc46bf6b145d265dada7;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index b5a3fedd71..df46ffd24f 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -46,9 +46,9 @@ ADD_DESCR('admin', __FILE__);
 // Init counter for deleted mails
 $cnt = 0;
 
-if (REQUEST_ISSET_GET(('mid'))) {
+if (REQUEST_ISSET_GET('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`, `payment_id` FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
 		array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
@@ -74,31 +74,38 @@ if (REQUEST_ISSET_GET(('mid'))) {
 		$DATA = array('url' => $url, 'subject' => $subject);
 
 		// Load email template and send the email away
-		$msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);
-		sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $msg_user);
+		$message_user = LOAD_EMAIL_TEMPLATE('order-deleted', array(), $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
-LEFT JOIN `{!_MYSQL_PREFIX!}_pool` AS p
-ON s.pool_id=p.id
-WHERE s.pool_id=%s LIMIT 1",
- array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
+		$result_pool = SQL_QUERY_ESC("SELECT
+	s.id
+FROM
+	`{!_MYSQL_PREFIX!}_user_stats` AS s
+LEFT JOIN
+	`{!_MYSQL_PREFIX!}_pool` AS p
+ON
+	s.pool_id=p.id
+WHERE
+	s.pool_id=%s
+LIMIT 1",
+			array(bigintval(REQUEST_GET('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 = GET_TOTAL_DATA($stats_id, 'user_links', 'userid', 'stats_id', true);
 
 			// Reset sent mails for recipient(s)
-			reduceRecipientReceivedMails("stats_id", REQUEST_GET('mid'), $links);
+			reduceRecipientReceivedMails('stats_id', REQUEST_GET('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: */ OUTPUT_HTML($stats_id.':'.$totalPoints.'/'.$links.'/'.$price."<br />");
 				if ($totalPoints > 0) {
 					// Shall we payback to user or jackpot?
 					if (getConfig('repay_deleted_mails') == 'JACKPOT') {
@@ -107,19 +114,19 @@ WHERE s.pool_id=%s LIMIT 1",
 					} // END - if
 
 					// Pay back points
-					//* DEBUG: */ echo "PAYBACK:".$sender."<br />\n";
+					//* DEBUG: */ OUTPUT_HTML("PAYBACK:".$sender."<br />");
 					ADD_POINTS_REFSYSTEM('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)
+						translateComma($totalPoints)
 						));
 					} else {
 						// To jackpot
 						LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_TO_JACKPOT'),
-							translateComma($totalPoints)
+						translateComma($totalPoints)
 						));
 					}
 				} else {
@@ -132,12 +139,12 @@ WHERE s.pool_id=%s LIMIT 1",
 			}
 
 			// 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__);
+			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>");
+			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>");
 		} // END - if
 
 		// Free the result
@@ -149,27 +156,27 @@ WHERE s.pool_id=%s LIMIT 1",
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Output link for manually removing stats entry
-		OUTPUT_HTML(sprintf(ADMIN_DELETED_MAILS_COUNT, $cnt));
+		OUTPUT_HTML(sprintf(getMessage('ADMIN_DELETED_MAILS_COUNT'), $cnt));
 	} else {
 		// Mail already deleted!
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
 	}
-} elseif (REQUEST_ISSET_GET(('pid'))) {
+} elseif (REQUEST_ISSET_GET('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(REQUEST_GET('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'))) {
+} elseif ((REQUEST_ISSET_GET('bid')) && (EXT_IS_ACTIVE('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",
 		array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data
-		list ($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
+		list($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
 
 		// Reset sent mails for recipient(s)
 		reduceRecipientReceivedMails('bonus_id', REQUEST_GET('bid'), $sent);
@@ -181,7 +188,7 @@ WHERE s.pool_id=%s LIMIT 1",
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
 			array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `bonus_id`=%s",
 			array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
@@ -193,7 +200,7 @@ WHERE s.pool_id=%s LIMIT 1",
 		define('__CNT'    , $cnt);
 
 		// Load template
-		LOAD_TEMPLATE("admin_del_email_bonus");
+		LOAD_TEMPLATE('admin_del_email_bonus');
 	} else {
 		// Mail already deleted!
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
@@ -201,9 +208,9 @@ WHERE s.pool_id=%s LIMIT 1",
 
 	// Free result
 	SQL_FREERESULT($result);
-} elseif ((REQUEST_ISSET_GET(('nid'))) && (GET_EXT_VERSION('bonus') >= '0.8.7')) {
+} elseif ((REQUEST_ISSET_GET('nid')) && (GET_EXT_VERSION('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",
 		array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
@@ -219,7 +226,7 @@ WHERE s.pool_id=%s LIMIT 1",
 		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
 			array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `bonus_id`=%s",
 			array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
@@ -231,7 +238,7 @@ WHERE s.pool_id=%s LIMIT 1",
 		define('__CNT'    , $cnt);
 
 		// Load template
-		LOAD_TEMPLATE("admin_del_email_notify");
+		LOAD_TEMPLATE('admin_del_email_notify');
 	} else {
 		// Mail already deleted!
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));