lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mvc: style sweep

Browse Source
This commit is contained in:
Franco Fichtner 2025-03-18 21:10:54 +01:00
parent af5e9fcbf8
commit 62536e40ee
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
View File

@ -34,7 +34,6 @@ use OPNsense\Firewall\Category;
use OPNsense\Firewall\Group;
use OPNsense\Firewall\Util;
class FilterController extends FilterBaseController
{
protected static $categorysource = "rules.rule";
@ -139,7 +138,7 @@ class FilterController extends FilterBaseController
/* frontend can format categories with colors */
if (!empty($record['categories'])) {
$catnames = array_map('trim', explode(',', $record['categories']));
$record['category_colors'] = array_map(fn($name) => $catcolors[$name], $catnames);;
$record['category_colors'] = array_map(fn($name) => $catcolors[$name], $catnames);
} else {
$record['category_colors'] = [];
}
@ -154,7 +153,7 @@ class FilterController extends FilterBaseController
if (empty($interfaces)) {
$is_if = count(explode(',', $record['interface'])) > 1 || empty($record['interface']);
} else {
$is_if = array_intersect(explode(',', $record['interface'] ?? ''), $interfaces) ;
$is_if = array_intersect(explode(',', $record['interface'] ?? ''), $interfaces);
$is_if = $is_if || empty($record['interface']);
}
if ($is_cat && $is_if) {
@ -261,7 +260,7 @@ class FilterController extends FilterBaseController
$prev_sequence = $prev_record->sequence->asFloat();
/* distance will be averaged, which is why the minimum should be at least 2 (half is 1) */
$distance = max($record->sequence->asFloat() - $prev_record->sequence->asFloat(), 2);
} elseif ($selected_node !== null && $target_node !== null){
} elseif ($selected_node !== null && $target_node !== null) {
/* group processed */
break;
} else {
@ -281,7 +280,7 @@ class FilterController extends FilterBaseController
} elseif ($uuid == $selected_uuid) {
$selected_node = $record;
} elseif ($selected_id !== null && $prev_sequence >= $record->sequence->asFloat()) {
$record->sequence = (string)($prev_sequence + $distance/2);
$record->sequence = (string)($prev_sequence + $distance / 2);
} elseif ($target_node !== null && $selected_node !== null) {
/* both nodes found and the next one is in sequence, stop moving data */
break;

3
src/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php
View File

@ -51,12 +51,11 @@ class FilterController extends \OPNsense\Base\IndexController
if (!empty($field['advanced']) && $field['advanced'] == "true") {
if (!empty($field['id'])) {
$tmp = explode('.', $field['id']);
$advancedFieldIds[] = $tmp[count($tmp)-1];
$advancedFieldIds[] = $tmp[count($tmp) - 1];
}
}
}
return implode(',', $advancedFieldIds);
}
}