]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/outgoingfw.cgi
Fix outgoing_fw monday checkbox.
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / outgoingfw.cgi
index f24ce1aa07b2117fcd0013134e3fff3d08e6bc31..3b740ab633b6f29d05c4e71f39115a294213d768 100644 (file)
@@ -1,16 +1,28 @@
 #!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The IPFire Team
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 use strict;
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -30,7 +42,12 @@ my @p2pline = ();
 
 my $configfile = "/var/ipfire/outgoing/rules";
 my $p2pfile = "/var/ipfire/outgoing/p2protocols";
-my $servicefile = "/var/ipfire/outgoing/defaultservices"
+my $servicefile = "/var/ipfire/outgoing/defaultservices";
+
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
@@ -54,14 +71,80 @@ $outfwsettings{'DISPLAY_DPORT'} = '';
 $outfwsettings{'DISPLAY_SMAC'} = '';
 $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);
 
+###############
+# DEBUG DEBUG
+#&Header::openbox('100%', 'left', 'DEBUG');
+#my $debugCount = 0;
+#foreach my $line (sort keys %outfwsettings) {
+#print "$line = $outfwsettings{$line}<br />\n";
+# $debugCount++;
+#}
+#print "&nbsp;Count: $debugCount\n";
+#&Header::closebox();
+# DEBUG DEBUG
+###############
+
+$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'} = ''; }
 
+# This is a little hack if poeple donĀ“t mark any date then all will be selected, because they might have forgotten to select
+# a valid day. A Rule without any matching day will never work, because the timeranges are new feature people might not notice
+# that they have to select a day for the rule.
+
+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);
 
@@ -73,11 +156,20 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'reset'})
        $outfwsettings{'POLICY'}='MODE0';
        unlink $configfile;
        system("/usr/bin/touch $configfile");
+       my $MODE = $outfwsettings{'POLICY'};
+       %outfwsettings = ();
+       $outfwsettings{'POLICY'} = "$MODE";
        &General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'})
 {
+       my $MODE = $outfwsettings{'POLICY'};
+       my $MODE1LOG = $outfwsettings{'MODE1LOG'};
+       %outfwsettings = ();
+       $outfwsettings{'POLICY'} = "$MODE";
+       $outfwsettings{'MODE1LOG'} = "$MODE1LOG";
        &General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq 'enable')
 {
@@ -95,6 +187,7 @@ if ($outfwsettings{'ACTION'} eq 'enable')
                }
        }
        close FILE;
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq 'disable')
 {
@@ -112,6 +205,7 @@ if ($outfwsettings{'ACTION'} eq 'disable')
                }
        }
        close FILE;
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
 {
@@ -122,6 +216,17 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
        foreach $configentry (sort @configs)
        {
                @configline = split( /\;/, $configentry );
+               
+               $configline[10] =  "on" if not exists $configline[10];
+               $configline[11] =  "on" if not exists $configline[11];
+               $configline[12] =  "on" if not exists $configline[12];
+               $configline[13] =  "on" if not exists $configline[13];
+               $configline[14] =  "on" if not exists $configline[14];
+               $configline[15] =  "on" if not exists $configline[15];
+               $configline[16] =  "on" if not exists $configline[16];
+               $configline[17] =  "00:00" if not exists $configline[17];
+               $configline[18] =  "00:00" if not exists $configline[18];
+
                unless  (($configline[0] eq $outfwsettings{'STATE'}) && 
                        ($configline[1] eq $outfwsettings{'ENABLED'}) && 
                        ($configline[2] eq $outfwsettings{'SNET'}) && 
@@ -129,8 +234,18 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
                        ($configline[4] eq $outfwsettings{'NAME'}) && 
                        ($configline[5] eq $outfwsettings{'SIP'}) && 
                        ($configline[6] eq $outfwsettings{'SMAC'}) && 
-                       ($configline[7] eq $outfwsettings{'DIP'}) && 
-                       ($configline[8] eq $outfwsettings{'DPORT'}))
+                       ($configline[7] eq $outfwsettings{'DIP'}) &&
+                       ($configline[9] eq $outfwsettings{'LOG'}) &&       
+                       ($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;
                }
@@ -138,10 +253,12 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
        close FILE;
        $selected{'SNET'}{"$outfwsettings{'SNET'}"} = 'selected';
        $selected{'PROT'}{"$outfwsettings{'PROT'}"} = 'selected';
+       $selected{'LOG'}{"$outfwsettings{'LOG'}"} = 'selected';
        &addrule();
        &Header::closebigbox();
        &Header::closepage();
-       exit    
+       exit
+  system("/usr/local/bin/outgoingfwctrl");     
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
 {
@@ -152,6 +269,17 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
        foreach $configentry (sort @configs)
        {
                @configline = split( /\;/, $configentry );
+               
+               $configline[10] =  "on" if not exists $configline[10];
+               $configline[11] =  "on" if not exists $configline[11];
+               $configline[12] =  "on" if not exists $configline[12];
+               $configline[13] =  "on" if not exists $configline[13];
+               $configline[14] =  "on" if not exists $configline[14];
+               $configline[15] =  "on" if not exists $configline[15];
+               $configline[16] =  "on" if not exists $configline[16];
+               $configline[17] =  "00:00" if not exists $configline[17];
+               $configline[18] =  "00:00" if not exists $configline[18];
+                               
                unless  (($configline[0] eq $outfwsettings{'STATE'}) && 
                        ($configline[1] eq $outfwsettings{'ENABLED'}) && 
                        ($configline[2] eq $outfwsettings{'SNET'}) && 
@@ -160,22 +288,34 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
                        ($configline[5] eq $outfwsettings{'SIP'}) && 
                        ($configline[6] eq $outfwsettings{'SMAC'}) && 
                        ($configline[7] eq $outfwsettings{'DIP'}) && 
-                       ($configline[8] eq $outfwsettings{'DPORT'}))
+                       ($configline[9] eq $outfwsettings{'LOG'}) &&
+                       ($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;
                }
        }
        close FILE;
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'})
 {
        if ( $outfwsettings{'VALID'} eq 'yes' ) {
                open( FILE, ">> $configfile" ) or die "Unable to write $configfile";
                print FILE <<END
-$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};
+$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON'};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$outfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'};
 END
 ;
                close FILE;
+               system("/usr/local/bin/outgoingfwctrl");
        } else {
                $outfwsettings{'ACTION'} = 'Add rule';
        }
@@ -213,13 +353,14 @@ END
                print <<END
                <hr />
                <table border='0' width='100%' cellspacing='0'>
-               <tr bgcolor='white'>
-                   <td width='14%'><b>Protokoll</b>
-                   <td width='14%'><b>Netzwerk</b>
-                   <td width='14%'><b>Ziel</b>
-                   <td width='14%'><b>Anmerkung</b>
-                   <td width='14%'><b>Politik</b>
-                   <td width='30%'><b>Aktionen</b>
+               <tr bgcolor='$color{'color22'}'>
+                   <td width='14%' align='center'><b>$Lang::tr{'protocol'}</b></td>
+                   <td width='14%' align='center'><b>$Lang::tr{'network'}</b></td>
+                   <td width='14%' align='center'><b>$Lang::tr{'destination'}</b></td>
+                   <td width='14%' align='center'><b>$Lang::tr{'description'}</b></td>
+                   <td width='14%' align='center'><b>$Lang::tr{'policy'}</b></td>
+                   <td width='16%' align='center'><b>$Lang::tr{'logging'}</b></td>
+                   <td width='14%' align='center'><b>$Lang::tr{'action'}</b></td>
 END
 ;
                foreach $configentry (sort @configs)
@@ -234,45 +375,88 @@ END
                                $outfwsettings{'SMAC'} = $configline[6];
                                $outfwsettings{'DIP'} = $configline[7];
                                $outfwsettings{'DPORT'} = $configline[8];
+                               $outfwsettings{'LOG'} = $configline[9];
+                               
+                               $configline[10] =  "on" if not exists $configline[10];
+                               $configline[11] =  "on" if not exists $configline[11];
+                               $configline[12] =  "on" if not exists $configline[12];
+                               $configline[13] =  "on" if not exists $configline[13];
+                               $configline[14] =  "on" if not exists $configline[14];
+                               $configline[15] =  "on" if not exists $configline[15];
+                               $configline[16] =  "on" if not exists $configline[16];
+                               $configline[17] =  "00:00" if not exists $configline[17];
+                               $configline[18] =  "00:00" if not exists $configline[18];
+                               
+                               $outfwsettings{'TIME_MON'} =  $configline[10];
+                               $outfwsettings{'TIME_TUE'} =  $configline[11];
+                               $outfwsettings{'TIME_WED'} =  $configline[12];
+                               $outfwsettings{'TIME_THU'} =  $configline[13];
+                               $outfwsettings{'TIME_FRI'} =  $configline[14];
+                               $outfwsettings{'TIME_SAT'} =  $configline[15];
+                               $outfwsettings{'TIME_SUN'} =  $configline[16];
+                               $outfwsettings{'TIME_FROM'} =  $configline[17];
+                               $outfwsettings{'TIME_TO'} =  $configline[18];
+
                                if ($outfwsettings{'DIP'} eq ''){ $outfwsettings{'DISPLAY_DIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DIP'} = $outfwsettings{'DIP'}; }
                                if ($outfwsettings{'DPORT'} eq ''){ $outfwsettings{'DISPLAY_DPORT'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DPORT'} = $outfwsettings{'DPORT'}; }
-                               if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY'>"; }
-                               if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW'>"; }
+                               if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
+                               if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
                                if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
                                        print <<END
-                                       <tr bgcolor='#F0F0F0'>
+                                       <tr bgcolor='$color{'color20'}'>
                                            <td align='center'>$outfwsettings{'PROT'}
                                            <td align='center'>$outfwsettings{'SNET'}
                                            <td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
                                            <td align='center'>$outfwsettings{'NAME'}
                                            <td align='center'>$outfwsettings{'DISPLAY_STATE'}
-                                           <td align='right'>
+                                           <td align='center'>$outfwsettings{'LOG'}
+                                           <td align='center'>
                                             <table border='0' cellpadding='0' cellspacing='0'><tr>
                                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                       <input type='hidden' name='PROT' value=$outfwsettings{'PROT'}>
-                                                       <input type='hidden' name='STATE' value=$outfwsettings{'STATE'}>
-                                                       <input type='hidden' name='SNET' value=$outfwsettings{'SNET'}>
-                                                       <input type='hidden' name='DPORT' value=$outfwsettings{'DPORT'}>
-                                                       <input type='hidden' name='DIP' value=$outfwsettings{'DIP'}>
-                                                       <input type='hidden' name='SIP' value=$outfwsettings{'SIP'}>
-                                                       <input type='hidden' name='NAME' value=$outfwsettings{'NAME'}>
-                                                       <input type='hidden' name='SMAC' value=$outfwsettings{'SMAC'}>
-                                                       <input type='hidden' name='ENABLED' value=$outfwsettings{'ENABLED'}>
-                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'edit'}>
-                                                       <input type='image' src='/images/edit.gif' width="20" height="20" alt=$Lang::tr{'edit'}>
+                                                       <input type='hidden' name='PROT' value='$outfwsettings{'PROT'}' />
+                                                       <input type='hidden' name='STATE' value='$outfwsettings{'STATE'}' />
+                                                       <input type='hidden' name='SNET' value='$outfwsettings{'SNET'}' />
+                                                       <input type='hidden' name='DPORT' value='$outfwsettings{'DPORT'}' />
+                                                       <input type='hidden' name='DIP' value='$outfwsettings{'DIP'}' />
+                                                       <input type='hidden' name='SIP' value='$outfwsettings{'SIP'}' />
+                                                       <input type='hidden' name='NAME' value='$outfwsettings{'NAME'}' />
+                                                       <input type='hidden' name='SMAC' value='$outfwsettings{'SMAC'}' />
+                                                       <input type='hidden' name='ENABLED' value='$outfwsettings{'ENABLED'}' />
+                                                       <input type='hidden' name='LOG' value='$outfwsettings{'LOG'}' />
+                                                       <input type='hidden' name='TIME_MON' value='$outfwsettings{'TIME_MON'}' />
+                                                       <input type='hidden' name='TIME_TUE' value='$outfwsettings{'TIME_TUE'}' />
+                                                       <input type='hidden' name='TIME_WED' value='$outfwsettings{'TIME_WED'}' />
+                                                       <input type='hidden' name='TIME_THU' value='$outfwsettings{'TIME_THU'}' />
+                                                       <input type='hidden' name='TIME_FRI' value='$outfwsettings{'TIME_FRI'}' />
+                                                       <input type='hidden' name='TIME_SAT' value='$outfwsettings{'TIME_SAT'}' />
+                                                       <input type='hidden' name='TIME_SUN' value='$outfwsettings{'TIME_SUN'}' />
+                                                       <input type='hidden' name='TIME_FROM' value='$outfwsettings{'TIME_FROM'}' />
+                                                       <input type='hidden' name='TIME_TO' value='$outfwsettings{'TIME_TO'}' />
+                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'edit'} />
+                                                       <input type='image' src='/images/edit.gif' width="20" height="20" alt=$Lang::tr{'edit'} />
                                                </form>
                                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                       <input type='hidden' name='PROT' value=$outfwsettings{'PROT'}>
-                                                       <input type='hidden' name='STATE' value=$outfwsettings{'STATE'}>
-                                                       <input type='hidden' name='SNET' value=$outfwsettings{'SNET'}>
-                                                       <input type='hidden' name='DPORT' value=$outfwsettings{'DPORT'}>
-                                                       <input type='hidden' name='DIP' value=$outfwsettings{'DIP'}>
-                                                       <input type='hidden' name='SIP' value=$outfwsettings{'SIP'}>
-                                                       <input type='hidden' name='NAME' value=$outfwsettings{'NAME'}>
-                                                       <input type='hidden' name='SMAC' value=$outfwsettings{'SMAC'}>
-                                                       <input type='hidden' name='ENABLED' value=$outfwsettings{'ENABLED'}>
-                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'delete'}>
-                                                       <input type='image' src='/images/delete.gif' width="20" height="20" alt=$Lang::tr{'delete'}>
+                                                       <input type='hidden' name='PROT' value='$outfwsettings{'PROT'}' />
+                                                       <input type='hidden' name='STATE' value='$outfwsettings{'STATE'}' />
+                                                       <input type='hidden' name='SNET' value='$outfwsettings{'SNET'}' />
+                                                       <input type='hidden' name='DPORT' value='$outfwsettings{'DPORT'}' />
+                                                       <input type='hidden' name='DIP' value='$outfwsettings{'DIP'}' />
+                                                       <input type='hidden' name='SIP' value='$outfwsettings{'SIP'}' />
+                                                       <input type='hidden' name='NAME' value='$outfwsettings{'NAME'}' />
+                                                       <input type='hidden' name='SMAC' value='$outfwsettings{'SMAC'}' />
+                                                       <input type='hidden' name='ENABLED' value='$outfwsettings{'ENABLED'}' />
+                                                       <input type='hidden' name='LOG' value='$outfwsettings{'LOG'}' />
+                                                       <input type='hidden' name='TIME_MON' value='$outfwsettings{'TIME_MON'}' />
+                                                       <input type='hidden' name='TIME_TUE' value='$outfwsettings{'TIME_TUE'}' />
+                                                       <input type='hidden' name='TIME_WED' value='$outfwsettings{'TIME_WED'}' />
+                                                       <input type='hidden' name='TIME_THU' value='$outfwsettings{'TIME_THU'}' />
+                                                       <input type='hidden' name='TIME_FRI' value='$outfwsettings{'TIME_FRI'}' />
+                                                       <input type='hidden' name='TIME_SAT' value='$outfwsettings{'TIME_SAT'}' />
+                                                       <input type='hidden' name='TIME_SUN' value='$outfwsettings{'TIME_SUN'}' />
+                                                       <input type='hidden' name='TIME_FROM' value='$outfwsettings{'TIME_FROM'}' />
+                                                       <input type='hidden' name='TIME_TO' value='$outfwsettings{'TIME_TO'}' />
+                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} />
+                                                       <input type='image' src='/images/delete.gif' width="20" height="20" alt=$Lang::tr{'delete'} />
                                                </form></table>
 END
 ;
@@ -280,20 +464,63 @@ END
                                                unless ($outfwsettings{'SIP'}) { $outfwsettings{'DISPLAY_SIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SIP'} = $outfwsettings{'SIP'}; }
                                                unless ($outfwsettings{'SMAC'}) { $outfwsettings{'DISPLAY_SMAC'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SMAC'} = $outfwsettings{'SMAC'}; }
                                                print <<END
-                                               <tr><td width='14%' align='right'>Quell-IP-Adresse: 
+                                               <tr><td width='14%' align='right'>$Lang::tr{'source ip'}:
                                                    <td width='14%' align='left'>$outfwsettings{'DISPLAY_SIP'}
-                                                   <td width='14%' align='right'>Quell-MAC-Adresse:
-                                                   <td width='14%' align='left'>$outfwsettings{'DISPLAY_SMAC'}
                                                    <td width='44%' colspan='2' align='center'>
 END
 ;
                                        }
-                                       print <<END
+                                               print <<END
+                                               <tr><td width='14%' align='right'>$Lang::tr{'time'} - </td>
+                                                   <td width='14%' align='left'>
+END
+;
+                                                       if ($outfwsettings{'TIME_MON'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy monday'}</font>,"; 
+                                                       if ($outfwsettings{'TIME_TUE'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy tuesday'}</font>,"; 
+                                                       if ($outfwsettings{'TIME_WED'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy wednesday'}</font>,"; 
+                                                       if ($outfwsettings{'TIME_THU'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy thursday'}</font>,"; 
+                                                       if ($outfwsettings{'TIME_FRI'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy friday'}</font>,"; 
+                                                       if ($outfwsettings{'TIME_SAT'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy saturday'}</font>,"; 
+                                                       if ($outfwsettings{'TIME_SUN'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+                                                       else { print "<font color='$Header::colourred'>";}
+                                                               print "$Lang::tr{'advproxy sunday'}</font>";            
+                                                       print <<END
+                                                       </td>
+                                                   <td width='22%' align='center'>$Lang::tr{'advproxy from'} $outfwsettings{'TIME_FROM'}</td>
+                                                       <td width='22%' align='center'>$Lang::tr{'advproxy to'} $outfwsettings{'TIME_TO'}</td>
                                        </form>
 END
 ;
                                }
                        }
+if ($outfwsettings{'POLICY'} eq 'MODE1'){
+print <<END
+                                       <tr bgcolor='$color{'color20'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                           <td align='center'>all
+                                           <td align='center'>all
+                                           <td align='center'>ALL
+                                           <td align='center'>drop
+                                           <td align='center'><img src='/images/stock_stop.png' alt='DENY' />
+                                           <td align='center'>on <input type='radio' name='MODE1LOG' value='on' $checked{'MODE1LOG'}{'on'} /><input type='radio' name='MODE1LOG' value='off' $checked{'MODE1LOG'}{'off'} /> off
+                                           <td align='center'><input type='hidden' name='ACTION' value=$Lang::tr{'save'} /><input type='image' src='/images/media-floppy.png' width="18" height="18" alt=$Lang::tr{'save'} /></form></tr>
+                                            <table border='0' cellpadding='0' cellspacing='0'><tr>
+                                               <td>
+                                               <td></table>
+END
+;
+}
                print <<END
                </table>
 END
@@ -303,15 +530,15 @@ END
        &Header::closebox();
 }
 
-if ($outfwsettings{'POLICY'} eq 'MODE2'){
+if ($outfwsettings{'POLICY'} ne 'MODE0'){
        open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
        @p2ps = <FILE>;
        close FILE;
        &Header::openbox('100%', 'center', 'P2P-Block');
        print <<END
        <table width='40%'>
-               <tr bgcolor='#FFFFFF'><td width='66%'><b>Protokoll</b>
-                   <td width='33%'><b>Status</b>
+               <tr bgcolor='$color{'color22'}'><td width='66%' align=center><b>$Lang::tr{'protocol'}</b>
+                   <td width='33%' align=center><b>$Lang::tr{'status'}</b>
 END
 ;
        my $id = 1;
@@ -322,28 +549,22 @@ END
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 END
 ;
-               if ($id % 2) {
-                       print "\t\t\t<tr bgcolor='#F0F0F0'>\n"; 
-               }
-               else {
-                       print "\t\t\t<tr bgcolor='#FAFAFA'>\n";
-               }
-               $id++;
-               print <<END
+                       print "\t\t\t<tr bgcolor='$color{'color20'}'>\n"; 
+               print <<END
                        <td width='66%' align='center'>$p2pline[0]:     
-                       <td width='33%' align='center'><input type='hidden' name='P2PROT' value=$p2pline[1]>
+                       <td width='33%' align='center'><input type='hidden' name='P2PROT' value='$p2pline[1]' />
 END
 ;
                if ($p2pline[2] eq 'on') {
                        print <<END
-                               <input type='hidden' name='ACTION' value='disable'>
-                               <input type='image' name='submit' src='/images/stock_ok.png' alt=''>
+                               <input type='hidden' name='ACTION' value='disable' />
+                               <input type='image' name='submit' src='/images/stock_ok.png' alt='' />
 END
 ;
                } else {
                        print <<END
-                               <input type='hidden' name='ACTION' value='enable'>
-                               <input type='image' name='submit' src='/images/stock_stop.png' alt=''>
+                               <input type='hidden' name='ACTION' value='enable' />
+                               <input type='image' name='submit' src='/images/stock_stop.png' alt='' />
 END
 ;
                }
@@ -353,8 +574,8 @@ END
 ;
        }
        print <<END
-       <tr><td colspan='2' align='center'>Klicken Sie auf die Symbole um das entsprechende P2P-Netz zu (de-)aktivieren.
        </table>
+  <br />$Lang::tr{'outgoingfw p2p description'}
 END
 ;
        &Header::closebox();
@@ -364,18 +585,18 @@ END
 print <<END
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='100%'>
-               <tr><td width='10%' align='left'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.
-               <tr><td width='10%' align='left'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.
-               <tr><td width='10%' align='left'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.<br />Hier ist eine Besonderheit der P2P-Filter.
-               <tr><td colspan='3'><hr />
-               <tr><td width='10%' align='left'>       <select name='POLICY' style="width: 85px"><option value='MODE0' $selected{'POLICY'}{'MODE0'}>Modus 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>Modus 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>Modus 2</option></select>
+               <tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 0:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoingfw mode0'}</td></tr>
+               <tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 1:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoingfw mode1'}</td></tr>
+               <tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 2:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoingfw mode2'}</td></tr>
+               <tr><td colspan='3'><hr /></td></tr>
+               <tr><td width='10%' align='left'>       <select name='POLICY' style="width: 85px"><option value='MODE0' $selected{'POLICY'}{'MODE0'}>$Lang::tr{'mode'} 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'mode'} 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'mode'} 2</option></select>
                    <td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
                    <td width='45%' align='left'>
 END
 ;
        if ($outfwsettings{'POLICY'} ne 'MODE0') {
                print <<END
-                   Alle Regeln loeschen: <input type='submit' name='ACTION' value=$Lang::tr{'reset'} />
+                   $Lang::tr{'outgoingfw reset'}: <input type='submit' name='ACTION' value=$Lang::tr{'reset'} />
 END
 ;
        }
@@ -396,29 +617,40 @@ 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 <<END
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='80%'>
-               <tr><td width='20%' align='right'>Anmerkung: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}'>
-                   <td width='20%' align='right'>Aktiviert:
-                   <td width='30%' align='left'><input type='checkbox' name='ENABLED' $selected{'ENABLED'}>
-               <tr><td width='20%' align='right'>Protokoll:
-                   <td width='30%' align='left'><select name='PROT'><option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option><option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option><option value='udp' $selected{'PROT'}{'udp'}>UDP</option></select>
-                   <td width='20%' align='right'>Sicherheitspolitik:
-                   <td width='30%' align='left'>
+               <tr><td width='20%' align='right'>$Lang::tr{'description'}: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}' />
+                   <td width='20%' align='right' colspan='2'>$Lang::tr{'active'}:
+                   <td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} />
+               <tr><td width='20%' align='right'>$Lang::tr{'protocol'}:
+                   <td width='30%' align='left'>
+                       <select name='PROT'>
+                               <option value='all' $selected{'PROT'}{'all'}>All</option>
+                               <option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option>
+                               <option value='udp' $selected{'PROT'}{'udp'}>UDP</option>
+                               <option value='gre' $selected{'PROT'}{'gre'}>GRE</option>
+                               <option value='esp' $selected{'PROT'}{'esp'}>ESP</option>
+                               <option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option>
+                       </select>
+                   <td width='20%' align='right' colspan='2'>$Lang::tr{'policy'}:
+                   <td width='30%' align='left' colspan='2'>
 END
 ;
        if ($outfwsettings{'POLICY'} eq 'MODE1'){
-               print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW'>\n";
+               print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW' />\n";
        } elsif ($outfwsettings{'POLICY'} eq 'MODE2'){
-               print "\t\t\tDENY<input type='hidden' name='STATE' value='DENY'>\n";
+               print "\t\t\tDENY<input type='hidden' name='STATE' value='DENY' />\n";
        }
        print <<END
-               <tr><td width='20%' align='right'>Quellnetz:
+               <tr><td width='20%' align='right'>$Lang::tr{'source net'}:
                    <td width='30%' align='left'><select name='SNET'>
-                       <option value='all' $selected{'SNET'}{'ALL'}>alle</option>
-                       <option value='ip' $selected{'SNET'}{'ip'}>Quell-IP/MAC benutzen</option>
+                       <option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option>
+                       <option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip'}</option>
+                       <option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option>
                        <option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option>
 END
 ;
@@ -430,24 +662,68 @@ END
        }
        print <<END
                        </select>
-                   <td width='20%' align='right'>Quell-IP-Adresse: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}'>
-               <tr><td width='50%' colspan='2'>&nbsp;
-                   <td width='20%' align='right'>Quell-MAC-Adresse: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='SMAC' maxlength='23' value='$outfwsettings{'SMAC'}'>
-               <tr><td width='20%' align='right'>Ziel-IP-Adresse: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}'>
-                   <td width='20%' align='right'>Ziel-Port: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}'>
-               <tr><td colspan='4'>
-               <tr><td width='40%' align='right' colspan='2'><img src='/blob.gif'> $Lang::tr{'this field may be blank'}
-                   <td width='60%' align='left' colspan='2'><input type='submit' name='ACTION' value=$Lang::tr{'add'}>
+                   <td width='20%' align='right' colspan='2'>$Lang::tr{'source ip'}: <img src='/blob.gif' />
+                   <td width='30%' align='left' colspan='2'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}' />
+               <tr><td width='20%' align='right'>$Lang::tr{'logging'}:
+                       <td width='30%' align='left'><select name='LOG'>
+                                                                               <option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option>
+                                                                               <option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option>
+                                                                               </select></td>";
+                   <td width='20%' align='right' colspan='2' />
+                   <td width='30%' align='left' colspan='2' />
+               <tr><td width='20%' align='right'>$Lang::tr{'destination ip'}: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}' />
+                   <td width='20%' align='right' colspan='2'>$Lang::tr{'destination port'}: <img src='/blob.gif' />
+                   <td width='30%' align='left' colspan='2'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}' />
+               <tr><td width='20%' align='right'>$Lang::tr{'time'}:</td>
+                       <td width='30%' align='left'>$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'}</td>
+                       <td width='20%' align='right' colspan='2' />
+                       <td width='15%' align='left'>$Lang::tr{'advproxy from'}</td>
+                       <td width='15%' align='left'>$Lang::tr{'advproxy to'}</td></tr>
+               <tr><td width='20%' align='right'></td>
+                       <td width='30%' align='left'><input type='checkbox' name='TIME_MON' $checked{'TIME_MON'}{'on'} />
+                                                                                <input type='checkbox' name='TIME_TUE' $checked{'TIME_TUE'}{'on'} />
+                                                                                <input type='checkbox' name='TIME_WED' $checked{'TIME_WED'}{'on'} />
+                                                                                <input type='checkbox' name='TIME_THU' $checked{'TIME_THU'}{'on'} />
+                                                                                <input type='checkbox' name='TIME_FRI' $checked{'TIME_FRI'}{'on'} />
+                                                                                <input type='checkbox' name='TIME_SAT' $checked{'TIME_SAT'}{'on'} />
+                                                                                <input type='checkbox' name='TIME_SUN' $checked{'TIME_SUN'}{'on'} /></td>
+                       <td width='20%' align='right' colspan='2' />
+                       <td width='15%' align='left'><select name='TIME_FROM'>
+END
+;
+for (my $i=0;$i<=23;$i++) {
+       $i = sprintf("%02s",$i);
+       for (my $j=0;$j<=45;$j+=15) {
+               $j = sprintf("%02s",$j);
+               my $time = $i.":".$j;
+               print "<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n";
+       }
+}
+print <<END    
+                       </select></td>
+                       <td width='15%' align='left'><select name='TIME_TO'>
+END
+;
+for (my $i=0;$i<=23;$i++) {
+       $i = sprintf("%02s",$i);
+       for (my $j=0;$j<=45;$j+=15) {
+               $j = sprintf("%02s",$j);
+               my $time = $i.":".$j;
+               print "<option $selected{'TIME_TO'}{$time}>$i:$j</option>\n";
+       }
+}
+print <<END    
+                       </select></td></tr>
+               <tr><td colspan='6'>
+               <tr><td width='40%' align='right' colspan='2'><img src='/blob.gif' />$Lang::tr{'this field may be blank'}
+                   <td width='60%' align='left' colspan='4'><input type='submit' name='ACTION' value=$Lang::tr{'add'} />
        </table></form>
 END
 ;
        &Header::closebox();
 
-if ($outfwsettings{'POLICY'} eq 'MODE1')
+if ($outfwsettings{'POLICY'} eq 'MODE1' || $outfwsettings{'POLICY'} eq 'MODE2')
 {
 &Header::openbox('100%', 'center', 'Quick Add');
 
@@ -455,7 +731,7 @@ if ($outfwsettings{'POLICY'} eq 'MODE1')
        my @defservices = <FILE>;
        close FILE;
 
-print "<table width='100%'><tr bgcolor='#F0F0F0'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td></td></tr>";
+print "<table width='100%'><tr bgcolor='$color{'color20'}'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td><b>$Lang::tr{'logging'}</b></td><td><b>$Lang::tr{'action'}</b></td></tr>";
 foreach my $serviceline(@defservices)
        {
        my @service = split(/,/,$serviceline);
@@ -475,19 +751,17 @@ END
                print "<option value='orange' $selected{'SNET'}{'orange'}>$Lang::tr{'dmz'}</option>";
        }
        print <<END
-                                       </select></td><td>
+                                       </select></td>
+          <td><select name='LOG'><option value='$Lang::tr{'active'}'>$Lang::tr{'active'}</option><option value='$Lang::tr{'inactive'}' 'selected'>$Lang::tr{'inactive'}</option></select></td><td>
                                        <input type='hidden' name='ACTION' value=$Lang::tr{'add'} />
                                        <input type='image' alt='$Lang::tr{'add'}' src='/images/add.gif' />
                                        <input type='hidden' name='ENABLED' value='on' />
-                                       <input type='hidden' name='STATE' value='ALLOW' />
-                                       </form></td></tr>
 END
 ;
+       if ($outfwsettings{'POLICY'} eq 'MODE1'){       print "<input type='hidden' name='STATE' value='ALLOW' /></form></td></tr>";}
+       elsif ($outfwsettings{'POLICY'} eq 'MODE2'){print "<input type='hidden' name='STATE' value='DENY' /></form></td></tr>";}
        }
-print "</table>";
-
+       print "</table>";
        &Header::closebox();
-}
-
-}
-
+  }
+}
\ No newline at end of file