X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=b08722f2a61f21fe7485e63394c9ab37a45c0825;hb=c5cfa97a9df8785e44c6db5ca14261c974cecc92;hp=5ebc2b96db36ded4bdf84bd07ac9bd467105d73b;hpb=db1f357f01e1ebb16a31fdcd3e432a1d19b54ae3;p=mailer.git
diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index 5ebc2b96db..b08722f2a6 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -8,15 +8,15 @@
* -------------------------------------------------------------------- *
* 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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -48,7 +48,7 @@ $count = '0';
if (isGetRequestParameterSet('mid')) {
// 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",
+ $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__);
// Delete mail only once
@@ -57,7 +57,7 @@ if (isGetRequestParameterSet('mid')) {
$content = SQL_FETCHARRAY($result);
// Get points we shall pay back per mail
- // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+ $content['price'] = getPaymentPoints($content['payment_id'], 'price');
// @TODO Unused: cat_id, payment_id
// Prepare data for the template
@@ -67,8 +67,8 @@ if (isGetRequestParameterSet('mid')) {
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
@@ -94,39 +94,35 @@ LIMIT 1",
reduceRecipientReceivedMails('stats_id', getRequestParameter('mid'), $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);
+ initReferalSystem();
+ addPointsThroughReferalSystem('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 +131,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
@@ -147,10 +143,10 @@ LIMIT 1",
$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
@@ -161,10 +157,10 @@ LIMIT 1",
array(bigintval(getRequestParameter('pid'))), __FILE__, __LINE__);
// Output message
- loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_STATS_REMOVED--}');
+ displayMessage('{--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 LIMIT 1",
+ $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__);
// Delete mail only once
@@ -187,21 +183,21 @@ LIMIT 1",
$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);
} 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'))) {
// Load data from bonus mail
- $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `url`, `timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id`,`subject`,`url`,`timestamp` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
// Delete mail only once
@@ -221,21 +217,21 @@ LIMIT 1",
$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);
} 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]