mailer project continued:

[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 372af1abe1c9beb25e610e4749350c440900392b..85bbeedc1061c2d15725cd9262ca864f702d5aff 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -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);
 
@@ -84,7 +84,7 @@ 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($content['url'], $content['sender']);
+                                               doSurfbarAdminMigrateUrl($content['url'], $content['sender']);
                                        } // END - if
 
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
@@ -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,18 +120,17 @@ LIMIT 1",
                }
 
                // Mails unlocked for mail delivery
-
                displayMessage($message);
-       } elseif (isPostRequestParameterSet('reject')) {
+       } 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
@@ -141,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__);
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `url`='%s',`data_type`='NEW' WHERE `id`=%s LIMIT 1",
+                                       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
@@ -171,7 +170,7 @@ LIMIT 1",
                }
        } 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);