Another column fix

[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 0131dd295beec94a4affb3f35fd0884cc0d7c1be..45281dd170fc475e66c3a66997d7192e57728445 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -41,12 +41,11 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
 ADD_DESCR("admin", basename(__FILE__));
 
 // Define some variables
-global $DATA, $link;
+global $DATA;
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT id, sender, subject, payment_id, timestamp, url, target_send, cat_id FROM "._MYSQL_PREFIX."_pool WHERE data_type='ADMIN' ORDER BY timestamp", __FILE__, __LINE__);
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
 if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
        // Count checked checkboxes
        $SEL = 0;
@@ -65,27 +64,29 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
                                // Secure ID number
                                $id = bigintval($id);
 
-                               // Unlock selected email
-                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%s AND data_type='ADMIN' LIMIT 1",
-                                array($id), __FILE__, __LINE__);
-
-                               // Update wents fine?
-                               if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1) {
-                                       // Order placed in queue...        0         1           2           3             4
-                                       $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id
+                               // 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
 ON po.payment_id=pay.id
 WHERE po.id=%s
 LIMIT 1",
-                                        array($id), __FILE__, __LINE__);
+                                       array($id), __FILE__, __LINE__);
 
+                               // Update wents fine?
+                               if (SQL_NUMROWS($result) == 1) {
                                        // Load data
                                        $DATA = SQL_FETCHARRAY($result);
 
                                        // Free result
                                        SQL_FREERESULT($result);
 
+                                       // Is the surfbar installed?
+                                       if ((EXT_IS_ACTIVE("surfbar")) && ($_CONFIG['surfbar_migrate_order'] == "Y")) {
+                                               // Then "migrate" the URL to the surfbar
+                                               SURFBAR_ADMIN_MIGRATE_URL($DATA['url'], $DATA['sender']);
+                                       } // END - if
+
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
                                        if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y")) {
                                                // Add points directly
@@ -97,10 +98,14 @@ LIMIT 1",
                                        } // END - if
 
                                        // Load email template
-                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA['sender']);
+                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", array(), $DATA['sender']);
 
                                        // Send email
                                        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",
+                                               array($id), __FILE__, __LINE__);
                                } // END - if
                        } // END - foreach
 
@@ -117,7 +122,7 @@ LIMIT 1",
                if ($SEL > 0) {
                        // Reject mail orders
                        $SW = 2; $OUT = "";
-                       foreach ($_POST['sel'] as $id=>$value) {
+                       foreach ($_POST['sel'] as $id => $value) {
                                // Secure ID number
                                $id = bigintval($id);
 
@@ -132,7 +137,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Load email template and send it away
-                               $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", "", $DATA['sender']);
+                               $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", array(), $DATA['sender']);
                                SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
@@ -164,7 +169,7 @@ LIMIT 1",
        } elseif ((isset($_POST['lock'])) || ($SEL > 0)) {
                if ($SEL > 0) {
                        // Lock URLs
-                       foreach ($_POST['sel'] as $id=>$url) {
+                       foreach ($_POST['sel'] as $id => $url) {
                                // Lookup in blacklist
                                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_url_blist WHERE url='%s' LIMIT 1",
                                 array($url), __FILE__, __LINE__);
@@ -232,6 +237,5 @@ LIMIT 1",
        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
 }
 
-CLOSE_TABLE();
 //
 ?>