(firewall) zapp "match"

src/etc/inc/filter.inc

@@ -2147,7 +2147,7 @@ function filter_generate_user_rule(&$FilterIflist, $rule)
     } else {
         $type = null;
     }
-    if ($type != "pass" && $type != "block" && $type != "reject" && $type != "match") {
+    if ($type != "pass" && $type != "block" && $type != "reject") {
         /* default (for older rules) is pass */
         $type = "pass";
     }
@@ -2175,7 +2175,7 @@ function filter_generate_user_rule(&$FilterIflist, $rule)
     update_filter_reload_status(sprintf(gettext("Setting up pass/block rules %s"), $rule['descr']));
 
     /* do not process reply-to for gateway'd rules */
-    if ( empty($rule['gateway']) && !empty($aline['direction']) && (interface_has_gateway($rule['interface']) || interface_has_gatewayv6($rule['interface'])) && !isset($config['system']['disablereplyto']) && !isset($rule['disablereplyto']) && $type != "match") {
+    if ( empty($rule['gateway']) && !empty($aline['direction']) && (interface_has_gateway($rule['interface']) || interface_has_gatewayv6($rule['interface'])) && !isset($config['system']['disablereplyto']) && !isset($rule['disablereplyto'])) {
         if (isset($rule['ipprotocol']) && $rule['ipprotocol'] == "inet6") {
             $rg = get_interface_gateway_v6($rule['interface']);
             if (is_ipaddrv6($rg)) {

src/www/firewall_rules.php

@@ -710,9 +710,6 @@ $( document ).ready(function() {
                           <td width="16"><span class="glyphicon glyphicon-play text-success"></span></td>
                           <td width="100"><?=gettext("pass");?></td>
                           <td width="14"></td>
-                          <td width="16"><span class="glyphicon glyphicon-ok text-info"></span></td>
-                          <td width="100"><?=gettext("match");?></td>
-                          <td width="14"></td>
                           <td width="16"><span class="glyphicon glyphicon-remove text-danger"></span></td>
                           <td width="100"><?=gettext("block");?></td>
                           <td width="14"></td>
@@ -732,9 +729,6 @@ $( document ).ready(function() {
                           <td><span class="glyphicon glyphicon-play text-muted"></span></td>
                           <td class="nowrap"><?=gettext("pass (disabled)");?></td>
                           <td>&nbsp;</td>
-                          <td><span class="glyphicon glyphicon-ok text-muted"></span></td>
-                          <td class="nowrap"><?=gettext("match (disabled)");?></td>
-                          <td>&nbsp;</td>
                           <td><span class="glyphicon glyphicon-remove text-muted"></span></td>
                           <td class="nowrap"><?=gettext("block (disabled)");?></td>
                           <td>&nbsp;</td>

src/www/firewall_rules_edit.php

@@ -700,9 +700,6 @@ include("head.inc");
                       <select name="type" class="selectpicker" data-live-search="true" data-size="5" >
 <?php
                         $type_options = array('Pass' => gettext('Pass'), 'Block' => gettext('Block'), 'Reject' => gettext('Reject'));
-                        if (!empty($pconfig['floating'])) {
-                            $type_options['Match'] = gettext('Match');
-                        }
                         foreach ($type_options as $type => $type_translated): ?>
                         <option value="<?=strtolower($type);?>" <?= strtolower($type) == strtolower($pconfig['type']) ? "selected=\"selected\"" :""; ?>>
                           <?=$type_translated;?>