X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=1019bd17cfd76cad4d75991504b083b0a58fc46c;hp=f402412014f8aa0fb5d26e1fa0aa326b46c1dbc7;hb=5071030af40e69ca4284642f44758964e18f5be8;hpb=a090e351c49fe021fb3064325694da03402332e0

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index f402412014..1019bd17cf 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -36,7 +36,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
@@ -48,8 +48,8 @@ $cnt = 0;
 
 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",
-		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(REQUEST_GET('mid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
@@ -58,14 +58,14 @@ if (REQUEST_ISSET_GET(('mid'))) {
 		SQL_FREERESULT($result);
 
 		// Get points we shall pay back per mail
-		$price = GET_PAY_POINTS($payId, "price");
+		$price = getPaymentPoints($payId, 'price');
 
 		// Prepare data for the template
 		define('__ID'     , $id);
-		define('__SENDER' , ADMIN_USER_PROFILE_LINK($sender));
+		define('__SENDER' , generateUserProfileLink($sender));
 		define('__SUBJECT', $subject);
 		define('__URL'    , DEREFERER($url));
-		define('__ORDERED', MAKE_DATETIME($timestamp, "0"));
+		define('__ORDERED', generateDateTime($timestamp, '0'));
 
 		// Load template
 		LOAD_TEMPLATE("admin_del_email_normal");
@@ -75,14 +75,14 @@ if (REQUEST_ISSET_GET(('mid'))) {
 
 		// Load email template and send the email away
 		$msg_user = LOAD_EMAIL_TEMPLATE("order-deleted", array(), $sender);
-		SEND_EMAIL($sender, getMessage('MEMBER_ORDER_DELETED'), $msg_user);
+		sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $msg_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__);
+		array(bigintval(REQUEST_GET('mid'))), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_pool) == 1) {
 			// Fetch stats id
 			list($stats_id) = SQL_FETCHROW($result_pool);
@@ -91,35 +91,35 @@ WHERE s.pool_id=%s LIMIT 1",
 			$links = GET_TOTAL_DATA($stats_id, "user_links", 'userid', "stats_id", true);
 
 			// Reset sent mails for recipient(s)
-			REDUCED_RECIPIENT_RECEIVED_MAILS("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";
+			if (getConfig('repay_deleted_mails') != 'SHRED') {
+				//* DEBUG: */ echo $stats_id.':'.$totalPoints.'/'.$links.'/'.$price."<br />\n";
 				if ($totalPoints > 0) {
 					// Shall we payback to user or jackpot?
-					if (getConfig('repay_deleted_mails') == "JACKPOT") {
+					if (getConfig('repay_deleted_mails') == 'JACKPOT') {
 						// Set jackpot
 						$sender = 0;
 					} // END - if
 
 					// Pay back points
 					//* DEBUG: */ echo "PAYBACK:".$sender."<br />\n";
-					ADD_POINTS_REFSYSTEM("mail_deleted", $sender, $totalPoints, true, "0", false,"direct");
+					ADD_POINTS_REFSYSTEM('mail_deleted', $sender, $totalPoints, true, '0', false,'direct');
 
 					// Output message
-					if (getConfig('repay_deleted_mails') == "REPAY") {
+					if (getConfig('repay_deleted_mails') == 'REPAY') {
 						// Repayed
 						LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_REPAYED'),
-							TRANSLATE_COMMA($totalPoints)
+						translateComma($totalPoints)
 						));
 					} else {
 						// To jackpot
 						LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_POINTS_TO_JACKPOT'),
-							TRANSLATE_COMMA($totalPoints)
+						translateComma($totalPoints)
 						));
 					}
 				} else {
@@ -133,7 +133,7 @@ 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__);
+			array(bigintval($stats_id)), __FILE__, __LINE__);
 			$cnt += SQL_AFFECTEDROWS();
 
 			// Load template for link
@@ -144,8 +144,8 @@ WHERE s.pool_id=%s LIMIT 1",
 		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(REQUEST_GET('mid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Output link for manually removing stats entry
@@ -157,14 +157,14 @@ WHERE s.pool_id=%s LIMIT 1",
 } 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__);
+	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'))) {
 	// 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(REQUEST_GET('bid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
@@ -172,24 +172,24 @@ WHERE s.pool_id=%s LIMIT 1",
 		list ($id, $subject, $url, $timestamp, $sent) = SQL_FETCHROW($result);
 
 		// Reset sent mails for recipient(s)
-		REDUCED_RECIPIENT_RECEIVED_MAILS('bonus_id', REQUEST_GET('bid'), $sent);
+		reduceRecipientReceivedMails('bonus_id', REQUEST_GET('bid'), $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(REQUEST_GET('bid'))), __FILE__, __LINE__);
+		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",
-			array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
+		array(bigintval(REQUEST_GET('bid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
 		define('__ID'     , $id);
 		define('__SUBJECT', $subject);
 		define('__URL'    , DEREFERER($url));
-		define('__ORDERED', MAKE_DATETIME($timestamp, "0"));
+		define('__ORDERED', generateDateTime($timestamp, '0'));
 		define('__CNT'    , $cnt);
 
 		// Load template
@@ -203,8 +203,8 @@ WHERE s.pool_id=%s LIMIT 1",
 	SQL_FREERESULT($result);
 } 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",
-		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(REQUEST_GET('nid'))), __FILE__, __LINE__);
 
 	// Delete mail only once
 	if (SQL_NUMROWS($result) == 1) {
@@ -216,18 +216,18 @@ WHERE s.pool_id=%s LIMIT 1",
 		$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(REQUEST_GET('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__);
+		array(bigintval(REQUEST_GET('nid'))), __FILE__, __LINE__);
 		$cnt += SQL_AFFECTEDROWS();
 
 		// Prepare data for the template
 		define('__ID'     , $id);
 		define('__SUBJECT', $subject);
 		define('__URL'    , DEREFERER($url));
-		define('__ORDERED', MAKE_DATETIME($timestamp, "0"));
+		define('__ORDERED', generateDateTime($timestamp, '0'));
 		define('__CNT'    , $cnt);
 
 		// Load template