X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_email.php;h=5ebc2b96db36ded4bdf84bd07ac9bd467105d73b;hp=e3e3146bce9d8a89b8bee47337fa40d87a6afc49;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=48b01b793f8953018586b10eeb3d7b0a762af765
diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index e3e3146bce..5ebc2b96db 100644
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -38,42 +38,37 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
// Init counter for deleted mails
-$cnt = '0';
+$count = '0';
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",
+ $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
if (SQL_NUMROWS($result) == 1) {
// Load data
- list ($id, $sender, $subject, $url, $timestamp, $payId) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+ $content = SQL_FETCHARRAY($result);
// Get points we shall pay back per mail
- $price = getPaymentPoints($payId, 'price');
+ // @TODO Unused: $price = getPaymentPoints($content['payment_id'], 'price');
+ // @TODO Unused: cat_id, payment_id
// Prepare data for the template
- $content['id'] = $id;
- $content['sender'] = generateUserProfileLink($sender);
- $content['subject'] = $subject;
- $content['url'] = generateDerefererUrl($url);
- $content['url_raw'] = $url;
- $content['timestamp'] = generateDateTime($timestamp, 0);
+ $content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Load template
- loadTemplate('admin_del_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, getMessage('MEMBER_ORDER_DELETED'), $message_user);
+ sendEmail($sender, '{--MEMBER_ORDER_DELETED--}', $message_user);
// Fetch right stats_id from pool
$result_pool = SQL_QUERY_ESC("SELECT
@@ -104,9 +99,9 @@ LIMIT 1",
// Shall we pay the points back to the user?
if ($totalPoints == 0) {
// No points repayed!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_POINTS_REPAYED--}');
} elseif (getConfig('repay_deleted_mails') != 'SHRED') {
- //* DEBUG: */ outputHtml($stats_id.':'.$totalPoints.'/'.$links.'/'.$price."
");
+ //* DEBUG: */ debugOutput($stats_id.':'.$totalPoints.'/'.$links.'/'.$price);
// Shall we payback to user or jackpot?
if (getConfig('repay_deleted_mails') == 'JACKPOT') {
// Set jackpot
@@ -114,30 +109,30 @@ LIMIT 1",
} // END - if
// Pay back points
- //* DEBUG: */ outputHtml("PAYBACK:".$sender."
");
- addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
+ //* DEBUG: */ debugOutput('PAYBACK:'.$sender);
+ addPointsDirectly('mail_deleted', $sender, $totalPoints);
// Output message
if (getConfig('repay_deleted_mails') == 'REPAY') {
// Repayed
loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED',
- translateComma($totalPoints)
+ '{%pipe,translateComma=' . $totalPoints . '%}'
));
} else {
// To jackpot
loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT',
- translateComma($totalPoints)
+ '{%pipe,translateComma=' . $totalPoints . '%}'
));
}
} else {
// Points shredded!
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', translateComma($totalPoints)));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}'));
}
// 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__);
- $cnt += SQL_AFFECTEDROWS();
+ $count += SQL_AFFECTEDROWS();
// Load template for link
loadTemplate('admin_settings_saved', false, '{--ADMIN_REMOVE_STATS_ENTRY--}');
@@ -149,24 +144,27 @@ 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__);
- $cnt += SQL_AFFECTEDROWS();
+ $count += SQL_AFFECTEDROWS();
// Output link for manually removing stats entry
- outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $cnt));
+ outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $count));
} else {
// Mail already deleted!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NORMAL_MAIL_ALREADY_DELETED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NORMAL_MAIL_ALREADY_DELETED--}');
}
+
+ // Free result
+ SQL_FREERESULT($result);
} 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(getRequestParameter('pid'))), __FILE__, __LINE__);
// Output message
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_USER_STATS_REMOVED'));
+ loadTemplate('admin_settings_saved', false, '{--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",
+ $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
@@ -178,33 +176,32 @@ LIMIT 1",
reduceRecipientReceivedMails('bonus_id', getRequestParameter('bid'), $content['mails_sent']);
// Init counter for deleted mails
- $cnt = '0';
+ $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__);
- $cnt += SQL_AFFECTEDROWS();
+ $count += SQL_AFFECTEDROWS();
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
array(bigintval(getRequestParameter('bid'))), __FILE__, __LINE__);
- $cnt += SQL_AFFECTEDROWS();
+ $count += SQL_AFFECTEDROWS();
// Prepare data for the template
- $content['url'] = generateDerefererUrl($content['url']);
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
- $content['cnt'] = $cnt;
+ $content['cnt'] = $count;
// Load template
- loadTemplate('admin_del_email_bonus', false, $content);
+ loadTemplate('admin_delete_email_bonus', false, $content);
} else {
// Mail already deleted!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_MAIL_ALREADY_DELETED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_MAIL_ALREADY_DELETED--}');
}
// Free result
SQL_FREERESULT($result);
-} elseif ((isGetRequestParameterSet('nid')) && (getExtensionVersion('bonus') >= '0.8.7')) {
+} 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",
+ $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
@@ -213,34 +210,33 @@ LIMIT 1",
$content = SQL_FETCHARRAY($result);
// Init counter for deleted mails
- $cnt = '0';
+ $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('nid'))), __FILE__, __LINE__);
- $cnt += SQL_AFFECTEDROWS();
+ $count += SQL_AFFECTEDROWS();
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s",
array(bigintval(getRequestParameter('nid'))), __FILE__, __LINE__);
- $cnt += SQL_AFFECTEDROWS();
+ $count += SQL_AFFECTEDROWS();
// Prepare data for the template
- $content['url'] = generateDerefererUrl($content['url']);
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
- $content['cnt'] = $cnt;
+ $content['cnt'] = $count;
// Load template
- loadTemplate('admin_del_email_notify', false, $content);
+ loadTemplate('admin_delete_email_notify', false, $content);
} else {
// Mail already deleted!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOTIFY_MAIL_ALREADY_DELETED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTIFY_MAIL_ALREADY_DELETED--}');
}
// Free result
SQL_FREERESULT($result);
} else {
// No mail orders fond
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
}
-//
+// [EOF]
?>