Introduced new wrapper functions to make the code more readable, new extension ext...

[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 9dc0209a74890eeb4064d7eebfc0ab829a1857ae..194a3a0ff1c635e52b22d5d654c603a78b039ee5 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,9 +45,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-// Define some variables
-global $DATA;
-
 // Check for mails
 $result_main = SQL_QUERY("SELECT
        `id`,`sender`,`subject`,`payment_id` AS `payment`,`timestamp`,`url`,`target_send`,`cat_id` AS category
@@ -181,7 +179,7 @@ LIMIT 1",
                        // Lookup in blacklist
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
                                array($url), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == '0') {
+                       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)",
                                        array($url, $id), __FILE__, __LINE__);
@@ -193,7 +191,7 @@ LIMIT 1",
 
                // Output message
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
-       } elseif ((!isPostRequestParameterSet('lock')) && (!isPostRequestParameterSet('accept')) && (!isPostRequestParameterSet(('reject'))) && (getConfig('url_blacklist') == 'Y')) {
+       } elseif ((!isPostRequestParameterSet('lock')) && (!isPostRequestParameterSet('accept')) && (!isPostRequestParameterSet('reject'))) {
                // Mail orders are in pool so we can display them
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_main)) {