Huge HTML/CSS rewrite (see forum)

[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 731b4edc61f6fc60b5d75859b4f7a24d7399adab..fcdd8aadfee5abba9509715d0f262ee423b91b11 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -97,7 +97,7 @@ if (isGetRequestElementSet('userid')) {
                                        // @TODO Rewrite this to includes/filter
                                        switch ($type) {
                                                case 'NORMAL':
-                                                       $result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered`, `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 = getMessage('NORMAL_MAIL_PROBLEM');
                                                        $LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
@@ -118,16 +118,18 @@ if (isGetRequestElementSet('userid')) {
 
                                        if (SQL_NUMROWS($result_data) == 1) {
                                                // Mail was found!
-                                               list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
-                                               if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');
+                                               $content = SQL_FETCHARRAY($result_data);
+
+                                               // Fix empty subject
+                                               if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
 
                                                // Prepare data for the row template
                                                $content = array(
-                                                       'sw'      => $SW,
-                                                       'link'    => $LINK,
-                                                       'subject' => $subject,
-                                                       'stamp'   => generateDateTime($timestamp, 0),
-                                                       'cat'     => getCategory($cat),
+                                                       'sw'        => $SW,
+                                                       'link'      => $LINK,
+                                                       'subject'   => $content['subject'],
+                                                       'timestamp' => generateDateTime($content['timestamp'], 0),
+                                                       'cat'       => getCategory($content['cat_id']),
                                                );
 
                                                // Load row template
@@ -135,11 +137,11 @@ if (isGetRequestElementSet('userid')) {
                                        } else {
                                                // Load template for error
                                                $OUT .= loadTemplate('admin_list_links_problem',
-                                               array(
+                                                       array(
                                                                'sw'            => $SW,
                                                                'problem'       => $PROBLEM,
                                                                'data'          => $DATA
-                                               )
+                                                       )
                                                );
                                        }