From 11a0c7636caaa131144758383a29f14e582916e0 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Thu, 23 Feb 2017 21:30:18 +0545
Subject: Fix #7306 Correctly filter log widget entries by interface
 description (cherry picked from commit
 27bc5848cfea95f97f70a4fe0c30da6319794a9a)

---
 src/usr/local/www/widgets/widgets/log.widget.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php
index f1ce397..fa54e9a 100644
--- a/src/usr/local/www/widgets/widgets/log.widget.php
+++ b/src/usr/local/www/widgets/widgets/log.widget.php
@@ -103,6 +103,8 @@ if ($_POST) {
 	exit(0);
 }
 
+$iface_descr_arr = get_configured_interface_with_descr();
+
 $nentries = isset($user_settings['widgets']['filterlogentries']) ? $user_settings['widgets']['filterlogentries'] : 5;
 
 //set variables for log
@@ -111,7 +113,7 @@ $nentriesinterfaces = isset($user_settings['widgets']['filterlogentriesinterface
 
 $filterfieldsarray = array(
 	"act" => $nentriesacts,
-	"interface" => $nentriesinterfaces
+	"interface" => isset($iface_descr_arr[$nentriesinterfaces]) ? $iface_descr_arr[$nentriesinterfaces] : $nentriesinterfaces
 );
 
 $nentriesinterval = isset($user_settings['widgets']['filterlogentriesinterval']) ? $user_settings['widgets']['filterlogentriesinterval'] : 60;
@@ -272,7 +274,7 @@ $pconfig['nentriesinterval'] = isset($user_settings['widgets']['filterlogentries
 			</label>
 			<div class="col-sm-6 checkbox">
 				<select name="filterlogentriesinterfaces" id="filterlogentriesinterfaces" class="form-control">
-			<?php foreach (array("All" => "ALL") + get_configured_interface_with_descr() as $iface => $ifacename):?>
+			<?php foreach (array("All" => "ALL") + $iface_descr_arr as $iface => $ifacename):?>
 				<option value="<?=$iface?>"
 						<?=($nentriesinterfaces==$iface?'selected':'')?>><?=htmlspecialchars($ifacename)?></option>
 			<?php endforeach;?>
-- 
cgit v1.1