anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2025-10-13 08:59:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: use groups for mikrotik lists names, update script format

Browse Source
This commit is contained in:
Rekryt
2024-09-05 16:29:53 +03:00
parent 7f1fda63d5
commit 372620839e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/Controller/MikrotikController.php
View File

@@ -32,11 +32,14 @@ class MikrotikController extends AbstractIPListController {
'/ip firewall address-list', '/ip firewall address-list',
]); ]);
$items = []; $items = [];
$entries = [];
foreach ($groupSites as $siteName => $siteEntity) { foreach ($groupSites as $siteName => $siteEntity) {
if (count($sites) && !in_array($siteName, $sites)) { if (count($sites) && !in_array($siteName, $sites)) {
continue; continue;
} }
$items = array_merge($items, $this->generateList($siteEntity, $siteEntity->$data)); $filteredItems = array_filter($siteEntity->$data, fn(string $row) => !in_array($row, $entries));
$items = array_merge($items, $this->generateList($siteEntity, $filteredItems));
$entries = array_merge($entries, $filteredItems);
} }
$items = SiteFactory::normalizeArray($items, in_array($data, ['ip4', 'ip6', 'cidr4', 'cidr6'])); $items = SiteFactory::normalizeArray($items, in_array($data, ['ip4', 'ip6', 'cidr4', 'cidr6']));
$items[count($items) - 1] = $items[count($items) - 1] . ';'; $items[count($items) - 1] = $items[count($items) - 1] . ';';