Filters for configurable userid exclusion added:

[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 4751922e79d62244eb28cd5fcc07782454291d92..a9145f11b7dd957ee4abb9976a0303fb68c14ed8 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 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,7 +45,14 @@ 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
@@ -62,8 +69,12 @@ if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
                                $id = bigintval($id);
 
                                // Order placed in queue...
-                               $result = SQL_QUERY_ESC("SELECT
-       po.`url`, po.`subject`, po.`sender`, pay.`payment`, po.`payment_id`
+                               $result = SQL_QUERY_ESC('SELECT
+       po.`url`,
+       po.`subject`,
+       po.`sender`,
+       pay.`payment`,
+       po.`payment_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool` AS `po`
 INNER JOIN
@@ -72,7 +83,7 @@ ON
        po.`payment_id`=pay.`id`
 WHERE
        po.`id`=%s
-LIMIT 1",
+LIMIT 1',
                                        array($id), __FILE__, __LINE__);
 
                                // Update wents fine?
@@ -84,7 +95,7 @@ LIMIT 1",
                                        // @TODO Rewrite these if-blocks to a filter
                                        if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {
                                                // Then "migrate" the URL to the surfbar
-                                               SURFBAR_ADMIN_MIGRATE_URL($content['url'], $content['sender']);
+                                               doSurfbarAdminMigrateUrl($content['url'], $content['sender']);
                                        } // END - if
 
                                        // Check for bonus extension version >= 0.4.4 for the order bonus
@@ -94,7 +105,7 @@ LIMIT 1",
                                                        array(bigintval($content['sender'])), __FILE__, __LINE__);
 
                                                // Subtract bonus points from system
-                                               handleBonusPoints(getConfig('bonus_order'), $content['sender']);
+                                               handleBonusPoints(getBonusOrder(), $content['sender']);
                                        } // END - if
 
                                        // Load email template
@@ -130,7 +141,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
@@ -149,7 +160,7 @@ LIMIT 1",
                                } // 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(postRequestElement('redirect'), $id),__FILE__, __LINE__);
 
                                // Prepare data for the row template
@@ -159,11 +170,11 @@ LIMIT 1",
                                );
 
                                // Load row template and switch colors
-                               $OUT .= loadTemplate('admin_unlock_emails_redir_row', true, $content);
+                               $OUT .= loadTemplate('admin_unlock_emails_redir_row', TRUE, $content);
                        } // END - foreach
 
                        // Load main template
-                       loadTemplate('admin_unlock_emails_redir', false, $OUT);
+                       loadTemplate('admin_unlock_emails_redir', FALSE, $OUT);
                } else {
                        // Nothing selected
                        displayMessage('{--ADMIN_MAILS_NOTHING_CHECKED--}');
@@ -179,7 +190,7 @@ LIMIT 1",
                                array($url), __FILE__, __LINE__);
                        if (SQL_HASZERONUMS($result)) {
                                // 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
 
@@ -197,7 +208,7 @@ LIMIT 1",
                        $content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
                        // Load row template and switch colors
-                       $OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
+                       $OUT .= loadTemplate('admin_unlock_emails_row', TRUE, $content);
                } // END - while
 
                // Free memory
@@ -207,7 +218,7 @@ LIMIT 1",
                $content['rows'] = $OUT;
 
                // Load main template
-               loadTemplate('admin_unlock_emails', false, $content);
+               loadTemplate('admin_unlock_emails', FALSE, $content);
        } elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
                // URL blacklist not activated
                displayMessage('{--ADMIN_URL_BLACKLIST_DISABLED--}');