(filter) work in progress filter refactoring

src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php

@@ -107,16 +107,21 @@ class FilterRule
         $interfaces = empty($this->rule['interface']) ? array(null) : explode(',', $this->rule['interface']);
         foreach ($interfaces as $interface) {
             if (isset($this->rule['ipprotocol']) && $this->rule['ipprotocol'] == 'inet46') {
-                foreach (array('inet', 'inet6') as $ipproto) {
+                $ipprotos = array('inet', 'inet6');
+            } elseif (isset($this->rule['ipprotocol'])) {
+                $ipprotos = array($this->rule['ipprotocol']);
+            } else {
+                $ipprotos = array(null);
+            }
+            foreach ($ipprotos as $ipproto) {
                 $tmp = $this->rule;
                 $tmp['interface'] = $interface;
                 $tmp['ipprotocol'] = $ipproto;
-                    $result[] = $tmp;
+                if (empty($this->interfaceMapping[$interface]['if'])) {
+                    // disable rule when interface not found
+                    $tmp['disabled'] = true;
                 }
-            } else {
-                $tmp = $this->rule;
-                $tmp['interface'] = $interface;
-                $result[] = $this->rule;
+                $result[] = $tmp;
             }
         }
         return $result;