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 [thread overview]
Message-ID: <E359B0FE-7343-463B-BC0D-3EE14CDB5C65@ipfire.org> (raw)
In-Reply-To: <20190903204548.2045-1-sfeddersen@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2635 bytes --]
Hi Stephan,
Thanks for submitting these patches.
However, your From: header in the email is showing “sfeddersen” 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:
>
> ---
> src/wio/wio.cgi | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> 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 = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.');
> $ic = "${_}";
>
> foreach $interface (@devs_net) {
> - next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE'));
> + next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYPE"} eq 'PPPOE');
> if ( $netsettings{"$ic"."_DEV"} eq $interface ) {
> if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETADDRESS"}, $netsettings{"$ic"."_NETMASK"}) ) {
> print"<td align='center' height='20'><img src='$imgstatic/$devs_img[$in]' alt='$Lang::tr{$devs_alt[$in]}' title='$Lang::tr{$devs_alt[$in]}' /></td>";
> @@ -1558,7 +1558,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.');
> }
> }
>
> - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') {
> + if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) {
> my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"';
> my @rednet = split ("/", $redipadr);
> chomp ($rednet[1]);
> @@ -1569,10 +1569,10 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.');
> print"<td align='center' height='20'><img src='$imgstatic/red.png' alt='$Lang::tr{'wio_red_lan'}' title='$Lang::tr{'wio_red_lan'}' /></td>";
> last SWITCH;
> }
> - else {
> + }
> + else {
> print"<td align='center'><img align='middle' src='$imgstatic/white.png' alt='$Lang::tr{'wio_unknown_lan'}' title='$Lang::tr{'wio_unknown_lan'}' /></td>";
> last SWITCH;
> - }
> }
> }
>
> @@ -1872,7 +1872,7 @@ SWITCH: {
> }
> }
>
> - 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 = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"';
> my @rednet = split ("/", $redipadr);
> chomp ($rednet[1]);
> --
> 2.17.1
>
prev parent reply other threads:[~2019-09-05 9:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 20:45 sfeddersen
2019-09-03 20:45 ` [PATCH 2/5] BUG12156: added wio rrd files to backup sfeddersen
2019-09-03 20:45 ` [PATCH 3/5] BUG12156: increased paket number sfeddersen
2019-09-03 20:45 ` [PATCH 4/5] BUG12156: GUI cosmetic to show woi logs cleaner sfeddersen
2019-09-03 20:45 ` [PATCH 5/5] BUG12156: fixed wrong permissions in install script sfeddersen
2019-09-05 9:29 ` Michael Tremer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E359B0FE-7343-463B-BC0D-3EE14CDB5C65@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox