From 41e89fe13c542d8224fdcf91a4c3c2d41023e550 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 28 Dec 2017 21:50:44 +0100 Subject: [PATCH] Firewall/rule parsing, fix some spacings. for https://github.com/opnsense/core/issues/1326 --- src/opnsense/mvc/app/library/OPNsense/Firewall/DNatRule.php | 4 ++-- .../mvc/app/library/OPNsense/Firewall/ForwardRule.php | 2 +- src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/DNatRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/DNatRule.php index 648843b88..15b02e213 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/DNatRule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/DNatRule.php @@ -47,7 +47,7 @@ class DNatRule extends Rule ), 'nat_rdr' => array( 'disabled' => 'parseIsComment', - 'nat' => 'parseStaticText, rdr ', + 'nat' => 'parseStaticText,rdr ', 'interface' => 'parseInterface', 'to' => 'parsePlainCurly,from ', 'external' => 'parsePlainCurly,to ', @@ -56,7 +56,7 @@ class DNatRule extends Rule ), 'nat_refl' => array( 'disabled' => 'parseIsComment', - 'nat' => 'parseStaticText, nat ', + 'nat' => 'parseStaticText,nat ', 'interface' => 'parseInterface', 'ipprotocol' => 'parsePlain', 'protocol' => 'parseReplaceSimple,tcp/udp:{tcp udp},proto ', diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/ForwardRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/ForwardRule.php index dd8375186..4dd32c470 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/ForwardRule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/ForwardRule.php @@ -56,7 +56,7 @@ class ForwardRule extends Rule ), 'rdr_nat' => array( 'disabled' => 'parseIsComment', - 'nat' => 'parseStaticText, nat ', + 'nat' => 'parseStaticText,nat ', 'interface' => 'parseInterface', 'ipprotocol' => 'parsePlain', 'protocol' => 'parseReplaceSimple,tcp/udp:{tcp udp},proto ', diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php index 9b4305d87..bf2cbdabf 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/NptRule.php @@ -38,7 +38,7 @@ class NptRule extends Rule private $procorder = array( 'binat_1' => array( 'disabled' => 'parseIsComment', - 'binat' => 'parseStaticText, binat ', + 'binat' => 'parseStaticText,binat ', 'interface' => 'parseInterface', 'from' => 'parsePlain,from , to any', 'to' => 'parsePlain, -> ', @@ -46,7 +46,7 @@ class NptRule extends Rule ), 'binat_2' => array( 'disabled' => 'parseIsComment', - 'binat' => 'parseStaticText, binat ', + 'binat' => 'parseStaticText,binat ', 'interface' => 'parseInterface', 'to' => 'parsePlain,from , to any', 'from' => 'parsePlain, -> ',