added En translation

fixed DB schema

docs/databases/mysql/en/create_db.sql

@@ -498,9 +498,7 @@ CREATE TABLE `ipset_members` (
   `ip` VARCHAR(39) NOT NULL COMMENT 'IPv4 or IPv6 address',
   `description` VARCHAR(255) DEFAULT NULL,
   `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE KEY `uniq_ipset_ip` (`ipset_id`, `ip`),
-  CONSTRAINT `fk_ipset_members_ipset` 
-    FOREIGN KEY (`ipset_id`) REFERENCES `ipset_list` (`id`) ON DELETE CASCADE
+  UNIQUE KEY `uniq_ipset_ip` (`ipset_id`, `ip`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 ALTER TABLE `acl`

docs/databases/mysql/ru/create_db.sql

@@ -498,9 +498,7 @@ CREATE TABLE `ipset_members` (
   `ip` VARCHAR(39) NOT NULL COMMENT 'IPv4 или IPv6 адрес',
   `description` VARCHAR(255) DEFAULT NULL,
   `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE KEY `uniq_ipset_ip` (`ipset_id`, `ip`),
-  CONSTRAINT `fk_ipset_members_ipset`.
-    FOREIGN KEY (`ipset_id`) REFERENCES `ipset_list` (`id`) ON DELETE CASCADE
+  UNIQUE KEY `uniq_ipset_ip` (`ipset_id`, `ip`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 ALTER TABLE `acl`

docs/databases/postgres/en/create_db.sql

@@ -638,7 +638,7 @@ CREATE TABLE ipset_list (
 
 CREATE TABLE ipset_members (
     id BIGSERIAL PRIMARY KEY,
-    ipset_id INTEGER NOT NULL REFERENCES ipset_list(id) ON DELETE CASCADE,
+    ipset_id INTEGER NOT NULL,
     ip INET NOT NULL,
     description VARCHAR(255),
     created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

docs/databases/postgres/ru/create_db.sql

@@ -639,7 +639,7 @@ CREATE TABLE ipset_list (
 
 CREATE TABLE ipset_members (
     id BIGSERIAL PRIMARY KEY,
-    ipset_id INTEGER NOT NULL REFERENCES ipset_list(id) ON DELETE CASCADE,
+    ipset_id INTEGER NOT NULL,
     ip INET NOT NULL,
     description VARCHAR(255),
     created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,

html/inc/languages/english.php

@@ -124,7 +124,7 @@ define("WEB_submenu_network_stats","Networks (Statistics)");
 define("WEB_submenu_options","Parameters");
 define("WEB_submenu_customers","Users");
 define("WEB_submenu_filter_list","Filter List");
-define("WEB_submenu_filter_ipset","Ipsets");
+define("WEB_submenu_filter_ipset","Address-list");
 define("WEB_submenu_filter_group","Filter Groups");
 define("WEB_submenu_filter_instances","Filter instances");
 define("WEB_submenu_filter_instance","Filter instance");
@@ -225,6 +225,7 @@ define("WEB_cell_mac_count","Mac count");
 define("WEB_cell_forename","Name");
 define("WEB_cell_flags","Flags");
 define("WEB_cell_created","Created");
+define("WEB_cell_update","Updated");
 define("WEB_cell_created_by","Created by");
 define("WEB_cell_deleted","Deleted");
 define("WEB_cell_gateway","Gateway");
@@ -249,6 +250,18 @@ define("WEB_list_models","List of device models");
 define("WEB_list_vendors","List of vendors");
 define("WEB_list_queues","List of shapers");
 
+/* ipset */
+define("WEB_error_ipset_name","Invalid ipset name (a-z only, A-Z, 0-9, _, -)");
+define("WEB_error_ip_address","Invalid IP address format: ");
+define("WEB_ipset_edit","IPSet Editing");
+define("WEB_ipset_name_hint","Only a-z, A-Z, 0-9, _, -");
+define("WEB_ipset_massadd","Bulk addition");
+define("WEB_ipset_massadd_hint","Format: <code>IP address [tab] description</code>. Lines with # are ignored.");
+define("WEB_ipset_empty","The list is empty");
+define("WEB_ipset_clear","Clear EVERYTHING");
+define("WEB_ipset_clear_qa","Are you sure? ALL entries will be deleted!");
+define("WEB_record_count","Elements (total: ");
+
 /* button names */
 define("WEB_btn_remove","Delete");
 define("WEB_btn_add","Add");
@@ -429,6 +442,10 @@ define("WEB_traffic_source_address","Src ip");
 define("WEB_traffic_proto","Proto");
 define("WEB_traffic_src_port","Src-port");
 define("WEB_traffic_dst_port","Dst-port");
+define("WEB_traffic_dst_subnet","IP address/network");
+define("WEB_traffic_dst_ipset","Address list");
+define("WEB_traffic_select_ipset","Select address list");
+define("WEB_traffic_dst_hint","Specify the IP address or network in the destination field");
 
 /* edit group filters */
 define("WEB_title_group","Group");

scripts/updates/3-1-0/ipset.msql

@@ -1,3 +1,3 @@
-CREATE TABLE `ipset_list` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` VARCHAR(64) NOT NULL UNIQUE COMMENT 'Имя ipset', `description` VARCHAR(255) DEFAULT NULL, `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-CREATE TABLE `ipset_members` ( `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, `ipset_id` INT NOT NULL, `ip` VARCHAR(39) NOT NULL COMMENT 'IPv4 или IPv6 адрес', `description` VARCHAR(255) DEFAULT NULL, `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY `uniq_ipset_ip` (`ipset_id`, `ip`),  CONSTRAINT `fk_ipset_members_ipset` FOREIGN KEY (`ipset_id`) REFERENCES `ipset_list` (`id`) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+CREATE TABLE `ipset_list` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` VARCHAR(64) NOT NULL UNIQUE COMMENT 'ipset name', `description` VARCHAR(255) DEFAULT NULL, `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+CREATE TABLE `ipset_members` ( `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, `ipset_id` INT NOT NULL, `ip` VARCHAR(39) NOT NULL COMMENT 'IPv4 or IPv6 address', `description` VARCHAR(255) DEFAULT NULL, `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY `uniq_ipset_ip` (`ipset_id`, `ip`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 ALTER TABLE `filter_list` ADD COLUMN `ipset_id` INT(11) DEFAULT NULL AFTER `dst`;

scripts/updates/3-1-0/ipset.psql

@@ -1,4 +1,4 @@
-CREATE TABLE ipset_list ( id SERIAL PRIMARY KEY, name VARCHAR(64) NOT NULL UNIQUE, description VARCHAR(255), created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP );
-CREATE TABLE ipset_members ( id BIGSERIAL PRIMARY KEY, ipset_id INTEGER NOT NULL REFERENCES ipset_list(id) ON DELETE CASCADE, ip INET NOT NULL, description VARCHAR(255), created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, UNIQUE (ipset_id, ip));
+CREATE TABLE ipset_list ( id SERIAL PRIMARY KEY, name VARCHAR(64) NOT NULL UNIQUE, description VARCHAR(255), created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP);
+CREATE TABLE ipset_members ( id BIGSERIAL PRIMARY KEY, ipset_id INTEGER NOT NULL, ip INET NOT NULL, description VARCHAR(255), created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, UNIQUE (ipset_id, ip));
 CREATE INDEX idx_ipset_members_ip ON ipset_members USING BTREE (ip inet_ops);
 ALTER TABLE filter_list ADD COLUMN ipset_id INTEGER DEFAULT NULL;