- Templates for surfbar (admin/member) added when URL got added while unlocking

[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 37eec82c610cf30b41c9734f7b24977230a408c1..663d9ae4ea1b986742cfffeb8e0413ab5165857b 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -55,8 +55,8 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
                if (count($_POST['sel']) > 0) {
                        // Count now... We use an own function for now
                        $SEL = SELECTION_COUNT($_POST['sel']);
-               }
-       }
+               } // END - if
+       } // END - if
 
        if (isset($_POST['accept'])) {
                if ($SEL > 0) {
@@ -66,10 +66,12 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
                                $id = bigintval($id);
 
                                // Unlock selected email
-                               //$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%d AND data_type='ADMIN' LIMIT 1",
-                               // array($id), __FILE__, __LINE__);
+                               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%d AND data_type='ADMIN' LIMIT 1",
+                                array($id), __FILE__, __LINE__);
+
+                               // Update wents fine?
                                if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1) {
-                                       // Order placed in queue...
+                                       // Order placed in queue...        0         1           2           3
                                        $result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment
 FROM "._MYSQL_PREFIX."_pool AS po
 INNER JOIN "._MYSQL_PREFIX."_payments AS pay
@@ -77,14 +79,18 @@ ON po.payment_id=pay.id
 WHERE po.id=%d
 LIMIT 1",
                                         array($id), __FILE__, __LINE__);
-                                       $DATA = SQL_FETCHROW($result);
+
+                                       // Load data
+                                       $DATA = SQL_FETCHARRAY($result);
+
+                                       // Free result
                                        SQL_FREERESULT($result);
 
                                        // 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
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_order=bonus_order+".$_CONFIG['bonus_order']." WHERE userid=%d LIMIT 1",
-                                                array(bigintval($DATA[2])), __FILE__, __LINE__);
+                                                array(bigintval($DATA['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
                                                BONUS_POINTS_HANDLER($_CONFIG['bonus_order']);
@@ -93,14 +99,17 @@ LIMIT 1",
                                        // Check for surfbar extension
                                        if (EXT_IS_ACTIVE("surfbar")) {
                                                // Add the url
-                                               SURFBAR_ADMIN_ADD_URL($DATA[0], $DATA[2], $DATA[3]);
-                                       } // END - if
+                                               $insertId = SURFBAR_ADMIN_ADD_URL($DATA['url'], $DATA['sender'], $DATA['payment']);
 
-                                       // Load email template
-                                       $msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA[2]);
+                                               // 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']);
+                                       }
 
                                        // Send email
-                                       SEND_EMAIL($DATA[2], MEMBER_ORDER_ACCEPTED, $msg_user);
+                                       SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
                                }
                        }
 
@@ -124,12 +133,16 @@ LIMIT 1",
                                // Load URL and subject from pool
                                $result = SQL_QUERY_ESC("SELECT url, subject, sender FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
                                 array($id), __FILE__, __LINE__);
-                               $DATA = SQL_FETCHROW($result);
+
+                               // Load data
+                               $DATA = SQL_FETCHARRAY($result);
+
+                               // Free result
                                SQL_FREERESULT($result);
 
                                // Load email template and send it away
-                               $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", "", $DATA[2]);
-                               SEND_EMAIL($DATA[2], MEMBER_ORDER_REJECTED, $msg_user);
+                               $msg_user = LOAD_EMAIL_TEMPLATE("order-reject", "", $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!
                                if ((empty($_POST['redirect'])) || ($_POST['redirect'] == "http://")) $_POST['redirect'] = URL;