Fixes for sending pool

[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 65c342dec1ab6d1bdb61ba77228738f87bb95e82..1d68063407e129b67bf3a12a3b1943e9e41e14e1 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;
@@ -70,7 +69,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
                                 array($id), __FILE__, __LINE__);
 
                                // Update wents fine?
-                               if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1) {
+                               if (SQL_AFFECTEDROWS() == 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
 FROM "._MYSQL_PREFIX."_pool AS po
@@ -94,24 +93,15 @@ LIMIT 1",
 
                                                // Subtract bonus points from system
                                                BONUS_POINTS_HANDLER($_CONFIG['bonus_order']);
-                                       }
+                                       } // END - if
 
-                                       // Check for surfbar extension
-                                       if (EXT_IS_ACTIVE("surfbar")) {
-                                               // Add the url
-                                               $insertId = SURFBAR_ADMIN_ADD_URL($DATA['url'], $DATA['sender'], $DATA['payment'], $DATA['payment_id']);
-
-                                               // Load email template
-                                               $msg_user = LOAD_EMAIL_TEMPLATE("order_accept_sb", $insertId, $DATA['sender']);
-                                       } else {
-                                               // Load email template
-                                               $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA['sender']);
-                                       }
+                                       // Load email template
+                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA['sender']);
 
                                        // Send email
                                        SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
-                               }
-                       }
+                               } // END - if
+                       } // END - foreach
 
                        // Set message
                        $MSG = ADMIN_MAILS_ACTIVATED;
@@ -126,7 +116,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);
 
@@ -173,7 +163,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__);
@@ -241,6 +231,5 @@ LIMIT 1",
        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
 }
 
-CLOSE_TABLE();
 //
 ?>