anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2025-10-13 00:49:36 +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 17:09:42 +03:00
parent 87330e074b
commit a3a82f93ea
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,8 +27,9 @@ class MikrotikController extends AbstractIPListController {
continue; continue;
} }
$listName = $groupName . '_' . $data;
$response = array_merge($response, [ $response = array_merge($response, [
'/ip firewall address-list remove [find list="' . $groupName . '"];', '/ip firewall address-list remove [find list="' . $listName . '"];',
':delay 5s', ':delay 5s',
'', '',
'/ip firewall address-list', '/ip firewall address-list',
@@ -40,7 +41,7 @@ class MikrotikController extends AbstractIPListController {
continue; continue;
} }
$filteredItems = array_filter($siteEntity->$data, fn(string $row) => !in_array($row, $entries)); $filteredItems = array_filter($siteEntity->$data, fn(string $row) => !in_array($row, $entries));
$items = array_merge($items, $this->generateList($siteEntity, $filteredItems)); $items = array_merge($items, $this->generateList($siteEntity, $listName, $filteredItems));
$entries = array_merge($entries, $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']));
@@ -54,13 +55,14 @@ class MikrotikController extends AbstractIPListController {
/** /**
* @param Site $siteEntity * @param Site $siteEntity
* @param string $listName
* @param array $array * @param array $array
* @return array * @return array
*/ */
private function generateList(Site $siteEntity, array $array): array { private function generateList(Site $siteEntity, string $listName, array $array): array {
$items = []; $items = [];
foreach ($array as $item) { foreach ($array as $item) {
$items[] = 'add list=' . $siteEntity->group . ' address=' . $item . ' comment=' . $siteEntity->name; $items[] = 'add list=' . $listName . ' address=' . $item . ' comment=' . $siteEntity->name;
} }
return $items; return $items;
} }