lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall/alias, fix is_alias() compatibility for https://github.com/opnsense/core/issues/1858

Browse Source
This commit is contained in:
Ad Schellevis 2018-07-16 18:29:05 +02:00
parent 14652b4fb1
commit 87c7d90857
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/etc/inc/config.inc
View File

@ -53,8 +53,17 @@ function alias_make_table($config)
global $aliastable;
$aliastable = array();
if (isset($config['aliases']['alias'])) {
$aliasMdl = new \OPNsense\Firewall\Alias();
// MVC defined aliases
foreach ($aliasMdl->aliases->alias->__items as $alias) {
if (strncmp((string)$alias->type, 'url', 3) !== 0) {
$aliastable[(string)$alias->name] = implode(" ", explode("\n", $alias->content));
} else {
$aliastable[(string)$alias->name] = "";
}
}
// legacy defined, keep during transition.
if (empty($aliastable) && isset($config['aliases']['alias'])) {
foreach ($config['aliases']['alias'] as $alias) {
if ($alias['name']) {
$aliastable[$alias['name']] = isset($alias['address']) ? $alias['address'] : null;