Rewrote some parts:

[mailer.git] / inc / extensions / ext-blacklist.php

diff --git a/inc/extensions/ext-blacklist.php b/inc/extensions/ext-blacklist.php
index 50fd459df6718a1e54d462c95dac1eb78b22dbc5..0f7fbf6cb90d803b7370edc9ad5d996c0ff043c6 100644 (file)
--- a/inc/extensions/ext-blacklist.php
+++ b/inc/extensions/ext-blacklist.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -56,20 +56,33 @@ switch (getExtensionMode()) {
                addCreateTableSql('blacklist', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `data` VARCHAR(255) NOT NULL DEFAULT '',
-`type` VARCHAR(20) NOT NULL DEFAULT 'INVALID',
 `pool_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL,
+`provider` VARCHAR(255) NOT NULL DEFAULT 'BLACKLIST',
+`type` VARCHAR(20) NOT NULL DEFAULT 'INVALID',
 `added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`id`),
+INDEX (`provider`),
+INDEX (`type`),
 INDEX (`pool_id`)",
                        'Generic blacklist');
 
                // Add admin menu
-               addAdminMenuSql('setup','config_blacklist','Sperrlisten','Einstellungen zu den Sperrlisten.',8);
-               addAdminMenuSql('misc','list_blacklist','Sperrlisten...','Zeigt gesperrte Email-Adressen und/oder URLs an.',3);
+               addAdminMenuSql('setup', 'config_blacklist', 'Sperrlisten', 'Einstellungen zu den Sperrlisten.', 8);
+               addAdminMenuSql('misc', 'list_blacklist', 'Sperrlisten...', 'Zeigt gesperrte Email-Adressen, IP-Adressen, URLs und vieles mehr an.', 4);
 
                // Add configuration
-               addConfigAddSql('url_blacklist', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
                addConfigAddSql('email_blacklist', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+               addConfigAddSql('ip_blacklist', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+               addConfigAddSql('url_blacklist', "ENUM('Y','N') NOT NULL DEFAULT 'Y'");
+
+               // Register filters
+               registerFilter(__FILE__, __LINE__, 'pre_user_registration' , 'CHECK_EMAIL_BLACKLISTED', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'pre_user_registration' , 'CHECK_IP_BLACKLISTED'   , FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'pre_update_user_data'  , 'CHECK_EMAIL_BLACKLISTED', FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'pre_mail_order'        , 'CHECK_URL_BLACKLISTED'  , FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_email_blacklisted', 'LOG_EMAIL_BLACKLISTED'  , FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_ip_blacklisted'   , 'LOG_IP_BLACKLISTED'     , FALSE, TRUE, isExtensionDryRun());
+               registerFilter(__FILE__, __LINE__, 'post_url_blacklisted'  , 'LOG_URL_BLACKLISTED'    , FALSE, TRUE, isExtensionDryRun());
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -77,7 +90,16 @@ INDEX (`pool_id`)",
                addDropTableSql('blacklist');
 
                // Remove menu
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN('config_blacklist', 'list_blacklist') LIMIT 1");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what` IN ('config_blacklist', 'list_blacklist')");
+
+               // Unregister filters
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration' , 'CHECK_EMAIL_BLACKLISTED', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration' , 'CHECK_IP_BLACKLISTED'   , TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_update_user_data'  , 'CHECK_EMAIL_BLACKLISTED', TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_mail_order'        , 'CHECK_URL_BLACKLISTED'  , TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_email_blacklisted', 'LOG_EMAIL_BLACKLISTED'  , TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_ip_blacklisted'   , 'LOG_IP_BLACKLISTED'     , TRUE, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'post_url_blacklisted'  , 'LOG_URL_BLACKLISTED'    , TRUE, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -109,7 +131,7 @@ INDEX (`pool_id`)",
                break;
 
        default: // Unknown extension mode
-               reportBug(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+               reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName()));
                break;
 } // END - switch