From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH] WIO - Patch PPPOE show right Icon Date: Tue, 16 Feb 2021 22:45:07 +0100 Message-ID: <20210216214507.28137-1-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0806081300878476676==" List-Id: --===============0806081300878476676== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- lfs/wio | 6 +++--- src/wio/wio.cgi | 52 +++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/lfs/wio b/lfs/wio index b4222f1b5..b65d244d6 100644 --- a/lfs/wio +++ b/lfs/wio @@ -1,6 +1,6 @@ ############################################################################= ### -# IPFire.org - An Open Source Firewall Solution = # -# Copyright (C) 2007-2020 IPFire Team = # +# IPFire.org - An Open Source Firewall Solution = # +# Copyright (C) 2007-2021 IPFire Team = # ############################################################################= ### =20 ############################################################################= ### @@ -15,7 +15,7 @@ THISAPP =3D wio-$(VER) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D wio -PAK_VER =3D 11 +PAK_VER =3D 12 =20 ############################################################################= ### # Top-level Rules diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index d07332e5e..ac8fc1220 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -3,7 +3,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2017-2020 Stephan Feddersen = # +# Copyright (C) 2017-2021 Stephan Feddersen = # # All Rights Reserved. = # # = # # This program is free software: you can redistribute it and/or modify = # @@ -21,7 +21,7 @@ # = # ############################################################################= ### # -# Version: 2020/08/04 21:12:23 +# Version: 2021/02/16 21:32:23 # # This wio.cgi is based on the code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -1140,7 +1140,16 @@ print" 01 $redip - =3D'$Lang::tr{'internet'}' +"; + +if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { + print"3D'$Lang::tr{'internet'}'"; +} +else { + print"3D'$Lang::tr{'wio_red_lan'}'"; +} + +print" ".$mainsettings{'= HOSTNAME'}.".".$mainsettings{'DOMAINNAME'}." ".( $redip ne '-' ?= (gethostbyaddr(pack("C4", split (/\./, $redip)), 2))[0] : '-' )." @@ -1154,7 +1163,6 @@ close (FILE); =20 foreach (@ddns) { chomp; - @temp =3D split (/\,/, $_); =20 if ( $temp[7] eq "on" ) { @@ -1336,7 +1344,7 @@ foreach $key (keys %ovpnconfighash) { if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { my ( @output, @tustate ) =3D ''; my $tport =3D $ovpnconfighash{$key}[22]; - my $tnet =3D new Net::Telnet ( Timeout=3D>5, Errmode=3D>'return', Port= =3D>$tport); + my $tnet =3D new Net::Telnet (Timeout=3D>5, Errmode=3D>'return', Port=3D= >$tport); if ($tport ne '') { $tnet->open('127.0.0.1'); @output =3D $tnet->cmd(String =3D> 'state', Prompt =3D> '/(END.*\n|ERRO= R:.*\n)/'); @@ -1589,16 +1597,9 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipadd= resses[$a],'.'); } =20 if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { - my $redipadr =3D qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; - my @rednet =3D split ("/", $redipadr); - chomp ($rednet[1]); - my $red_netmask =3D General::iporsubtodec($rednet[1]); - my $red_netaddress =3D Network::get_netaddress("$rednet[0]/$red_netmask"); + print"3D'$Lang::tr{'internet'}'"; + last SWITCH; =20 - if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask= ) ) { - print"3D'$Lang::tr{'internet'}'"; - last SWITCH; - } } else { print"3D'$Lang::tr{'wio_unknown_lan'}'"; @@ -1606,17 +1607,20 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipad= dresses[$a],'.'); } } =20 -if ( $webinterface[$a] eq 'HTTP' ) { - print"$names[$a]"; -} -elsif ( $webinterface[$a] eq 'HTTPS' ) { - print"$names[$a]"; -} -else { - print"$names[$a]"; -} +print""; + + if ( $webinterface[$a] eq 'HTTP' ) { + print"$names[$a]"; + } + elsif ( $webinterface[$a] eq 'HTTPS' ) { + print"$names[$a]"; + } + else { + print $names[$a]; + } =20 print" + @@ -2054,6 +2058,8 @@ if ( $wiosettings{'LOGGING'} eq 'on' ) { print" + +
 
wio= -1.3.2-12
"; } --=20 2.25.1 --===============0806081300878476676==--