From eacf920fa8a332fcf9f5bd26b156a4e059e76654 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 13 Feb 2017 07:50:41 +0100
Subject: [PATCH] firewall: feedback from @djGrrr

---
 src/etc/inc/interfaces.inc      | 6 +-----
 src/www/firewall_rules_edit.php | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 89a5bd9c2..c8bf0dfb4 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -135,14 +135,10 @@ function interfaces_loopback_configure($verbose = false)
     }
 }
 
-function interfaces_vlan_priorities($want_none = false)
+function interfaces_vlan_priorities()
 {
     $priorities = array();
 
-    if ($want_none) {
-        $priorities[''] = gettext('None');
-    }
-
     $priorities['1'] = gettext('Background (1, lowest)');
     $priorities['0'] = gettext('Best Effort (0, default)');
     $priorities['2'] = gettext('Excellent Effort (2)');
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index c5bf6959e..b72664651 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -536,7 +536,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
 legacy_html_escape_form_data($pconfig);
 
-$priorities = interfaces_vlan_priorities(true);
+$priorities = interfaces_vlan_priorities();
 
 include("head.inc");
 
@@ -1282,6 +1282,7 @@ include("head.inc");
                               <tr>
                                   <td>
                                     <select name="set-prio">
+                                        <option value=""<?=(!isset($pconfig['set-prio']) || $pconfig['set-prio'] === '' ? ' selected="selected"' : '');?>><?=htmlspecialchars(gettext('Keep current priority'));?></option>
 <? foreach ($priorities as $prio => $priority): ?>
                                         <option value="<?=$prio;?>"<?=(isset($pconfig['set-prio']) && $pconfig['set-prio'] !== '' && $pconfig['set-prio'] == $prio ? ' selected="selected"' : '');?>><?=htmlspecialchars($priority);?></option>
 <? endforeach ?>
@@ -1289,6 +1290,7 @@ include("head.inc");
                                   </td>
                                   <td>
                                     <select name="set-prio-low">
+                                        <option value=""<?=(!isset($pconfig['set-prio-low']) || $pconfig['set-prio-low'] === '' ? ' selected="selected"' : '');?>><?=htmlspecialchars(gettext('Use main priority'));?></option>
 <? foreach ($priorities as $prio => $priority): ?>
                                         <option value="<?=$prio;?>"<?=(isset($pconfig['set-prio-low']) && $pconfig['set-prio-low'] !== '' && $pconfig['set-prio-low'] == $prio ? ' selected="selected"' : '');?>><?=htmlspecialchars($priority);?></option>
 <? endforeach ?>
@@ -1305,6 +1307,7 @@ include("head.inc");
                       <td><a id="help_for_prio" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a>  <?=gettext('Match priority'); ?></td>
                       <td>
                         <select name="prio">
+                            <option value=""<?=(!isset($pconfig['prio']) || $pconfig['prio'] === '' ? ' selected="selected"' : '');?>><?=htmlspecialchars(gettext('Any priority'));?></option>
 <? foreach ($priorities as $prio => $priority): ?>
                             <option value="<?=$prio;?>"<?=(isset($pconfig['prio']) && $pconfig['prio'] !== '' && $pconfig['prio'] == $prio ? ' selected="selected"' : '');?>><?=htmlspecialchars($priority);?></option>
 <? endforeach ?>