Changed the tale name for recipient_blacklist

Author: laxamar

blacklist_table.sql

@@ -1,7 +1,7 @@
 -- MySQL table for PostfixAdmin Recipient Blacklist feature
 -- This table stores email addresses or patterns that should be rejected/discarded
 
-CREATE TABLE IF NOT EXISTS `mysql_virtual_recipient_blacklist` (
+CREATE TABLE IF NOT EXISTS `recipient_blacklist` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `address` varchar(255) NOT NULL COMMENT 'Email address or pattern (e.g., bad@domain.com or @spammer.com)',
   `action` varchar(20) NOT NULL DEFAULT 'REJECT' COMMENT 'Action to take: REJECT, DISCARD, DEFER',
@@ -16,6 +16,6 @@ CREATE TABLE IF NOT EXISTS `mysql_virtual_recipient_blacklist` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Recipient blacklist for email rejection/filtering';
 
 -- Example entries
-INSERT IGNORE INTO `mysql_virtual_recipient_blacklist` (`address`, `action`, `domain`) VALUES
+INSERT IGNORE INTO `recipient_blacklist` (`address`, `action`, `domain`) VALUES
 ('@spam.example.com', 'REJECT', 'example.com'),
 ('baduser@anywhere.com', 'DISCARD', 'example.com');

config.inc.php

@@ -144,6 +144,7 @@ function language_hook($PALANG, $language) {
     'quota2' => 'quota2',
     'dkim' => 'dkim',
     'dkim_signing' => 'dkim_signing',
+    'recipient_blacklist' => 'recipient_blacklist',
 );
 
 // Site Admin
@@ -371,7 +372,8 @@ function x_struct_admin_modify($struct) {
 $CONF['fetchmail_struct_hook']      = '';
 $CONF['dkim_struct_hook']           = '';
 $CONF['dkim_signing_struct_hook']   = '';
-$CONF['mysql_virtual_recipient_blacklist_struct_hook'] = '';
+$CONF['recipient_blacklist_struct_hook']           = '';
+$CONF['mysql_virtual_recipient_blacklist_struct_hook'] = ''; // deprecated - use recipient_blacklist_struct_hook
 
 /*
     mailbox_postcreation_hook example function

migrate_blacklist_table.sql

@@ -0,0 +1,33 @@
+-- Migration script: mysql_virtual_recipient_blacklist → recipient_blacklist
+-- 
+-- This script migrates from the old table name to the new standardized name
+-- Run this after updating the PostfixAdmin code
+
+-- Step 1: Create the new table with the correct name
+CREATE TABLE IF NOT EXISTS `recipient_blacklist` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `address` varchar(255) NOT NULL COMMENT 'Email address or pattern (e.g., bad@domain.com or @spammer.com)',
+  `action` varchar(20) NOT NULL DEFAULT 'REJECT' COMMENT 'Action to take: REJECT, DISCARD, DEFER',
+  `domain` varchar(255) NOT NULL DEFAULT '' COMMENT 'Domain for organization/filtering',
+  `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `active` tinyint(1) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `address` (`address`),
+  KEY `domain` (`domain`),
+  KEY `active` (`active`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Recipient blacklist for email rejection/filtering';
+
+-- Step 2: Migrate data from old table if it exists
+INSERT IGNORE INTO recipient_blacklist (address, action, domain, created, modified, active)
+SELECT address, action, domain, created, modified, active
+FROM mysql_virtual_recipient_blacklist
+WHERE NOT EXISTS (SELECT 1 FROM recipient_blacklist WHERE recipient_blacklist.address = mysql_virtual_recipient_blacklist.address);
+
+-- Step 3: Verify data migration
+SELECT 'Old table count:' as info, COUNT(*) as count FROM mysql_virtual_recipient_blacklist
+UNION ALL
+SELECT 'New table count:' as info, COUNT(*) as count FROM recipient_blacklist;
+
+-- Step 4: After verifying data, uncomment the following line to drop the old table
+-- DROP TABLE mysql_virtual_recipient_blacklist;

migrate_postfix_config.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# Postfix configuration migration script
+# This script updates Postfix configuration to use the new table name
+
+set -e
+
+echo "Migrating Postfix configuration for recipient blacklist..."
+
+# Backup current configuration
+cp /etc/postfix/main.cf /etc/postfix/main.cf.backup.$(date +%Y%m%d_%H%M%S)
+
+# Update main.cf to use new table name
+if grep -q "mysql_virtual_recipient_blacklist" /etc/postfix/main.cf; then
+    echo "Updating main.cf..."
+    sed -i 's/mysql_virtual_recipient_blacklist/recipient_blacklist/g' /etc/postfix/main.cf
+    echo "Updated main.cf"
+else
+    echo "No references to mysql_virtual_recipient_blacklist found in main.cf"
+fi
+
+# Rename the MySQL configuration file
+if [ -f /etc/postfix/mysql_virtual_recipient_blacklist.cf ]; then
+    echo "Renaming MySQL config file..."
+    mv /etc/postfix/mysql_virtual_recipient_blacklist.cf /etc/postfix/recipient_blacklist.cf
+    echo "Renamed to recipient_blacklist.cf"
+fi
+
+# Update the MySQL config file content
+if [ -f /etc/postfix/recipient_blacklist.cf ]; then
+    echo "Updating MySQL config file content..."
+    sed -i 's/mysql_virtual_recipient_blacklist/recipient_blacklist/g' /etc/postfix/recipient_blacklist.cf
+    echo "Updated recipient_blacklist.cf"
+fi
+
+# Check configuration
+echo "Checking Postfix configuration..."
+postfix check
+
+if [ $? -eq 0 ]; then
+    echo "Configuration check passed!"
+    echo "Reloading Postfix..."
+    postfix reload
+    echo "Migration completed successfully!"
+else
+    echo "Configuration check failed! Please review the changes."
+    exit 1
+fi
+
+echo ""
+echo "Migration Summary:"
+echo "- Updated table name from mysql_virtual_recipient_blacklist to recipient_blacklist"
+echo "- Updated Postfix main.cf configuration"
+echo "- Renamed MySQL config file"
+echo "- Reloaded Postfix configuration"
+echo ""
+echo "Please run the database migration script (migrate_blacklist_table.sql) to complete the process."

model/BlacklistHandler.php

@@ -5,7 +5,7 @@
  */
 class BlacklistHandler extends PFAHandler
 {
-    protected $db_table = 'mysql_virtual_recipient_blacklist';
+    protected $db_table = 'recipient_blacklist';
     protected $id_field = 'address';
     protected $domain_field = 'domain';
     protected $order_by = 'address';