A lot code rewritten:

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

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 75bddbb45330114c6f3c68e5da57c539c4eb30ff..74384a2434c50551d10d758f531963eb0e6705d4 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT
-       `id`,`sender`,`subject`,`payment_id` AS `payment`,`timestamp`,`url`,`target_send`,`cat_id` AS category
+       `id`, `sender`, `subject`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -106,7 +106,7 @@ LIMIT 1",
                                        $message_user = loadEmailTemplate('order-accept', $content, $content['sender']);
 
                                        // Send email
-                                       sendEmail($content['sender'], getMessage('MEMBER_ORDER_ACCEPTED'), $message_user);
+                                       sendEmail($content['sender'], '{--MEMBER_ORDER_ACCEPTED--}', $message_user);
 
                                        // Unlock selected email
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW' WHERE `id`=%s AND `data_type`='ADMIN' LIMIT 1",
@@ -115,10 +115,10 @@ LIMIT 1",
                        } // END - foreach
 
                        // Set message
-                       $message = getMessage('ADMIN_MAILS_ACTIVATED');
+                       $message = '{--ADMIN_MAILS_ACTIVATED--}';
                } else {
                        // Nothing checked!
-                       $message = getMessage('ADMIN_MAILS_NOTHING_CHECKED');
+                       $message = '{--ADMIN_MAILS_NOTHING_CHECKED--}';
                }
 
                // Mails unlocked for mail delivery
@@ -126,7 +126,7 @@ LIMIT 1",
        } elseif (isPostRequestParameterSet(('reject'))) {
                if (countPostSelection() > 0) {
                        // Reject mail orders
-                       $OUT = ''; $SW = 2;
+                       $OUT = '';
                        foreach (postRequestParameter('sel') as $id => $value) {
                                // Secure id number
                                $id = bigintval($id);
@@ -143,7 +143,7 @@ LIMIT 1",
 
                                // Load email template and send it away
                                $message_user = loadEmailTemplate('order-reject', $content, $content['sender']);
-                               sendEmail($content['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
+                               sendEmail($content['sender'], '{--MEMBER_ORDER_REJECTED--}', $message_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getConfig('URL'));
@@ -154,21 +154,19 @@ LIMIT 1",
 
                                // Prepare data for the row template
                                $content = array(
-                                       'sw'  => $SW,
                                        'id'  => $id,
                                        'url' => postRequestParameter('url', $id),
                                );
 
                                // Load row template and switch colors
                                $OUT .= loadTemplate('admin_unlock_emails_redir_row', true, $content);
-                               $SW = 3 - $SW;
-                       }
+                       } // END - foreach
 
                        // Load main template
                        loadTemplate('admin_unlock_emails_redir', false, $OUT);
                } else {
                        // Nothing selected
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
                }
        } elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
                // Lock URLs
@@ -190,31 +188,16 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_URLS_BLOCKED--}');
        } elseif ((!isFormSent('lock')) && (!isFormSent('accept')) && (!isFormSent('reject'))) {
                // Mail orders are in pool so we can display them
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Prepare data for the template
-                       $content = array(
-                               'sw'          => $SW,
-                               'id'          => $content['id'],
-                               'sender'      => $content['sender'],
-                               'u_link'      => generateUserProfileLink($content['sender']),
-                               'subject'     => $content['subject'],
-                               'tester'      => generateFrametesterUrl($content['url']),
-                               'url'         => $content['url'],
-                               'cat_title'   => str_replace('"', '"', getCategory($content['category'])),
-                               'cat_link'    => $content['category'],
-                               'pay_title'   => str_replace('"', '"', getPaymentTitlePrice($content['payment'], true)),
-                               'pay_link'    => $content['payment'],
-                               'timestamp'   => generateDateTime($content['timestamp'], 2),
-                               'target_send' => $content['target_send'],
-                       );
+                       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory
@@ -227,14 +210,14 @@ LIMIT 1",
                loadTemplate('admin_unlock_emails', false, $content);
        } elseif ((isFormSent('lock')) && (getConfig('url_blacklist') != 'Y')) {
                // URL blacklist not activated
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
        } else {
                // Wrong call!
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
        }
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // [EOF]