firewall: preg_replace() nibbles away our non-catpure group; closes #…

…7060
opnsense · Dec 7, 2023 · 52f3939 · 52f3939
1 parent 39c1b35
commit 52f3939
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
@@ -313,7 +313,7 @@ private function uiConvertNet($network)
     public function getUIFromAddress()
     {
         if (!empty($this->rule['from'])) {
-            return preg_replace('/,(?:[^\s])/', ', ', $this->rule['from']);
+            return preg_replace('/,(?=[^\s])/', ', ', $this->rule['from']);
         } elseif (isset($this->rule['source']['address'])) {
             return $this->rule['source']['address'];
         } elseif (isset($this->rule['source']['any'])) {
@@ -339,7 +339,7 @@ public function getUIFromPort()
     public function getUIToAddress()
     {
         if (!empty($this->rule['to'])) {
-            return preg_replace('/,(?:[^\s])/', ', ', $this->rule['to']);
+            return preg_replace('/,(?=[^\s])/', ', ', $this->rule['to']);
         } elseif (isset($this->rule['destination']['address'])) {
             return $this->rule['destination']['address'];
         } elseif (isset($this->rule['destination']['any'])) {