From c509f9023718bf22be95ecf4d85312ba8dea0793 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 3 Jan 2018 07:39:15 +0100
Subject: [PATCH] net/igmp-proxy: merge version 1.3 from master

---
 net/igmp-proxy/Makefile                                         | 2 +-
 net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc          | 2 +-
 .../opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml    | 2 +-
 net/igmp-proxy/src/www/services_igmpproxy.php                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/igmp-proxy/Makefile b/net/igmp-proxy/Makefile
index c0b6b8313..074d305fa 100644
--- a/net/igmp-proxy/Makefile
+++ b/net/igmp-proxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		igmp-proxy
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 PLUGIN_DEPENDS=		igmpproxy
 PLUGIN_COMMENT=		IGMP-Proxy Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc b/net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc
index 64e57626c..9b61a0a87 100644
--- a/net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc
+++ b/net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc
@@ -100,7 +100,7 @@ EOD;
 
         if ($igmpcf['address'] <> "") {
             $item = explode(" ", $igmpcf['address']);
-            foreach($item as $iww) {
+            foreach ($item as $iww) {
                 $igmpconf .= "altnet {$iww}\n";
             }
         }
diff --git a/net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml b/net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
index 03dde8678..8d14d025d 100644
--- a/net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
+++ b/net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
@@ -1,7 +1,7 @@
 <menu>
     <Services>
         <IGMPProxy VisibleName="IGMP Proxy" url="/services_igmpproxy.php" cssClass="fa fa-map-signs fa-fw">
-            <Edit url="/services_igmpproxy_edit.php" visibility="hidden"/>
+            <Edit url="/services_igmpproxy_edit.php*" visibility="hidden"/>
         </IGMPProxy>
     </Services>
 </menu>
diff --git a/net/igmp-proxy/src/www/services_igmpproxy.php b/net/igmp-proxy/src/www/services_igmpproxy.php
index 9361af38a..45407518b 100644
--- a/net/igmp-proxy/src/www/services_igmpproxy.php
+++ b/net/igmp-proxy/src/www/services_igmpproxy.php
@@ -123,7 +123,7 @@ $main_buttons = array(
                       <td><?=$igmpentry['descr'];?></td>
                       <td>
                          <a href="services_igmpproxy_edit.php?id=<?=$i;?>" title="<?=gettext("Edit this IGMP entry"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-                         <a href="#" data-id="<?=$i;?>" class="act_delete_entry"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button></a>
+                         <a href="#" data-id="<?=$i;?>" class="act_delete_entry btn btn-xs btn-default"><i class="fa fa-trash text-muted"></i></a>
                       </td>
                     </tr>
 <?php