Typo fixed

[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 31a456a678405f975968dadad5b97bf1396da675..0726c0b1316a26a028c512ed38d8af3d40d2570b 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}');
        return;
 } // END - if
 
@@ -55,11 +55,11 @@ if (isGetRequestParameterSet('userid')) {
                // @TODO Try to rewrite this to a filter
                if (isExtensionActive('bonus')) {
                        // Load bonus id
-                       $result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+                       $result = SQL_QUERY_ESC("SELECT `stats_id`,`bonus_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
                                array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
                } else {
                        // Load stats id (2nd will be ignored later! But it is needed for the same fetchrow command)
-                       $result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+                       $result = SQL_QUERY_ESC("SELECT `stats_id`,`stats_id`,`link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
                                array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
                }
 
@@ -72,8 +72,8 @@ if (isGetRequestParameterSet('userid')) {
                                        array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
-                               $message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
+                               $message = loadEmailTemplate('member_delete_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+                               sendEmail(getUserData('userid'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
                                // Display message
                                displayMessage('{--ADMIN_LINKS_DELETED--}');
@@ -84,26 +84,25 @@ if (isGetRequestParameterSet('userid')) {
                                // List all unconfirmed mails
                                // @TODO Find a way to rewrite this. See some lines above for different queries
                                while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
-                                       // Initializes some variables
-                                       $cat = '';
-                                       $DATA = '';
-                                       $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
-                                       $result_data = false; // Closes Bug #58
+                                       // Initializes all variables
+                                       $mailId = '';
+                                       $problemMessage = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
+                                       $result_data = false;
 
                                        // Load data from stats table...
                                        // @TODO Rewrite this to includes/filter
                                        switch ($type) {
                                                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",
+                                                       $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 = '{--NORMAL_MAIL_PROBLEM--}';
+                                                       $type = 'mailid'; $mailId = $id; $problemMessage = '{--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",
+                                                       $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 = '{--BONUS_MAIL_PROBLEM--}';
+                                                       $type = 'bonusid'; $mailId = $id2; $problemMessage = '{--BONUS_MAIL_PROBLEM--}';
                                                        $LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&amp;bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
                                                        break;
 
@@ -122,12 +121,8 @@ if (isGetRequestParameterSet('userid')) {
                                                if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
                                                // Prepare data for the row template
-                                               $content = array(
-                                                       'link'      => $LINK,
-                                                       'subject'   => $content['subject'],
-                                                       'timestamp' => generateDateTime($content['timestamp'], 0),
-                                                       'cat_id'    => $content['cat_id'],
-                                               );
+                                               $content['link']      = $LINK;
+                                               $content['timestamp'] = generateDateTime($content['timestamp'], 0);
 
                                                // Load row template
                                                $OUT .= loadTemplate('admin_list_links_row', true, $content);
@@ -135,8 +130,8 @@ if (isGetRequestParameterSet('userid')) {
                                                // Load template for error
                                                $OUT .= loadTemplate('admin_list_links_problem', true,
                                                        array(
-                                                               'problem'       => $PROBLEM,
-                                                               'data'          => $DATA
+                                                               'problem' => $problemMessage,
+                                                               'mail_id' => $mailId
                                                        )
                                                );
                                        }
@@ -146,8 +141,6 @@ if (isGetRequestParameterSet('userid')) {
                                } // END - while
 
                                // Remember list in constant for the template
-                               $content['surname'] = getUserData('surname');
-                               $content['family']  = getUserData('family');
                                $content['email']   = '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>';
                                $content['rows']    = $OUT;
                                $content['nums']    = SQL_NUMROWS($result);
@@ -161,11 +154,11 @@ if (isGetRequestParameterSet('userid')) {
                        }
                } else {
                        // No mails left to confirm
-                       displayMessage(getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+                       displayMessage('{%message,ADMIN_NO_UNCONFIRMED_MAILS_LEFT=' . bigintval(getRequestParameter('userid')) . '%}');
                }
        } else {
                // User not found
-               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed