A lot code rewritten:

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

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 60b4e041b6240e0ab516bcc214c331397f6d8811..3d375c350fd9746650ab1a8576a31ac1721264c6 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -77,13 +77,13 @@ if (isGetRequestParameterSet('userid')) {
 
                                // Prepare mail and send it away
                                $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+                               sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJECT--}', $message);
 
                                // Display message
-                               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
+                               loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
                        } else {
                                // Init variables
-                               $OUT = ''; $SW = 2;
+                               $OUT = '';
 
                                // List all unconfirmed mails
                                // @TODO Find a way to rewrite this. See some lines above for different queries
@@ -91,7 +91,7 @@ if (isGetRequestParameterSet('userid')) {
                                        // Initializes some variables
                                        $cat = '';
                                        $DATA = '';
-                                       $PROBLEM = getMessage('GENERAL_MAIL_PROBLEM');
+                                       $PROBLEM = '{--GENERAL_MAIL_PROBLEM--}';
                                        $result_data = false; // Closes Bug #58
 
                                        // Load data from stats table...
@@ -100,14 +100,14 @@ if (isGetRequestParameterSet('userid')) {
                                                case 'NORMAL':
                                                        $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id)), __FILE__, __LINE__);
-                                                       $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+                                                       $type = 'mailid'; $DATA = $id; $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;mailid=' . $id . '%}" target="_blank">' . $id . '</a>';
                                                        break;
 
                                                case 'BONUS':
                                                        $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array(bigintval($id2)), __FILE__, __LINE__);
-                                                       $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+                                                       $type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
                                                        break;
 
@@ -122,11 +122,10 @@ if (isGetRequestParameterSet('userid')) {
                                                $content = SQL_FETCHARRAY($result_data);
 
                                                // Fix empty subject
-                                               if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+                                               if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
                                                // Prepare data for the row template
                                                $content = array(
-                                                       'sw'        => $SW,
                                                        'link'      => $LINK,
                                                        'subject'   => $content['subject'],
                                                        'timestamp' => generateDateTime($content['timestamp'], 0),
@@ -139,15 +138,13 @@ if (isGetRequestParameterSet('userid')) {
                                                // Load template for error
                                                $OUT .= loadTemplate('admin_list_links_problem', true,
                                                        array(
-                                                               'sw'            => $SW,
                                                                'problem'       => $PROBLEM,
                                                                'data'          => $DATA
                                                        )
                                                );
                                        }
 
-                                       // Switch color and free result
-                                       $SW = 3 - $SW;
+                                       // Free result
                                        SQL_FREERESULT($result_data);
                                } // END - while
 
@@ -167,11 +164,11 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', getRequestParameter('userid')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
        }
 } else {
        // Output selection form with all confirmed user accounts listed