More getModule() used, some SQL rewrites, constant __MODULE rewritten

[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 20687f46a648aab96097cca5fb99abebe77b9406..18d6561cf1246ce25d39a608dce01611e7a42faf 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -54,7 +54,7 @@ FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE `data_type`='ADMIN'
 ORDER BY `timestamp` ASC", __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result_main) > 0) || (REQUEST_ISSET_POST(('lock')))) {
+if ((SQL_NUMROWS($result_main) > 0) || (REQUEST_ISSET_POST('lock'))) {
        // Count checked checkboxes
        $SEL = 0;
        if (REQUEST_ISSET_POST('sel')) {
@@ -106,7 +106,7 @@ LIMIT 1",
                                        } // END - if
 
                                        // Load email template
-                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", array(), $DATA['sender']);
+                                       $msg_user = LOAD_EMAIL_TEMPLATE('order-accept', array(), $DATA['sender']);
 
                                        // Send email
                                        sendEmail($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
@@ -149,7 +149,7 @@ LIMIT 1",
                                sendEmail($DATA['sender'], getMessage('MEMBER_ORDER_REJECTED'), $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
-                               if ((!REQUEST_ISSET_POST(('redirect'))) || (REQUEST_POST('redirect') == "http://")) REQUEST_SET_POST('redirect', constant('URL'));
+                               if ((!REQUEST_ISSET_POST(('redirect'))) || (REQUEST_POST('redirect') == 'http://')) REQUEST_SET_POST('redirect', constant('URL'));
 
                                // Redirect URL
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE `id`=%s LIMIT 1",
@@ -163,18 +163,18 @@ LIMIT 1",
                                );
 
                                // Load row template and switch colors
-                               $OUT .= LOAD_TEMPLATE("admin_unlock_emails_redir_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_unlock_emails_redir_row', true, $content);
                                $SW = 3 - $SW;
                        }
                        define('__URL_ROWS', $OUT);
 
                        // Load main template
-                       LOAD_TEMPLATE("admin_unlock_emails_redir");
+                       LOAD_TEMPLATE('admin_unlock_emails_redir');
                } else {
                        // Nothing selected
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
                }
-       } elseif ((REQUEST_ISSET_POST(('lock'))) && ($SEL > 0) && (getConfig('url_blacklist') == 'Y')) {
+       } elseif ((REQUEST_ISSET_POST('lock')) && ($SEL > 0) && (getConfig('url_blacklist') == 'Y')) {
                // Lock URLs
                foreach (REQUEST_POST('sel') as $id => $url) {
                        // Secure id number
@@ -195,7 +195,7 @@ LIMIT 1",
 
                // Output message
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
-       } elseif ((!REQUEST_ISSET_POST(('lock'))) && (!REQUEST_ISSET_POST(('accept'))) && (!REQUEST_ISSET_POST(('reject'))) && (getConfig('url_blacklist') == 'Y')) {
+       } elseif ((!REQUEST_ISSET_POST('lock')) && (!REQUEST_ISSET_POST(('accept'))) && (!REQUEST_ISSET_POST(('reject'))) && (getConfig('url_blacklist') == 'Y')) {
                // Mail orders are in pool so we can display them
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {
@@ -212,12 +212,12 @@ LIMIT 1",
                                'cat_link'  => $content['category'],
                                'pay_title' => str_replace("\"", """, getPaymentTitlePrice($content['payment'], true)),
                                'pay_link'  => $content['payment'],
-                               'ordered'   => generateDateTime($content['timestamp'], "2"),
+                               'ordered'   => generateDateTime($content['timestamp'], '2'),
                                'tsend'     => $content['target_send'],
                        );
 
                        // Load row template and switch colors
-                       $OUT .= LOAD_TEMPLATE("admin_unlock_emails_row", true, $content);
+                       $OUT .= LOAD_TEMPLATE('admin_unlock_emails_row', true, $content);
                        $SW = 3 - $SW;
                } // END - while
 
@@ -226,13 +226,13 @@ LIMIT 1",
                define('__UNLOCK_ROWS', $OUT);
 
                // Prepare rejection URL
-               $REJECT = "http://";
+               $REJECT = 'http://';
                if (GET_EXT_VERSION('other') >= '0.1.6') $REJECT = getConfig('reject_url');
                define('__REJECT_URL', $REJECT);
 
                // Load main template
-               LOAD_TEMPLATE("admin_unlock_emails");
-       } elseif ((REQUEST_ISSET_POST(('lock'))) && (getConfig('url_blacklist') != 'Y')) {
+               LOAD_TEMPLATE('admin_unlock_emails');
+       } elseif ((REQUEST_ISSET_POST('lock')) && (getConfig('url_blacklist') != 'Y')) {
                // URL blacklist not activated
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
        } else {