A lot has been rewritten, ext-teams added, ext-forced 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 d97788292bec56553f4ae53028f9eb4d4310cf84..1d95092fa81bba5c0075b3654377962054579d38 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,11 +41,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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
@@ -63,15 +63,15 @@ if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
 
                                // Order placed in queue...
                                $result = SQL_QUERY_ESC("SELECT
-       po.url, po.subject, po.sender, pay.payment, po.payment_id
+       po.`url`, po.`subject`, po.`sender`, pay.`payment`, po.`payment_id`
 FROM
-       `{?_MYSQL_PREFIX?}_pool` AS po
+       `{?_MYSQL_PREFIX?}_pool` AS `po`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_payments` AS pay
+       `{?_MYSQL_PREFIX?}_payments` AS `pay`
 ON
-       po.payment_id=pay.id
+       po.`payment_id`=pay.`id`
 WHERE
-       po.id=%s
+       po.`id`=%s
 LIMIT 1",
                                        array($id), __FILE__, __LINE__);
 
@@ -98,7 +98,7 @@ LIMIT 1",
                                        } // 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,7 +120,7 @@ LIMIT 1",
                }
 
                // Mails unlocked for mail delivery
-               loadTemplate('admin_settings_saved', false, $message);
+               displayMessage($message);
        } elseif (isPostRequestParameterSet('reject')) {
                if (ifPostContainsSelections()) {
                        // Reject mail orders
@@ -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
@@ -140,14 +140,16 @@ 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 ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) {
+                                       setPostRequestParameter('redirect', getUrl());
+                               } // END - if
 
                                // Redirect URL
-                               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(postRequestParameter('redirect'), $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
@@ -164,7 +166,7 @@ LIMIT 1",
                        loadTemplate('admin_unlock_emails_redir', false, $OUT);
                } else {
                        // Nothing selected
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
+                       displayMessage('{--ADMIN_MAILS_NOTHING_CHECKED--}');
                }
        } elseif ((isFormSent('lock')) && (ifPostContainsSelections()) && (isUrlBlacklistEnabled())) {
                // Lock URLs
@@ -186,7 +188,7 @@ LIMIT 1",
                } // END - foreach
 
                // Output message
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_URLS_BLOCKED--}');
+               displayMessage('{--ADMIN_URLS_BLOCKED--}');
        } elseif ((!isFormSent('lock')) && (!isFormSent('accept')) && (!isFormSent('reject'))) {
                // Mail orders are in pool so we can display them
                $OUT = '';
@@ -208,14 +210,14 @@ LIMIT 1",
                loadTemplate('admin_unlock_emails', false, $content);
        } elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
                // URL blacklist not activated
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
+               displayMessage('{--ADMIN_URL_BLACKLIST_DISABLED--}');
        } else {
                // Wrong call!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
+               displayMessage('{--ADMIN_WRONG_CALL--}');
        }
 } else {
        // No mail orders fond
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
+       displayMessage('{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // [EOF]