Extension ext-earning introduced (unfinished), renamings:

[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 201cd9fe39edd4b8e2585bfc8602ac3862798b0f..6dafbbc4acaa7450860cf60301ace9a0f091705c 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT
-       `id`, `sender`, `subject`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`
+       `id`,`sender`,`subject`,`payment_id`,`timestamp`,`url`,`target_send`,`cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -57,7 +57,7 @@ if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
        if (isFormSent('accept')) {
                if (ifPostContainsSelections()) {
                        // Accept mail orders
-                       foreach (postRequestParameter('sel') as $id => $value) {
+                       foreach (postRequestElement('sel') as $id => $value) {
                                // Secure id number
                                $id = bigintval($id);
 
@@ -94,11 +94,11 @@ LIMIT 1",
                                                        array(bigintval($content['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
-                                               handleBonusPoints(getConfig('bonus_order'));
+                                               handleBonusPoints(getConfig('bonus_order'), $content['sender']);
                                        } // END - if
 
                                        // Load email template
-                                       $message_user = loadEmailTemplate('order-accept', $content, $content['sender']);
+                                       $message_user = loadEmailTemplate('member_order_accepted', $content, $content['sender']);
 
                                        // Send email
                                        sendEmail($content['sender'], '{--MEMBER_ORDER_ACCEPTED--}', $message_user);
@@ -120,17 +120,17 @@ LIMIT 1",
                }
 
                // Mails unlocked for mail delivery
-               loadTemplate('admin_settings_saved', false, $message);
-       } elseif (isPostRequestParameterSet('reject')) {
+               displayMessage($message);
+       } elseif (isPostRequestElementSet('reject')) {
                if (ifPostContainsSelections()) {
                        // Reject mail orders
                        $OUT = '';
-                       foreach (postRequestParameter('sel') as $id => $value) {
+                       foreach (postRequestElement('sel') as $id => $value) {
                                // Secure id number
                                $id = bigintval($id);
 
                                // Load URL and subject from pool
-                               $result = SQL_QUERY_ESC("SELECT `url`, `subject`, `sender` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT `url`,`subject`,`sender` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
                                        array($id), __FILE__, __LINE__);
 
                                // Load data
@@ -140,22 +140,22 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Load email template and send it away
-                               $message_user = loadEmailTemplate('order-reject', $content, $content['sender']);
+                               $message_user = loadEmailTemplate('member_order_rejected', $content, $content['sender']);
                                sendEmail($content['sender'], '{--MEMBER_ORDER_REJECTED--}', $message_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
-                               if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) {
-                                       setPostRequestParameter('redirect', getUrl());
+                               if ((!isPostRequestElementSet('redirect')) || (postRequestElement('redirect') == 'http://')) {
+                                       setPostRequestElement('redirect', getUrl());
                                } // END - if
 
                                // Redirect URL
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `url`='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",
-                                       array(postRequestParameter('redirect'), $id),__FILE__, __LINE__);
+                                       array(postRequestElement('redirect'), $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
                                $content = array(
                                        'id'  => $id,
-                                       'url' => postRequestParameter('url', $id),
+                                       'url' => postRequestElement('url', $id),
                                );
 
                                // Load row template and switch colors
@@ -166,11 +166,11 @@ LIMIT 1",
                        loadTemplate('admin_unlock_emails_redir', false, $OUT);
                } else {
                        // Nothing selected
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
+                       displayMessage('{--ADMIN_MAILS_NOTHING_CHECKED--}');
                }
        } elseif ((isFormSent('lock')) && (ifPostContainsSelections()) && (isUrlBlacklistEnabled())) {
                // Lock URLs
-               foreach (postRequestParameter('sel') as $id => $url) {
+               foreach (postRequestElement('sel') as $id => $url) {
                        // Secure id number
                        $id = bigintval($id);
 
@@ -188,7 +188,7 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_URLS_BLOCKED--}');
+               displayMessage('{--ADMIN_URLS_BLOCKED--}');
        } elseif ((!isFormSent('lock')) && (!isFormSent('accept')) && (!isFormSent('reject'))) {
                // Mail orders are in pool so we can display them
                $OUT = '';
@@ -210,14 +210,14 @@ LIMIT 1",
                loadTemplate('admin_unlock_emails', false, $content);
        } elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
                // URL blacklist not activated
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
+               displayMessage('{--ADMIN_URL_BLACKLIST_DISABLED--}');
        } else {
                // Wrong call!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
+               displayMessage('{--ADMIN_WRONG_CALL--}');
        }
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+       displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // [EOF]