From 803d0a65ff1a6f94e507e9301c199940fb280727 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Tue, 5 Jan 2016 14:36:57 +0100
Subject: [PATCH 1/2] fix for #504

---
 src/www/firewall_rules.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index fa726afda..165dcb9c6 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -438,6 +438,11 @@ $( document ).ready(function() {
                         <i class="fa fa-arrows-h" data-toggle="tooltip" data-placement="left" title="<?=gettext("any");?>"></i>
 <?php
                       endif;?>
+<?php
+                      if(!empty($filterent['quick'])): ?>
+                        <i class="fa fa-flash<?= ($filterent['quick'] == 'yes') ? '' : ' text-muted' ?>" data-toggle="tooltip" data-placement="left" title="<?= ($filterent['quick'] == 'yes') ? gettext('quick') : gettext('not quick') ?>"></i>
+<?php                 endif; ?>
+
 <?php
                       if (isset($filterent['log'])):?>
                       <span class="glyphicon glyphicon-info-sign <?=!empty($filterent['disabled']) ? "text-muted" :""?>"></span>
@@ -599,6 +604,8 @@ $( document ).ready(function() {
                           <td width="100"><?=gettext("log");?></td>
                           <td width="16"><span class="fa fa-long-arrow-right"></span></td>
                           <td width="100"><?=gettext("in");?></td>
+                          <td width="16"><span class="fa fa-flash"></span></td>
+                          <td width="100"><?=gettext("quick");?></td>
                         </tr>
                         <tr>
                           <td><span class="glyphicon glyphicon-play text-muted"></span></td>
@@ -617,6 +624,8 @@ $( document ).ready(function() {
                           <td class="nowrap"><?=gettext("log (disabled)");?></td>
                           <td width="16"><span class="fa fa-long-arrow-left"></span></td>
                           <td width="100"><?=gettext("out");?></td>
+                          <td width="16"></td>
+                          <td width="100"></td>
                         </tr>
                       </table>
                     </td>

From cc183802226c991d63ad543f5ebfefb524e13733 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Thu, 7 Jan 2016 18:45:08 +0100
Subject: [PATCH 2/2] fix 504

---
 src/www/firewall_rules.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index 165dcb9c6..749690f2d 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -439,8 +439,13 @@ $( document ).ready(function() {
 <?php
                       endif;?>
 <?php
-                      if(!empty($filterent['quick'])): ?>
-                        <i class="fa fa-flash<?= ($filterent['quick'] == 'yes') ? '' : ' text-muted' ?>" data-toggle="tooltip" data-placement="left" title="<?= ($filterent['quick'] == 'yes') ? gettext('quick') : gettext('not quick') ?>"></i>
+                      if ($selected_if != 'FloatingRules'):
+                        ; // all other interfaces are always quick
+                      elseif(!empty($filterent['quick'])): ?>
+                        <i class="fa fa-flash <?= ($filterent['quick'] == 'yes') ? 'text-warning' : 'text-muted' ?>" data-toggle="tooltip" data-placement="left" title="<?= ($filterent['quick'] == 'yes') ? gettext('first match') : gettext('last match') ?>"></i>
+<?php
+                      else: ?>
+                        <i class="fa fa-flash text-muted" data-toggle="tooltip" data-placement="left" title="<?= gettext('last match') ?>"></i>
 <?php                 endif; ?>
 
 <?php
@@ -604,8 +609,11 @@ $( document ).ready(function() {
                           <td width="100"><?=gettext("log");?></td>
                           <td width="16"><span class="fa fa-long-arrow-right"></span></td>
                           <td width="100"><?=gettext("in");?></td>
-                          <td width="16"><span class="fa fa-flash"></span></td>
-                          <td width="100"><?=gettext("quick");?></td>
+<?php
+                          if ($selected_if == 'FloatingRules'): ?>
+                          <td width="16"><span class="fa fa-flash text-warning"></span></td>
+                          <td width="100"><?=gettext("first match");?></td>
+<?php                     endif; ?>
                         </tr>
                         <tr>
                           <td><span class="glyphicon glyphicon-play text-muted"></span></td>
@@ -624,8 +632,11 @@ $( document ).ready(function() {
                           <td class="nowrap"><?=gettext("log (disabled)");?></td>
                           <td width="16"><span class="fa fa-long-arrow-left"></span></td>
                           <td width="100"><?=gettext("out");?></td>
-                          <td width="16"></td>
-                          <td width="100"></td>
+<?php
+                          if ($selected_if == 'FloatingRules'): ?>
+                          <td width="16"><span class="fa fa-flash text-muted"></td>
+                          <td width="100"><?=gettext("last match");?></td>
+<?php                     endif; ?>
                         </tr>
                       </table>
                     </td>