anpleenko/iplist
1
0
Fork 0
mirror of https://github.com/rekryt/iplist.git synced 2025-10-14 01:09:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: add the ability to append command line in mikrotik script

Browse Source
This commit is contained in:
Rekryt
2024-11-03 15:10:48 +03:00
parent 6d6342e893
commit 800a2eb06e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ class MikrotikController extends AbstractIPListController {
$sites = SiteFactory::normalizeArray($this->request->getQueryParameters()['site'] ?? []); $sites = SiteFactory::normalizeArray($this->request->getQueryParameters()['site'] ?? []);
$data = $this->request->getQueryParameter('data') ?? ''; $data = $this->request->getQueryParameter('data') ?? '';
$append = $this->request->getQueryParameter('append') ?? '';
if ($data == '') { if ($data == '') {
return "# Error: The 'data' GET parameter is required in the URL to access this page"; return "# Error: The 'data' GET parameter is required in the URL to access this page";
} }
@@ -41,7 +42,10 @@ 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, $listName, $filteredItems)); $items = array_merge(
$items,
$this->generateList($siteEntity, $listName, $filteredItems, $append ? ' ' . $append : '')
);
$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']));
@@ -59,10 +63,10 @@ class MikrotikController extends AbstractIPListController {
* @param array $array * @param array $array
* @return array * @return array
*/ */
private function generateList(Site $siteEntity, string $listName, array $array): array { private function generateList(Site $siteEntity, string $listName, array $array, string $append = ''): array {
$items = []; $items = [];
foreach ($array as $item) { foreach ($array as $item) {
$items[] = 'add list=' . $listName . ' address=' . $item . ' comment=' . $siteEntity->name; $items[] = 'add list=' . $listName . ' address=' . $item . ' comment=' . $siteEntity->name . $append;
} }
return $items; return $items;
} }