New function isValidUserid() introduced, more rewrites to EL:

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

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index 32aa9857ab617fc5f06f64d2c2159555dcb30498..679b5bc7e132e4968bdfce0a70384c9229630a82 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -138,12 +138,11 @@ LIMIT %s",
                                        // Prepare data for the row template
                                        $content = array(
                                                'sw'     => $SW,
-                                               'u_link' => generateUserProfileLink($content['userid']),
                                                'userid' => $content['userid'],
                                                'link'   => $LINK,
                                                'id'     => $ID,
                                                'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
-                                               'status' => translateUserStatus($content['status']),
+                                               'status' => $content['status'],
                                        );
 
                                        // Load row template and switch colors
@@ -172,13 +171,13 @@ LIMIT %s",
 
                // Prepare content
                $content = array(
-                       'sender_link'   => generateUserProfileLink($sender),
-                       'subject'       => $subj,
-                       'text'          => $text,
-                       'url'           => generateFrametesterUrl($url),
-                       'unconfirmed'   => $unconfirmed,
-                       'stamp'         => generateDateTime($stamp, 2),
-                       'rows'          => $OUT
+                       'sender'      => $sender,
+                       'subject'     => $subj,
+                       'text'        => $text,
+                       'url'         => $url,
+                       'unconfirmed' => $unconfirmed,
+                       'stamp'       => generateDateTime($stamp, 2),
+                       'rows'        => $OUT
                );
 
                // Load final template