* [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI
@ 2019-09-03 20:45 sfeddersen
2019-09-03 20:45 ` [PATCH 2/5] BUG12156: added wio rrd files to backup sfeddersen
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: sfeddersen @ 2019-09-03 20:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2234 bytes --]
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/5] BUG12156: added wio rrd files to backup
2019-09-03 20:45 [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI sfeddersen
@ 2019-09-03 20:45 ` sfeddersen
2019-09-03 20:45 ` [PATCH 3/5] BUG12156: increased paket number sfeddersen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sfeddersen @ 2019-09-03 20:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
---
src/wio/config/backup/includes/wio | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/wio/config/backup/includes/wio b/src/wio/config/backup/includes/wio
index 688b819d9..3c1853646 100644
--- a/src/wio/config/backup/includes/wio
+++ b/src/wio/config/backup/includes/wio
@@ -1,2 +1,3 @@
/var/ipfire/wio/wio.conf
/var/log/wio
+/var/log/rrd/wio/
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/5] BUG12156: increased paket number
2019-09-03 20:45 [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI sfeddersen
2019-09-03 20:45 ` [PATCH 2/5] BUG12156: added wio rrd files to backup sfeddersen
@ 2019-09-03 20:45 ` sfeddersen
2019-09-03 20:45 ` [PATCH 4/5] BUG12156: GUI cosmetic to show woi logs cleaner sfeddersen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sfeddersen @ 2019-09-03 20:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
---
lfs/wio | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lfs/wio b/lfs/wio
index 92186efad..3d788efda 100644
--- a/lfs/wio
+++ b/lfs/wio
@@ -15,7 +15,7 @@ THISAPP = wio-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = wio
-PAK_VER = 4
+PAK_VER = 5
###############################################################################
# Top-level Rules
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4/5] BUG12156: GUI cosmetic to show woi logs cleaner
2019-09-03 20:45 [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI 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 ` sfeddersen
2019-09-03 20:45 ` [PATCH 5/5] BUG12156: fixed wrong permissions in install script sfeddersen
2019-09-05 9:29 ` [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI Michael Tremer
4 siblings, 0 replies; 6+ messages in thread
From: sfeddersen @ 2019-09-03 20:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
---
html/cgi-bin/logs.cgi/log.dat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 136fed77c..23189eb30 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -50,7 +50,7 @@ $cgiparams{'SECTION'} = 'ipfire';
my %sections = (
'auth' => '(\w+\(pam_unix\)\[.*\]: )',
- 'wio' => '(wio|wio\[.*\])',
+ 'wio' => '(wio:|wio\[.*\])',
'captive' => '(Captive:)',
'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )',
'collectd' => '(collectd\[.*\]: )',
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 5/5] BUG12156: fixed wrong permissions in install script
2019-09-03 20:45 [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI sfeddersen
` (2 preceding siblings ...)
2019-09-03 20:45 ` [PATCH 4/5] BUG12156: GUI cosmetic to show woi logs cleaner sfeddersen
@ 2019-09-03 20:45 ` sfeddersen
2019-09-05 9:29 ` [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI Michael Tremer
4 siblings, 0 replies; 6+ messages in thread
From: sfeddersen @ 2019-09-03 20:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
---
src/paks/wio/install.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/paks/wio/install.sh b/src/paks/wio/install.sh
index 5c7705bf1..220378141 100644
--- a/src/paks/wio/install.sh
+++ b/src/paks/wio/install.sh
@@ -26,7 +26,6 @@ extract_files
restore_backup ${NAME}
chown -R nobody.nobody /var/ipfire/wio
-chown -R nobody.nobody /var/log/rrd/wio
chown -R nobody.nobody /var/log/wio
chown root.nobody /usr/local/bin/wioscan
chown root.nobody /usr/local/bin/wiohelper
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI
2019-09-03 20:45 [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI sfeddersen
` (3 preceding siblings ...)
2019-09-03 20:45 ` [PATCH 5/5] BUG12156: fixed wrong permissions in install script sfeddersen
@ 2019-09-05 9:29 ` Michael Tremer
4 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2019-09-05 9:29 UTC (permalink / raw)
To: development
[-- 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-09-05 9:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-03 20:45 [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI 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 ` [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox