From 5e6a2d77b805723b1d5663bfdfc2553860c6b439 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Jul 2013 04:16:52 +0200 Subject: [PATCH] Forward Firewall: some language changes de.pl and en.pl as well as forwardfw.cgi and fwhost.cgi --- html/cgi-bin/forwardfw.cgi | 14 ++++++++++---- html/cgi-bin/fwhosts.cgi | 3 ++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi index 8458d4d507..14ba24ea81 100755 --- a/html/cgi-bin/forwardfw.cgi +++ b/html/cgi-bin/forwardfw.cgi @@ -1391,6 +1391,10 @@ sub newrule if($fwdfwsettings{'config'} eq ''){$fwdfwsettings{'config'}=$configfwdfw;} my $config=$fwdfwsettings{'config'}; my %hash=(); + #Get Red IP-ADDRESS + open (CONN1,"/var/ipfire/red/local-ipaddress"); + my $redip = ; + close(CONN1); $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED'; $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED'; $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED'; @@ -1410,7 +1414,7 @@ sub newrule $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; + $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; #check if update and get values if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){ &General::readhasharray("$config", \%hash); @@ -1519,14 +1523,14 @@ sub newrule #------SOURCE------------------------------------------------------- print< - $Lang::tr{'fwdfw sourceip'}Firewall + $Lang::tr{'fwdfw sourceip'}Firewall END print" END foreach ("ACCEPT","DROP","REJECT") @@ -2209,6 +2213,8 @@ END }else{ print $$hash{$key}[4]; } + }elsif ($$hash{$key}[4] eq 'RED1'){ + print "$Lang::tr{'fwdfw red'}"; }else{ print $$hash{$key}[4]; } diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 9afc7c8796..9ae490fd56 100755 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1064,8 +1064,9 @@ sub showmenu print "
    $Lang::tr{'fwhost reread'}

"; } &Header::openbox('100%', 'left',$Lang::tr{'fwhost menu'}); + print "$Lang::tr{'fwhost welcome'}"; print<
+

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 013ab39cba..ae770f1b27 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1048,6 +1048,7 @@ 'fwhost stdnet' => 'Standard Netzwerke:', 'fwhost type' => 'Typ', 'fwhost used' => 'Benutzt', +'fwhost welcome' => 'Hier können einzelne Netzwerke, Hosts oder Dienste definiert werden. Diese lassen sich zu Gruppen zusammenfassen und in der Firewall verwenden. Durch die Gruppen kann man Einzelne Firewallregeln auf mehrere Netzwerke und Hosts anwenden und so die Regeln übersichtlich halten.', 'fwhost wo subnet' => '(Ohne Subnetz)', 'free' => 'Frei', 'free memory' => 'Freier Speicher ', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 31719eb5e0..c56592e4fc 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1074,6 +1074,7 @@ 'fwhost stdnet' => 'Standard networks:', 'fwhost type' => 'Type', 'fwhost used' => 'Used', +'fwhost welcome' => 'Here you can define single Networks, Hosts or Services which can be grouped together. These Networks, Hosts and Groups can then be used in the firewall. You are able to use only a few rules for a big amount of Networks, Hosts or Groups.', 'fwhost wo subnet' => '(without subnet)', 'free' => 'Free', 'free memory' => 'Free Memory ', -- 2.39.5