Ticket resolved, code rewrites and caching:

[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 9419a62dc4ea90a5224a70f21d3678b21aa22273..e1f53a777f3df02db77f6ac93c037f303d8bfc86 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -45,7 +45,7 @@ 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`
-FROM `"._MYSQL_PREFIX."_pool`
+FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE `data_type`='ADMIN'
 ORDER BY `timestamp` ASC", __FILE__, __LINE__);
 
@@ -69,8 +69,8 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
 
                                // Order placed in queue...
                                $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id
-FROM "._MYSQL_PREFIX."_pool AS po
-INNER JOIN "._MYSQL_PREFIX."_payments AS pay
+FROM `{!_MYSQL_PREFIX!}_pool` AS po
+INNER JOIN `{!_MYSQL_PREFIX!}_payments` AS pay
 ON po.payment_id=pay.id
 WHERE po.id=%s
 LIMIT 1",
@@ -93,7 +93,7 @@ LIMIT 1",
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && (getConfig('bonus_active') == "Y")) {
                                                // Add points directly
-                                               $result = 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+".getConfig('bonus_order')." WHERE userid=%s LIMIT 1",
                                                        array(bigintval($DATA['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
@@ -107,7 +107,7 @@ LIMIT 1",
                                        SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
 
                                        // Unlock selected email
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
                                                array($id), __FILE__, __LINE__);
                                } // END - if
                        } // END - foreach
@@ -130,7 +130,7 @@ LIMIT 1",
                                $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
@@ -144,10 +144,10 @@ LIMIT 1",
                                SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
-                               if ((empty($_POST['redirect'])) || ($_POST['redirect'] == "http://")) $_POST['redirect'] = URL;
+                               if ((empty($_POST['redirect'])) || ($_POST['redirect'] == "http://")) $_POST['redirect'] = constant('URL');
 
                                // Redirect URL
-                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET url='%s', data_type='NEW' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE id=%s LIMIT 1",
                                        array($_POST['redirect'], $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
@@ -167,7 +167,7 @@ LIMIT 1",
                        LOAD_TEMPLATE("admin_unlock_emails_redir");
                } else {
                        // Nothing selected
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MAILS_NOTHING_CHECKED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
                }
        } elseif ((isset($_POST['lock'])) && ($SEL > 0) && (getConfig('url_blacklist') == "Y")) {
                // Lock URLs
@@ -176,11 +176,11 @@ LIMIT 1",
                        $id = bigintval($id);
 
                        // Lookup in blacklist
-                       $result = SQL_QUERY_ESC("SELECT `id` FROM `"._MYSQL_PREFIX."_url_blacklist` WHERE `url`='%s' LIMIT 1",
+                       $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) {
                                // 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)",
+                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_url_blacklist` (`url`,`pool_id`) VALUES ('%s',%s)",
                                        array($url, $id), __FILE__, __LINE__);
                        } // END - if
 
@@ -189,7 +189,7 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_URLS_BLOCKED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_URLS_BLOCKED'));
        } elseif ((empty($_POST['lock'])) && (empty($_POST['accept'])) && (empty($_POST['reject'])) && (getConfig('url_blacklist') == "Y")) {
                // Mail orders are in pool so we can display them
                $SW = 2; $OUT = "";
@@ -227,16 +227,16 @@ LIMIT 1",
 
                // Load main template
                LOAD_TEMPLATE("admin_unlock_emails");
-       } elseif ((isset($_POST['lock'])) && (getConfig('url_blacklist') == "N")) {
+       } elseif ((isset($_POST['lock'])) && (getConfig('url_blacklist') != "Y")) {
                // URL blacklist not activated
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_URL_BLACKLIST_DISABLED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
        } else {
                // Wrong call!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_WRONG_CALL'));
        }
 } else {
        // No mail orders fond
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
 }
 
 //