Introduced new extension ext-blacklist:

[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 a9145f11b7dd957ee4abb9976a0303fb68c14ed8..f23946d3ba9bbe86d83f29359d03378b159251f0 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -179,23 +179,14 @@ LIMIT 1',
                        // Nothing selected
                        displayMessage('{--ADMIN_MAILS_NOTHING_CHECKED--}');
                }
-       } elseif ((isFormSent('lock')) && (ifPostContainsSelections()) && (isUrlBlacklistEnabled())) {
+       } elseif ((isFormSent('lock')) && (ifPostContainsSelections()) && (isExtensionActive('blacklist')) && (isUrlBlacklistEnabled())) {
                // Lock URLs
                foreach (postRequestElement('sel') as $id => $url) {
                        // Secure id number
                        $id = bigintval($id);
 
                        // 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_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__);
-                       } // END - if
-
-                       // Free memory
-                       SQL_FREERESULT($result);
+                       insertUrlInBlacklist($url);
                } // END - foreach
 
                // Output message
@@ -219,7 +210,7 @@ LIMIT 1',
 
                // Load main template
                loadTemplate('admin_unlock_emails', FALSE, $content);
-       } elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
+       } elseif ((isFormSent('lock')) && ((!isExtensionActive('blacklist')) || (!isUrlBlacklistEnabled()))) {
                // URL blacklist not activated
                displayMessage('{--ADMIN_URL_BLACKLIST_DISABLED--}');
        } else {