Next wave of lesser getMessage() usage and more EL

[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 71926397d824373bd881b7f678c7bb4a35c68885..e5e116a770db188ef87ef08d6faf8f7dedb32697 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,12 +45,9 @@ 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
+       `id`, `sender`, `subject`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -57,8 +55,8 @@ WHERE
 ORDER BY
        `timestamp` ASC", __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result_main) > 0) || (isPostRequestParameterSet('lock'))) {
-       if (isPostRequestParameterSet('accept')) {
+if ((SQL_NUMROWS($result_main) > 0) || (isFormSent('lock'))) {
+       if (isFormSent('accept')) {
                if (countPostSelection() > 0) {
                        // Accept mail orders
                        foreach (postRequestParameter('sel') as $id => $value) {
@@ -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
@@ -117,10 +115,10 @@ LIMIT 1",
                        } // END - foreach
 
                        // Set message
-                       $message = getMessage('ADMIN_MAILS_ACTIVATED');
+                       $message = '{--ADMIN_MAILS_ACTIVATED--}';
                } else {
                        // Nothing checked!
-                       $message = getMessage('ADMIN_MAILS_NOTHING_CHECKED');
+                       $message = '{--ADMIN_MAILS_NOTHING_CHECKED--}';
                }
 
                // Mails unlocked for mail delivery
@@ -170,9 +168,9 @@ LIMIT 1",
                        loadTemplate('admin_unlock_emails_redir', false, $OUT);
                } else {
                        // Nothing selected
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
                }
-       } elseif ((isPostRequestParameterSet('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
+       } elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
                // Lock URLs
                foreach (postRequestParameter('sel') as $id => $url) {
                        // Secure id number
@@ -181,7 +179,7 @@ LIMIT 1",
                        // 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__);
@@ -192,27 +190,14 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
-       } elseif ((!isPostRequestParameterSet('lock')) && (!isPostRequestParameterSet('accept')) && (!isPostRequestParameterSet('reject'))) {
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_URLS_BLOCKED--}');
+       } 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)) {
                        // Prepare data for the template
-                       $content = array(
-                               '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'],
-                       );
+                       $content['sw']        = $SW;
+                       $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
@@ -227,16 +212,16 @@ LIMIT 1",
 
                // Load main template
                loadTemplate('admin_unlock_emails', false, $content);
-       } elseif ((isPostRequestParameterSet('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'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
        } else {
                // Wrong call!
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
        }
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // [EOF]