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 de718c1dc360b5dc3069cd321cf8868bb9f84b26..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...
@@ -92,7 +92,7 @@ LIMIT 1",
                                // Update wents fine?
                                if (SQL_NUMROWS($result) == 1) {
                                        // Load data
-                                       $DATA = SQL_FETCHARRAY($result);
+                                       $content = SQL_FETCHARRAY($result);
 
                                        // Free result
                                        SQL_FREERESULT($result);
@@ -101,24 +101,24 @@ LIMIT 1",
                                        // @TODO Rewrite these if-blocks to a filter
                                        if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {
                                                // Then "migrate" the URL to the surfbar
-                                               SURFBAR_ADMIN_MIGRATE_URL($DATA['url'], $DATA['sender']);
+                                               SURFBAR_ADMIN_MIGRATE_URL($content['url'], $content['sender']);
                                        } // END - if
 
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((getExtensionVersion('bonus') >= '0.4.4') && (getConfig('bonus_active') == 'Y')) {
                                                // Add points directly
                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_order`=`bonus_order`+".getConfig('bonus_order')." WHERE `userid`=%s LIMIT 1",
-                                                       array(bigintval($DATA['sender'])), __FILE__, __LINE__);
+                                                       array(bigintval($content['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
                                                handleBonusPoints(getConfig('bonus_order'));
                                        } // END - if
 
                                        // Load email template
-                                       $message_user = loadEmailTemplate('order-accept', array(), $DATA['sender']);
+                                       $message_user = loadEmailTemplate('order-accept', $content, $content['sender']);
 
                                        // Send email
-                                       sendEmail($DATA['sender'], MEMBER_ORDER_ACCEPTED, $message_user);
+                                       sendEmail($content['sender'], getMessage('MEMBER_ORDER_ACCEPTED'), $message_user);
 
                                        // Unlock selected email
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW' WHERE `id`=%s AND `data_type`='ADMIN' LIMIT 1",
@@ -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
@@ -148,14 +148,14 @@ LIMIT 1",
                                        array($id), __FILE__, __LINE__);
 
                                // Load data
-                               $DATA = SQL_FETCHARRAY($result);
+                               $content = SQL_FETCHARRAY($result);
 
                                // Free result
                                SQL_FREERESULT($result);
 
                                // Load email template and send it away
-                               $message_user = loadEmailTemplate('order-reject', array(), $DATA['sender']);
-                               sendEmail($DATA['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
+                               $message_user = loadEmailTemplate('order-reject', $content, $content['sender']);
+                               sendEmail($content['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                if ((!isPostRequestElementSet(('redirect'))) || (postRequestElement('redirect') == 'http://')) setRequestPostElement('redirect', getConfig('URL'));
@@ -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