Rewrites/fixes for handling config entries in SQLs

[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 d4b0986a4d13695482dda4f4053b7dbe0932bf78..5fb789f51cb2cac5cb977318eb18e8d12cbaf9c8 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,9 +45,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-// Define some variables
-global $DATA;
-
 // Check for mails
 $result_main = SQL_QUERY("SELECT
        `id`,`sender`,`subject`,`payment_id` AS `payment`,`timestamp`,`url`,`target_send`,`cat_id` AS category
@@ -57,11 +55,11 @@ WHERE
 ORDER BY
        `timestamp` ASC", __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result_main) > 0) || (isPostRequestElementSet('lock'))) {
-       if (isPostRequestElementSet('accept')) {
+if ((SQL_NUMROWS($result_main) > 0) || (isFormSent('lock'))) {
+       if (isFormSent('accept')) {
                if (countPostSelection() > 0) {
                        // Accept mail orders
-                       foreach (postRequestElement('sel') as $id => $value) {
+                       foreach (postRequestParameter('sel') as $id => $value) {
                                // Secure id number
                                $id = bigintval($id);
 
@@ -95,9 +93,9 @@ LIMIT 1",
                                        } // END - if
 
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
-                                       if ((getExtensionVersion('bonus') >= '0.4.4') && (getConfig('bonus_active') == 'Y')) {
+                                       if ((isExtensionInstalledAndNewer('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",
+                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_order`=`bonus_order`+{?bonus_order?} WHERE `userid`=%s LIMIT 1",
                                                        array(bigintval($content['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
@@ -125,11 +123,11 @@ LIMIT 1",
 
                // Mails unlocked for mail delivery
                loadTemplate('admin_settings_saved', false, $message);
-       } elseif (isPostRequestElementSet(('reject'))) {
+       } elseif (isPostRequestParameterSet(('reject'))) {
                if (countPostSelection() > 0) {
                        // Reject mail orders
                        $OUT = ''; $SW = 2;
-                       foreach (postRequestElement('sel') as $id => $value) {
+                       foreach (postRequestParameter('sel') as $id => $value) {
                                // Secure id number
                                $id = bigintval($id);
 
@@ -148,17 +146,17 @@ LIMIT 1",
                                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'));
+                               if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getConfig('URL'));
 
                                // Redirect URL
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET url='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",
-                                       array(postRequestElement('redirect'), $id),__FILE__, __LINE__);
+                                       array(postRequestParameter('redirect'), $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
                                $content = array(
                                        'sw'  => $SW,
                                        'id'  => $id,
-                                       'url' => postRequestElement('url', $id),
+                                       'url' => postRequestParameter('url', $id),
                                );
 
                                // Load row template and switch colors
@@ -172,16 +170,16 @@ LIMIT 1",
                        // Nothing selected
                        loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
                }
-       } elseif ((isPostRequestElementSet('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
+       } elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
                // Lock URLs
-               foreach (postRequestElement('sel') as $id => $url) {
+               foreach (postRequestParameter('sel') as $id => $url) {
                        // Secure id number
                        $id = bigintval($id);
 
                        // Lookup in blacklist
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
                                array($url), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == '0') {
+                       if (SQL_HASZERONUMS($result)) {
                                // Did not find a record so we can add it... :)
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_url_blacklist` (`url`,`pool_id`) VALUES ('%s',%s)",
                                        array($url, $id), __FILE__, __LINE__);
@@ -193,7 +191,7 @@ LIMIT 1",
 
                // Output message
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
-       } elseif ((!isPostRequestElementSet('lock')) && (!isPostRequestElementSet('accept')) && (!isPostRequestElementSet(('reject'))) && (getConfig('url_blacklist') == 'Y')) {
+       } elseif ((!isFormSent('lock')) && (!isFormSent('accept')) && (!isFormSent('reject'))) {
                // Mail orders are in pool so we can display them
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {
@@ -227,7 +225,7 @@ LIMIT 1",
 
                // Load main template
                loadTemplate('admin_unlock_emails', false, $content);
-       } elseif ((isPostRequestElementSet('lock')) && (getConfig('url_blacklist') != 'Y')) {
+       } elseif ((isFormSent('lock')) && (getConfig('url_blacklist') != 'Y')) {
                // URL blacklist not activated
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
        } else {