Deprecated $DATA renamed:

[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 34e5aeeb039410a2b73404bc4399291202f04caf..0726c0b1316a26a028c512ed38d8af3d40d2570b 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -85,8 +85,8 @@ if (isGetRequestParameterSet('userid')) {
                                // @TODO Find a way to rewrite this. See some lines above for different queries
                                while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
                                        // Initializes all variables
-                                       $DATA = '';
-                                       $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
+                                       $mailId = '';
+                                       $problemMessage = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
                                        $result_data = false;
 
                                        // Load data from stats table...
@@ -95,14 +95,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 = '{--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",
                                                                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;
 
@@ -121,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);
@@ -134,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
                                                        )
                                                );
                                        }