From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH] WIO: Fix a problem with the Network-Table-Button Date: Tue, 27 Feb 2018 17:20:07 +0100 Message-ID: <1519748407-1622-1-git-send-email-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0233047168524357417==" List-Id: --===============0233047168524357417== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- src/wio/wio.cgi | 69 ++++++++++++++++++++++++++++---------------------------= -- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index 8c43b04..c51910f 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -21,7 +21,7 @@ # = # ############################################################################= ### # -# Version: 2018/01/05 14:34:23 +# Version: 2018/02/27 16:54:23 # # This wio.cgi is based on the Code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. @@ -106,10 +106,10 @@ my $count =3D 0; my $showcount =3D 0; =20 my $arpbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; -my $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; -my $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; +my $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; +my $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; =20 -my ( $infomessage, $errormessage, $importmessage, $message ) =3D ''; +my ( $message, $infomessage, $errormessage, $importmessage ) =3D ''; =20 my ( $buttontext, $host, $timestamp, $ipadr, $on, $remark, $dyndns, $dyndnsi= p, $sendemailon, $net, $dev, $iprange, $output, $write, $webinterface, $sendemailoff, $pingmethode, $online, $color, $bgcolor, $exitcode, $id, $l= ine, $interface, $counter, $vpnn2nip, $vpnn2nmask, $ddns, $edc, @@ -280,7 +280,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_client_add'= } ) { =20 ## show / hide arptable =20 -if ($wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable') { +if ( $wiosettings{'WIOGUISHOWARPTABLE'} eq 'arptable' ) { if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { $wiosettings{'WIOGUISHOWARPTABLE'} =3D 'off'; $arpbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; @@ -309,11 +309,11 @@ if ( $wiosettings{'WIOGUISHOWCLIENTIMPORTTABLE'} eq 'cl= ientimport' ) { if ( $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} eq 'networksearch' ) { if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_show_table_off'} ) { $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'off'; - $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; + $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_on'}"; } else { $wiosettings{'WIOGUISHOWNETWORKSEARCHTABLE'} =3D 'on'; - $clientimportbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; + $networksearchbuttontext =3D "$Lang::tr{'wio_show_table_off'}"; } } =20 @@ -348,7 +348,7 @@ if ( $wiosettings{'ACTION'} eq $Lang::tr{'wio_add'} ) { } } =20 -## enable / disabel client || enable / disable dyndns || enable / disable se= ndemailon || enable / disable sendemailoff || change ip / fqdn +## enable / disable client || enable / disable dyndns || enable / disable se= ndemailon || enable / disable sendemailoff || change ip / fqdn =20 if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable client'} ) { $edc = =3D 'on'; } if ( $wiosettings{'ACTION'} eq $Lang::tr{'enable disable dyndns'} ) { $edd = =3D 'on'; } @@ -983,7 +983,7 @@ for ($i=3D1; $i<=3D15; $i++) { print "\n"; } =20 -print"=09 +print"  $Lang::tr{'wio sec'}   @@ -1123,7 +1123,7 @@ print" $Lang::tr{'wio_wanname'} $Lang::tr{'wio_dyndns_hosts'} $Lang::tr{'wio image'} - $Lang::tr{'wio_wancheck'} + $Lang::tr{'wio_connected'} 01 @@ -1196,7 +1196,7 @@ print" $Lang::tr{'type'} $Lang::tr{'wio_common_name'} $Lang::tr{'wio image'} - $Lang::tr{'wio_ovpn_connected'} + $Lang::tr{'wio_connected'} "; =20 @@ -1244,7 +1244,7 @@ $statustxt =3D "$Lang::tr{'capsclosed'}";   "; -=20 + if ($vpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { print" $vpnconfighash{$key}[25]"; } @@ -1278,7 +1278,7 @@ print" $Lang::tr{'type'} $Lang::tr{'common name'} $Lang::tr{'wio image'} - $Lang::tr{'wio_ovpn_connected'} + $Lang::tr{'wio_connected'} "; =20 @@ -1310,7 +1310,6 @@ print" $statustxt =3D "$Lang::tr{'capsclosed'}"; } else { - =09 if ($ovpnconfighash{$key}[3] eq 'net') { if (-e "/var/run/$ovpnconfighash{$key}[1]n2n.pid") { my @output =3D ""; @@ -1378,7 +1377,7 @@ print" if ($ovpnconfighash{$key}[25] && $wiosettings{'CLIENTREMARK'} eq 'on') { print" $ovpnconfighash{$key}[25]"; } - =09 + print""; $idovpn++ } @@ -1519,7 +1518,7 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipaddr= esses[$a],'.'); if ( -e "$vpnpid" ) { foreach $key (keys(%vpnconfighash)) { next unless ($vpnconfighash{$key}[3] eq 'net'); - =09 + my $convertip =3D &General::ipcidr2msk($vpnconfighash{$key}[11]); =20 my @net =3D split ("/", $convertip); @@ -1538,16 +1537,15 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipad= dresses[$a],'.'); @match =3D split ("/", $ovpnsettings{'DOVPN_SUBNET'}); =20 if ( &General::IpInSubnet($ipaddresses[$a], $match[0], $match[1]) ) { - print"3D'OpenV=";=20 - last SWITCH;=20 + print"3D'OpenV="; + last SWITCH; } } =20 if ( %ovpnccdconfhash ne '' ) { foreach $key (keys(%ovpnccdconfhash)) { - =09 + my $convertip =3D &General::ipcidr2msk($ovpnccdconfhash{$key}[1]); - =09 my @net =3D split ("/", $convertip); =20 $vpnn2nip =3D $net[0]; @@ -1557,7 +1555,6 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipaddr= esses[$a],'.'); print"3D'OpenVPN'"; last SWITCH; } - =09 } } =20 @@ -1567,7 +1564,7 @@ my $dotip =3D length($ipaddresses[$a]) - rindex($ipaddr= esses[$a],'.'); chomp ($rednet[1]); my $red_netmask =3D General::iporsubtodec($rednet[1]); my $red_netaddress =3D Network::get_netaddress("$rednet[0]/$red_netmask"); - =09 + if ( &General::IpInSubnet($ipaddresses[$a], $red_netaddress, $red_netmask= ) ) { print"3D'$Lang::tr{'wio_red_lan'}'"; last SWITCH; @@ -2165,23 +2162,24 @@ close(FILE); =20 ############################################################################= ################################################ =20 -sub SortByTunnelName -{ - if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) { - return -1; - } - elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) { - return 1; - } - else { - return 0; - } +sub SortByTunnelName { + + if ($vpnconfighash{$a}[1] lt $vpnconfighash{$b}[1]) { + return -1; + } + elsif ($vpnconfighash{$a}[1] gt $vpnconfighash{$b}[1]) { + return 1; + } + else { + return 0; + } + } =20 ############################################################################= ################################################ =20 -sub validSave -{ +sub validSave { + if ( $wiosettings{'IPADR'} eq '' && $wiosettings{'PINGMETHODE'} eq 'ip' && = $wiosettings{'DYNDNS'} eq '' ) { $errormessage =3D $Lang::tr{'wio_ip_empty'}; } @@ -2207,4 +2205,5 @@ sub validSave if ( $wiosettings{'ID'} eq '' && ! defined($errormessage) ) { $errormessage= =3D &WIO::checkinto($wiosettings{'IPADR'}, $wiosettings{'HOST'}, @current); } =20 if ( $wiosettings{'REMARK'} ne '' ) { $wiosettings{'REMARK'} =3D~ s/,/,= /g; } + } --=20 2.7.4 --===============0233047168524357417==--