From eeb14c29fc3b03409276ef331dba8b04b63f01d7 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 23 Jul 2018 20:39:18 +0200 Subject: [PATCH] Firewall/alias, fix migration code for https://github.com/opnsense/core/issues/1858 caused by https://github.com/opnsense/core/issues/2567, leaving the migration inactive for the time being. --- .../mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php index 0240b5e1b..3cd0bcf2a 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php @@ -59,7 +59,10 @@ class M1_0_0 extends BaseModelMigration $node->description = (string)$alias->descr; $node->name = (string)$alias->name; $node->type = (string)$alias->type; - if ($alias->url) { + if (in_array((string)$alias->type, array('urltable_ports', 'url_ports'))) { + // unsupported, replace with empty port alias + $node->type = "port"; + } elseif ($alias->url) { // url content only contains a single item $node->content = (string)$alias->url; } elseif ($alias->aliasurl) {