From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI
Date: Thu, 05 Sep 2019 10:29:47 +0100
Message-ID: <E359B0FE-7343-463B-BC0D-3EE14CDB5C65@ipfire.org>
In-Reply-To: <20190903204548.2045-1-sfeddersen@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5999166341139305606=="
List-Id: <development.lists.ipfire.org>

--===============5999166341139305606==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Stephan,

Thanks for submitting these patches.

However, your From: header in the email is showing =E2=80=9Csfeddersen=E2=80=
=9D only when it should be your full name. Could you please fix this?

  https://wiki.ipfire.org/devel/git/setup

-Michael

> On 3 Sep 2019, at 21:45, sfeddersen <sfeddersen(a)ipfire.org> wrote:
>=20
> ---
> src/wio/wio.cgi | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>=20
> diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi
> index c51910f4d..1645aa54e 100644
> --- a/src/wio/wio.cgi
> +++ b/src/wio/wio.cgi
> @@ -1504,7 +1504,7 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipad=
dresses[$a],'.');
> 			$ic =3D "${_}";
>=20
> 			foreach $interface (@devs_net) {
> -			next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TY=
PE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE'));
> +			next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYP=
E"} eq 'PPPOE');
> 				if ( $netsettings{"$ic"."_DEV"} eq $interface ) {
> 					if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETAD=
DRESS"}, $netsettings{"$ic"."_NETMASK"}) ) {
> 						print"<td align=3D'center' height=3D'20'><img src=3D'$imgstatic/$devs=
_img[$in]' alt=3D'$Lang::tr{$devs_alt[$in]}' title=3D'$Lang::tr{$devs_alt[$in=
]}' /></td>";
> @@ -1558,7 +1558,7 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipad=
dresses[$a],'.');
> 			}
> 		}
>=20
> -		if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'P=
PPOE') {
> +		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]);
> @@ -1569,10 +1569,10 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ip=
addresses[$a],'.');
> 				print"<td align=3D'center' height=3D'20'><img src=3D'$imgstatic/red.png=
' alt=3D'$Lang::tr{'wio_red_lan'}' title=3D'$Lang::tr{'wio_red_lan'}' /></td>=
";
> 				last SWITCH;
> 			}
> -			else {
> +		}
> +		else {
> 				print"<td align=3D'center'><img align=3D'middle' src=3D'$imgstatic/whit=
e.png' alt=3D'$Lang::tr{'wio_unknown_lan'}' title=3D'$Lang::tr{'wio_unknown_l=
an'}' /></td>";
> 				last SWITCH;
> -			}
> 		}
> 	}
>=20
> @@ -1872,7 +1872,7 @@ SWITCH: {
> 		}
> 	}
>=20
> -			if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq '=
PPPOE') {
> +			if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq '=
PPPOE' || $netsettings{"RED_TYPE"} eq 'STATIC') {
> 			my $redipadr =3D qx'ip addr | grep red0 | grep inet | awk "{print \$2}"';
> 			my @rednet =3D split ("/", $redipadr);
> 			chomp ($rednet[1]);
> --=20
> 2.17.1
>=20


--===============5999166341139305606==--