From 297cc489416aefa050354d69918d5c3316ec92a2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 11 Feb 2021 13:31:43 +0100 Subject: [PATCH] Firewall / Aliases - all doesn't return all, but more like all -1. --- .../OPNsense/Firewall/Api/AliasUtilController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasUtilController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasUtilController.php index 9170a75b2..8b8b7049e 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasUtilController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasUtilController.php @@ -96,9 +96,9 @@ class AliasUtilController extends ApiControllerBase { $this->sessionClose(); - $itemsPerPage = intval($this->request->getPost('rowCount', 'int', 9999)); + $itemsPerPage = intval($this->request->getPost('rowCount', 'int', -1)); $currentPage = intval($this->request->getPost('current', 'int', 1)); - $offset = ($currentPage - 1) * $itemsPerPage; + $offset = $itemsPerPage > 0 ? ($currentPage - 1) * $itemsPerPage : 0; $backend = new Backend(); $entries = json_decode($backend->configdpRun("filter list table", array($alias, "json")), true); @@ -128,7 +128,7 @@ class AliasUtilController extends ApiControllerBase $item[$ekey] = $evalue; } return $item; - }, array_slice($entry_keys, $offset, $itemsPerPage)); + }, array_slice($entry_keys, $offset, $itemsPerPage > 0 ? $itemsPerPage : null)); if ( $this->request->hasPost('sort') &&