From a5a4cde2457b5ce615d585acbd2e94fe9e136835 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 15 Dec 2017 16:36:15 +0100 Subject: [PATCH] firewall, plugin. move parseIsComment to abstract class for reuse --- .../mvc/app/library/OPNsense/Firewall/FilterRule.php | 10 ---------- .../mvc/app/library/OPNsense/Firewall/Rule.php | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php index 510669067..5e3513e0f 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php @@ -65,16 +65,6 @@ class FilterRule extends Rule 'label' => 'parsePlain,label ",",63' ); - /** - * output parsing - * @param string $value field value - * @return string - */ - private function parseIsComment($value) - { - return !empty($value) ? "#" : ""; - } - /** * parse plain data * @param string $value field value diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php index 30d71319a..26515f45c 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php @@ -50,6 +50,16 @@ abstract class Rule $this->rule = $conf; } + /** + * output parsing + * @param string $value field value + * @return string + */ + protected function parseIsComment($value) + { + return !empty($value) ? "#" : ""; + } + /** * convert source/destination address entries as used by the gui * @param array $rule rule