X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Foutgoingfw.cgi;h=1632f909207b726f5df7152976425833d9bb0065;hp=0730ba2d3d9145f17de42ff457a700153a39dbbe;hb=c791bb2a5982940068bcfdfe4845d233be283aa3;hpb=29423370faa5b9e7e048cdada0c4ab44ba424c22 diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 0730ba2d3d..1632f90920 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -73,17 +73,61 @@ $outfwsettings{'DISPLAY_SIP'} = ''; $outfwsettings{'POLICY'} = 'MODE0'; $outfwsettings{'MODE1LOG'} = 'off'; +$outfwsettings{'TIME_FROM'} = '00:00'; +$outfwsettings{'TIME_TO'} = '00:00'; + &General::readhash("${General::swroot}/outgoing/settings", \%outfwsettings); &Header::getcgihash(\%outfwsettings); +$selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'"; +$selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'"; + $checked{'MODE1LOG'}{'off'} = ''; $checked{'MODE1LOG'}{'on'} = ''; $checked{'MODE1LOG'}{$outfwsettings{'MODE1LOG'}} = "checked='checked'"; +$checked{'TIME_MON'}{'off'} = ''; +$checked{'TIME_MON'}{'on'} = ''; +$checked{'TIME_MON'}{$outfwsettings{'TIME_MON'}} = "checked='checked'"; +$checked{'TIME_TUE'}{'off'} = ''; +$checked{'TIME_TUE'}{'on'} = ''; +$checked{'TIME_TUE'}{$outfwsettings{'TIME_TUE'}} = "checked='checked'"; +$checked{'TIME_WED'}{'off'} = ''; +$checked{'TIME_WED'}{'on'} = ''; +$checked{'TIME_WED'}{$outfwsettings{'TIME_WED'}} = "checked='checked'"; +$checked{'TIME_THU'}{'off'} = ''; +$checked{'TIME_THU'}{'on'} = ''; +$checked{'TIME_THU'}{$outfwsettings{'TIME_THU'}} = "checked='checked'"; +$checked{'TIME_FRI'}{'off'} = ''; +$checked{'TIME_FRI'}{'on'} = ''; +$checked{'TIME_FRI'}{$outfwsettings{'TIME_FRI'}} = "checked='checked'"; +$checked{'TIME_SAT'}{'off'} = ''; +$checked{'TIME_SAT'}{'on'} = ''; +$checked{'TIME_SAT'}{$outfwsettings{'TIME_SAT'}} = "checked='checked'"; +$checked{'TIME_SUN'}{'off'} = ''; +$checked{'TIME_SUN'}{'on'} = ''; +$checked{'TIME_SUN'}{$outfwsettings{'TIME_SUN'}} = "checked='checked'"; if ($outfwsettings{'POLICY'} eq 'MODE0'){ $selected{'POLICY'}{'MODE0'} = 'selected'; } else { $selected{'POLICY'}{'MODE0'} = ''; } if ($outfwsettings{'POLICY'} eq 'MODE1'){ $selected{'POLICY'}{'MODE1'} = 'selected'; } else { $selected{'POLICY'}{'MODE1'} = ''; } if ($outfwsettings{'POLICY'} eq 'MODE2'){ $selected{'POLICY'}{'MODE2'} = 'selected'; } else { $selected{'POLICY'}{'MODE2'} = ''; } +if ( $outfwsettings{'TIME_MON'} eq "" && + $outfwsettings{'TIME_TUE'} eq "" && + $outfwsettings{'TIME_WED'} eq "" && + $outfwsettings{'TIME_THU'} eq "" && + $outfwsettings{'TIME_FRI'} eq "" && + $outfwsettings{'TIME_SAT'} eq "" && + $outfwsettings{'TIME_SUN'} eq "" ) + { + $outfwsettings{'TIME_MON'} = "on"; + $outfwsettings{'TIME_TUE'} = "on"; + $outfwsettings{'TIME_WED'} = "on"; + $outfwsettings{'TIME_THU'} = "on"; + $outfwsettings{'TIME_FRI'} = "on"; + $outfwsettings{'TIME_SAT'} = "on"; + $outfwsettings{'TIME_SUN'} = "on"; + } + &Header::openpage('Ausgehende Firewall', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -164,7 +208,16 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'}) ($configline[6] eq $outfwsettings{'SMAC'}) && ($configline[7] eq $outfwsettings{'DIP'}) && ($configline[9] eq $outfwsettings{'LOG'}) && - ($configline[8] eq $outfwsettings{'DPORT'})) + ($configline[8] eq $outfwsettings{'DPORT'}) && + ($configline[10] eq $outfwsettings{'TIME_MON'}) && + ($configline[11] eq $outfwsettings{'TIME_TUE'}) && + ($configline[12] eq $outfwsettings{'TIME_WED'}) && + ($configline[13] eq $outfwsettings{'TIME_THU'}) && + ($configline[14] eq $outfwsettings{'TIME_FRI'}) && + ($configline[15] eq $outfwsettings{'TIME_SAT'}) && + ($configline[16] eq $outfwsettings{'TIME_SUN'}) && + ($configline[17] eq $outfwsettings{'TIME_FROM'}) && + ($configline[18] eq $outfwsettings{'TIME_TO'})) { print FILE $configentry; } @@ -197,7 +250,16 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'}) ($configline[6] eq $outfwsettings{'SMAC'}) && ($configline[7] eq $outfwsettings{'DIP'}) && ($configline[9] eq $outfwsettings{'LOG'}) && - ($configline[8] eq $outfwsettings{'DPORT'})) + ($configline[8] eq $outfwsettings{'DPORT'}) && + ($configline[10] eq $outfwsettings{'TIME_MON'}) && + ($configline[11] eq $outfwsettings{'TIME_TUE'}) && + ($configline[12] eq $outfwsettings{'TIME_WED'}) && + ($configline[13] eq $outfwsettings{'TIME_THU'}) && + ($configline[14] eq $outfwsettings{'TIME_FRI'}) && + ($configline[15] eq $outfwsettings{'TIME_SAT'}) && + ($configline[16] eq $outfwsettings{'TIME_SUN'}) && + ($configline[17] eq $outfwsettings{'TIME_FROM'}) && + ($configline[18] eq $outfwsettings{'TIME_TO'})) { print FILE $configentry; } @@ -210,7 +272,7 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'}) if ( $outfwsettings{'VALID'} eq 'yes' ) { open( FILE, ">> $configfile" ) or die "Unable to write $configfile"; print FILE < + + + + + + + + + @@ -315,6 +396,15 @@ END + + + + + + + + + @@ -330,7 +420,36 @@ END END ; } - print <$Lang::tr{'time'} - + +END +; + if ($outfwsettings{'TIME_MON'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy monday'},"; + if ($outfwsettings{'TIME_TUE'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy tuesday'},"; + if ($outfwsettings{'TIME_WED'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy wednesday'},"; + if ($outfwsettings{'TIME_THU'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy thursday'},"; + if ($outfwsettings{'TIME_FRI'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy friday'},"; + if ($outfwsettings{'TIME_SAT'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy saturday'},"; + if ($outfwsettings{'TIME_SUN'} eq 'on') { print "";} + else { print "";} + print "$Lang::tr{'advproxy sunday'}"; + print < + $Lang::tr{'advproxy from'} $outfwsettings{'TIME_FROM'} + $Lang::tr{'advproxy to'} $outfwsettings{'TIME_TO'} END ; @@ -339,7 +458,7 @@ END if ($outfwsettings{'POLICY'} eq 'MODE1'){ print <
- tcp&udp + all all ALL drop @@ -448,17 +567,27 @@ sub addrule { &Header::openbox('100%', 'center', 'Rules hinzufuegen'); if ($outfwsettings{'EDIT'} eq 'no') { $selected{'ENABLED'} = 'checked'; } + $selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'"; + $selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'"; print < "; } print < - + + + + + + + +
$Lang::tr{'description'}: - $Lang::tr{'active'}: - + $Lang::tr{'active'}: +
$Lang::tr{'protocol'}: - - $Lang::tr{'policy'}: + + $Lang::tr{'policy'}: + END ; if ($outfwsettings{'POLICY'} eq 'MODE1'){ @@ -471,6 +600,7 @@ END $Lang::tr{'source ip'}: - + $Lang::tr{'source ip'}: +
$Lang::tr{'logging'}: END ; @@ -494,15 +624,55 @@ else{ print " + +
$Lang::tr{'destination ip'}: - $Lang::tr{'destination port'}: - -
+ $Lang::tr{'destination port'}: + +
$Lang::tr{'time'}:$Lang::tr{'advproxy monday'} $Lang::tr{'advproxy tuesday'} $Lang::tr{'advproxy wednesday'} $Lang::tr{'advproxy thursday'} $Lang::tr{'advproxy friday'} $Lang::tr{'advproxy saturday'} $Lang::tr{'advproxy sunday'} + $Lang::tr{'advproxy from'}$Lang::tr{'advproxy to'}
+ + + + + + +
$Lang::tr{'this field may be blank'} - +
END ; @@ -549,4 +719,4 @@ END print ""; &Header::closebox(); } -} +} \ No newline at end of file