X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=f367fb9a017e9b13b08f374de965d080375cfad6;hp=5ebc2b96db36ded4bdf84bd07ac9bd467105d73b;hb=c0c6d5d58bdecd22bdcf7dfe5b24bec69e1810c7;hpb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d
diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 5ebc2b96db..f367fb9a01 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -8,16 +8,16 @@
* -------------------------------------------------------------------- *
* Short description : Delete a bonus or normal mail *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : Bonus- / Normal-Mail loeschen *
+ * Kurzbeschreibung : Bonus- / Mitglied-Mail loeschen *
* -------------------------------------------------------------------- *
- * *
- * Module by Robert Niedziela, Megacomputing *
- * web : http://mc-p.mcserver.de *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -46,87 +46,76 @@ addYouAreHereLink('admin', __FILE__);
// Init counter for deleted mails
$count = '0';
-if (isGetRequestParameterSet('mid')) {
+if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
// Load email data
- $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__);
+ // @TODO Unused: cat_id
+ $content getPoolDataFromId(getRequestElement('id'));
// Delete mail only once
- if (SQL_NUMROWS($result) == 1) {
- // Load data
- $content = SQL_FETCHARRAY($result);
-
- // Get points we shall pay back per mail
- // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
- // @TODO Unused: cat_id, payment_id
-
+ if (count($content) > 0) {
// Prepare data for the template
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load template
- loadTemplate('admin_delete_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, '{--MEMBER_ORDER_DELETED--}', $message_user);
+ $message_user = loadEmailTemplate('member_order_deleted', $content, $content['sender']);
+ sendEmail($content['sender'], '{--MEMBER_ORDER_DELETED--}', $message_user);
// Fetch right stats_id from pool
$result_pool = SQL_QUERY_ESC("SELECT
- s.id
+ `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
+ `s`.`pool_id`=`p`.`id`
WHERE
- s.`pool_id`=%s
+ `s`.`pool_id`=%s
LIMIT 1",
- array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
if (SQL_NUMROWS($result_pool) == 1) {
// Fetch stats id
list($stats_id) = SQL_FETCHROW($result_pool);
// Get all user links
- $links = countSumTotalData($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', getRequestParameter('mid'), $links);
+ reduceRecipientReceivedMails('stats_id', getRequestElement('id'), $links);
// Calc total points and pay them back
- $totalPoints = $links * $price;
+ $totalPoints = $links * $content['price'];
// Shall we pay the points back to the user?
if ($totalPoints == 0) {
// No points repayed!
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_POINTS_REPAYED--}');
+ displayMessage('{--ADMIN_NO_POINTS_REPAYED--}');
} elseif (getConfig('repay_deleted_mails') != 'SHRED') {
- //* DEBUG: */ debugOutput($stats_id.':'.$totalPoints.'/'.$links.'/'.$price);
+ //* DEBUG: */ debugOutput($stats_id . ':' . $totalPoints . '/' . $links . '/' . $content['price']);
// Shall we payback to user or jackpot?
if (getConfig('repay_deleted_mails') == 'JACKPOT') {
// Set jackpot
- $sender = '0';
+ $content['sender'] = '0';
} // END - if
// Pay back points
- //* DEBUG: */ debugOutput('PAYBACK:'.$sender);
- addPointsDirectly('mail_deleted', $sender, $totalPoints);
+ initReferralSystem();
+ addPointsThroughReferralSystem('mail_deleted', $content['sender'], $totalPoints);
// Output message
if (getConfig('repay_deleted_mails') == 'REPAY') {
// Repayed
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
- '{%pipe,translateComma=' . $totalPoints . '%}'
- ));
+ displayMessage('{%message,ADMIN_POINTS_REPAYED=' . $totalPoints . '%}');
} else {
// To jackpot
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
- '{%pipe,translateComma=' . $totalPoints . '%}'
- ));
+ displayMessage('{%message,ADMIN_POINTS_TO_JACKPOT=' . $totalPoints . '%}');
}
} else {
// Points shredded!
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
+ displayMessage('{%message,ADMIN_POINTS_SHREDDED=' . $totalPoints . '%}');
}
// Remove links from DB
@@ -135,7 +124,7 @@ LIMIT 1",
$count += SQL_AFFECTEDROWS();
// Load template for link
- loadTemplate('admin_settings_saved', false, '{--ADMIN_REMOVE_STATS_ENTRY--}');
+ displayMessage('{--ADMIN_REMOVE_STATS_ENTRY--}');
} // END - if
// Free the result
@@ -143,29 +132,29 @@ LIMIT 1",
// Delete mail from queue
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
- array(bigintval(getRequestParameter('mid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
$count += SQL_AFFECTEDROWS();
// Output link for manually removing stats entry
- outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $count));
+ outputHtml('{%message,ADMIN_DELETED_MAILS_COUNT=' . $count . '%}');
} else {
// Mail already deleted!
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
+ displayMessage('{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
}
// Free result
SQL_FREERESULT($result);
-} elseif (isGetRequestParameterSet('pid')) {
+} elseif (isGetRequestElementSet('pid')) {
// Remove stats entries
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
- array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('pid'))), __FILE__, __LINE__);
// Output message
- loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_STATS_REMOVED--}');
-} elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
+ displayMessage('{--ADMIN_USER_STATS_REMOVED--}');
+} elseif (((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'bonus')) && (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 LIMIT 1",
- array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
// Delete mail only once
if (SQL_NUMROWS($result) == 1) {
@@ -173,36 +162,33 @@ LIMIT 1",
$content = SQL_FETCHARRAY($result);
// Reset sent mails for recipient(s)
- reduceRecipientReceivedMails('bonus_id', getRequestParameter('bid'), $content['mails_sent']);
+ reduceRecipientReceivedMails('bonus_id', getRequestElement('id'), $content['mails_sent']);
// Init counter for deleted mails
$count = '0';
// Delete bonus mail entirely from database
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
- array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
$count += SQL_AFFECTEDROWS();
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
- array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
$count += SQL_AFFECTEDROWS();
// Prepare data for the template
- $content['timestamp'] = generateDateTime($content['timestamp'], 0);
- $content['cnt'] = $count;
+ $content['timestamp'] = generateDateTime($content['timestamp'], '0');
+ $content['count'] = $count;
// Load template
- loadTemplate('admin_delete_email_bonus', false, $content);
+ loadTemplate('admin_delete_email_bonus', FALSE, $content);
} else {
// Mail already deleted!
- loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
+ displayMessage('{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
}
-
- // Free result
- SQL_FREERESULT($result);
-} elseif ((isGetRequestParameterSet('nid')) && (isExtensionInstalledAndNewer('bonus', '0.8.7'))) {
+} elseif ((isGetRequestElementSet('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 LIMIT 1",
- array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
// Delete mail only once
if (SQL_NUMROWS($result) == 1) {
@@ -214,28 +200,28 @@ LIMIT 1",
// Delete bonus mail entirely from database
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
- array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
$count += SQL_AFFECTEDROWS();
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
- array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
+ array(bigintval(getRequestElement('nid'))), __FILE__, __LINE__);
$count += SQL_AFFECTEDROWS();
// Prepare data for the template
- $content['timestamp'] = generateDateTime($content['timestamp'], 0);
- $content['cnt'] = $count;
+ $content['timestamp'] = generateDateTime($content['timestamp'], '0');
+ $content['count'] = $count;
// Load template
- loadTemplate('admin_delete_email_notify', false, $content);
+ loadTemplate('admin_delete_email_notify', FALSE, $content);
} else {
// Mail already deleted!
- loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
+ displayMessage('{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
}
// Free result
SQL_FREERESULT($result);
} else {
// No mail orders fond
- loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
+ displayMessage('{--ADMIN_WRONG_CALL--}');
}
// [EOF]