X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Foptionsfw.cgi;h=61441e4706194499c5557d8cb7e60df83ea6a3cc;hp=189395726395d8177831d011170bad6e2b4bd0b6;hb=7326051edb1ebec404e0b81bd85292285d7a5b6b;hpb=0b06ad0567fbbf647ea64a13d50c7ff2212f49be diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 189395726..61441e470 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -27,29 +27,64 @@ my %checked =(); # Checkbox manipulations my $filename = "${General::swroot}/optionsfw/settings"; our %settings=(); +my %fwdfwsettings=(); +my %configfwdfw=(); +my %configoutgoingfw=(); + +my $configfwdfw = "${General::swroot}/forward/config"; +my $configoutgoing = "${General::swroot}/forward/outgoing"; + $settings{'DISABLEPING'} = 'NO'; $settings{'DROPNEWNOTSYN'} = 'on'; $settings{'DROPINPUT'} = 'on'; -$settings{'DROPOUTPUT'} = 'on'; +$settings{'DROPFORWARD'} = 'on'; +$settings{'DROPOUTGOING'} = 'on'; $settings{'DROPPORTSCAN'} = 'on'; $settings{'DROPWIRELESSINPUT'} = 'on'; $settings{'DROPWIRELESSFORWARD'} = 'on'; +$settings{'SHOWCOLORS'} = 'off'; +$settings{'SHOWREMARK'} = 'on'; +$settings{'SHOWTABLES'} = 'on'; +$settings{'SHOWDROPDOWN'} = 'off'; my $errormessage = ''; my $warnmessage = ''; +&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings); &Header::showhttpheaders(); #Get GUI values &Header::getcgihash(\%settings); +&General::readhash("${General::swroot}/optionsfw/settings", \%settings); + if ($settings{'ACTION'} eq $Lang::tr{'save'}) { - $errormessage = $Lang::tr{'new optionsfw later'}; - delete $settings{'__CGI__'};delete $settings{'x'};delete $settings{'y'}; - &General::writehash($filename, \%settings); # Save good settings - } else { - &General::readhash($filename, \%settings); # Get saved settings and reset to good if needed - } + if ($settings{'defpol'} ne '1'){ + $errormessage = $Lang::tr{'new optionsfw later'}; + delete $settings{'__CGI__'}; + delete $settings{'x'}; + delete $settings{'y'}; + &General::writehash($filename, \%settings); # Save good settings + system("/usr/local/bin/forwardfwctrl"); + }else{ + if ($settings{'POLICY'} ne ''){ + $fwdfwsettings{'POLICY'} = $settings{'POLICY'}; + } + if ($settings{'POLICY1'} ne ''){ + $fwdfwsettings{'POLICY1'} = $settings{'POLICY1'}; + } + my $MODE = $fwdfwsettings{'POLICY'}; + my $MODE1 = $fwdfwsettings{'POLICY1'}; + %fwdfwsettings = (); + $fwdfwsettings{'POLICY'} = "$MODE"; + $fwdfwsettings{'POLICY1'} = "$MODE1"; + &General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings); + &General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings); + system("/usr/local/bin/forwardfwctrl"); + } + }else { + &General::readhash($filename, \%settings); # Get saved settings and reset to good if needed +} &Header::openpage($Lang::tr{'options fw'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -66,9 +101,12 @@ $checked{'DROPNEWNOTSYN'}{$settings{'DROPNEWNOTSYN'}} = "checked='checked'"; $checked{'DROPINPUT'}{'off'} = ''; $checked{'DROPINPUT'}{'on'} = ''; $checked{'DROPINPUT'}{$settings{'DROPINPUT'}} = "checked='checked'"; -$checked{'DROPOUTPUT'}{'off'} = ''; -$checked{'DROPOUTPUT'}{'on'} = ''; -$checked{'DROPOUTPUT'}{$settings{'DROPOUTPUT'}} = "checked='checked'"; +$checked{'DROPFORWARD'}{'off'} = ''; +$checked{'DROPFORWARD'}{'on'} = ''; +$checked{'DROPFORWARD'}{$settings{'DROPFORWARD'}} = "checked='checked'"; +$checked{'DROPOUTGOING'}{'off'} = ''; +$checked{'DROPOUTGOING'}{'on'} = ''; +$checked{'DROPOUTGOING'}{$settings{'DROPOUTGOING'}} = "checked='checked'"; $checked{'DROPPORTSCAN'}{'off'} = ''; $checked{'DROPPORTSCAN'}{'on'} = ''; $checked{'DROPPORTSCAN'}{$settings{'DROPPORTSCAN'}} = "checked='checked'"; @@ -84,6 +122,21 @@ $checked{'DROPPROXY'}{$settings{'DROPPROXY'}} = "checked='checked'"; $checked{'DROPSAMBA'}{'off'} = ''; $checked{'DROPSAMBA'}{'on'} = ''; $checked{'DROPSAMBA'}{$settings{'DROPSAMBA'}} = "checked='checked'"; +$checked{'SHOWCOLORS'}{'off'} = ''; +$checked{'SHOWCOLORS'}{'on'} = ''; +$checked{'SHOWCOLORS'}{$settings{'SHOWCOLORS'}} = "checked='checked'"; +$checked{'SHOWREMARK'}{'off'} = ''; +$checked{'SHOWREMARK'}{'on'} = ''; +$checked{'SHOWREMARK'}{$settings{'SHOWREMARK'}} = "checked='checked'"; +$checked{'SHOWTABLES'}{'off'} = ''; +$checked{'SHOWTABLES'}{'on'} = ''; +$checked{'SHOWTABLES'}{$settings{'SHOWTABLES'}} = "checked='checked'"; +$checked{'SHOWDROPDOWN'}{'off'} = ''; +$checked{'SHOWDROPDOWN'}{'on'} = ''; +$checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'"; +$selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected'; +$selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected'; +$selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected'; &Header::openbox('100%', 'center', $Lang::tr{'options fw'}); print "
"; @@ -96,8 +149,10 @@ print < off $Lang::tr{'drop input'}on / off -$Lang::tr{'drop output'}on / - off +$Lang::tr{'drop forward'}on / + off +$Lang::tr{'drop outgoing'}on / + off $Lang::tr{'drop portscan'}on / off $Lang::tr{'drop wirelessinput'}on / @@ -105,7 +160,8 @@ print <$Lang::tr{'drop wirelessforward'}on / off -
+
+
$Lang::tr{'fw blue'}
$Lang::tr{'drop proxy'}on / @@ -113,15 +169,77 @@ print <$Lang::tr{'drop samba'}on / off
+
+ + + + + + +
$Lang::tr{'fw settings'}
$Lang::tr{'fw settings color'}on / + off
$Lang::tr{'fw settings remark'}on / + off
$Lang::tr{'fw settings ruletable'}on / + off
$Lang::tr{'fw settings dropdown'}on / + off
+
+ + + + + +
$Lang::tr{'fw default drop'}
$Lang::tr{'drop action'} +
$Lang::tr{'drop action1'} +
$Lang::tr{'drop action2'} +
+
+ +
- -
END ; &Header::closebox(); + +&Header::openbox('100%', 'center', $Lang::tr{'fwdfw pol title'}); + if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ $selected{'POLICY'}{'MODE1'} = 'selected'; } else { $selected{'POLICY'}{'MODE1'} = ''; } + if ($fwdfwsettings{'POLICY'} eq 'MODE2'){ $selected{'POLICY'}{'MODE2'} = 'selected'; } else { $selected{'POLICY'}{'MODE2'} = ''; } + if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){ $selected{'POLICY1'}{'MODE1'} = 'selected'; } else { $selected{'POLICY1'}{'MODE1'} = ''; } + if ($fwdfwsettings{'POLICY1'} eq 'MODE2'){ $selected{'POLICY1'}{'MODE2'} = 'selected'; } else { $selected{'POLICY1'}{'MODE2'} = ''; } +print < + + + + + +END + print "
FORWARD
$Lang::tr{'fwdfw pol text'}
+
"; + print"

"; + print < + + + + + +END + print "
OUTGOING
$Lang::tr{'fwdfw pol text1'}
+
"; + &Header::closebox(); + &Header::closebigbox(); &Header::closepage();