Naming convention applied to language strings, new API function added:

[mailer.git] / inc / modules / admin / what-del_email.php

diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php
index c5abb43616ee6b1927755b421573a733c979b7fe..67e953a38c4111e5e6ac3677f629b56f0f94aabd 100644 (file)
--- a/inc/modules/admin/what-del_email.php
+++ b/inc/modules/admin/what-del_email.php
@@ -38,7 +38,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -68,7 +68,7 @@ if (isGetRequestParameterSet('mid')) {
 
                // 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
@@ -99,7 +99,7 @@ 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: */ debugOutput($stats_id.':'.$totalPoints.'/'.$links.'/'.$price);
                                // Shall we payback to user or jackpot?
@@ -110,7 +110,7 @@ LIMIT 1",
 
                                // Pay back points
                                //* DEBUG: */ debugOutput('PAYBACK:'.$sender);
-                               addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct');
+                               addPointsDirectly('mail_deleted', $sender, $totalPoints);
 
                                // Output message
                                if (getConfig('repay_deleted_mails') == 'REPAY') {
@@ -150,7 +150,7 @@ LIMIT 1",
                outputHtml(getMaskedMessage('ADMIN_DELETED_MAILS_COUNT', $cnt));
        } 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
@@ -161,10 +161,10 @@ 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
@@ -187,7 +187,6 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
-               $content['url']       = generateDerefererUrl($content['url']);
                $content['timestamp'] = generateDateTime($content['timestamp'], 0);
                $content['cnt']       = $cnt;
 
@@ -195,14 +194,14 @@ LIMIT 1",
                loadTemplate('admin_del_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')) && (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
@@ -222,7 +221,6 @@ LIMIT 1",
                $cnt += SQL_AFFECTEDROWS();
 
                // Prepare data for the template
-               $content['url']       = generateDerefererUrl($content['url']);
                $content['timestamp'] = generateDateTime($content['timestamp'], 0);
                $content['cnt']       = $cnt;
 
@@ -230,15 +228,15 @@ LIMIT 1",
                loadTemplate('admin_del_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]
 ?>