Even more fixes/improvements for rallye

[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 658d48788343b4bddf0d06737da950bb2db04587..29b35a2418bc83f215bafc4ac7d130b83056cc82 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -72,7 +72,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (isPostRequestElementSet('lock'))) {
                if ($SEL > 0) {
                        // Accept mail orders
                        foreach (postRequestElement('sel') as $id => $value) {
-                               // Secure ID number
+                               // Secure id number
                                $id = bigintval($id);
 
                                // Order placed in queue...
@@ -140,7 +140,7 @@ LIMIT 1",
                        // Reject mail orders
                        $OUT = ''; $SW = 2;
                        foreach (postRequestElement('sel') as $id => $value) {
-                               // Secure ID number
+                               // Secure id number
                                $id = bigintval($id);
 
                                // Load URL and subject from pool
@@ -208,21 +208,20 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Prepare data for the template
-                       // @TODO Rewrite in template: subj->subject,ordered->timestamp,tsend->target_send
                        $content = array(
-                               'sw'        => $SW,
-                               'id'        => $content['id'],
-                               'sender'    => $content['sender'],
-                               'u_link'    => generateUserProfileLink($content['sender']),
-                               'subj'      => $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'],
-                               'ordered'   => generateDateTime($content['timestamp'], '2'),
-                               'tsend'     => $content['target_send'],
+                               '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'],
                        );
 
                        // Load row template and switch colors