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

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

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 75bddbb45330114c6f3c68e5da57c539c4eb30ff..947f16fe9c14340a6fb9fed9dbabc153ceaa6d02 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT
-       `id`,`sender`,`subject`,`payment_id` AS `payment`,`timestamp`,`url`,`target_send`,`cat_id` AS category
+       `id`, `sender`, `subject`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -196,21 +196,8 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Prepare data for the template
-                       $content = array(
-                               'sw'          => $SW,
-                               'id'          => $content['id'],
-                               'sender'      => $content['sender'],
-                               'u_link'      => generateUserProfileLink($content['sender']),
-                               'subject'     => $content['subject'],
-                               'tester'      => generateFrametesterUrl($content['url']),
-                               'url'         => $content['url'],
-                               'cat_title'   => str_replace('"', '"', getCategory($content['category'])),
-                               'cat_link'    => $content['category'],
-                               'pay_title'   => str_replace('"', '"', getPaymentTitlePrice($content['payment'], true)),
-                               'pay_link'    => $content['payment'],
-                               'timestamp'   => generateDateTime($content['timestamp'], 2),
-                               'target_send' => $content['target_send'],
-                       );
+                       $content['sw']        = $SW;
+                       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_unlock_emails_row', true, $content);