deleted xtaccess and outgoinggrp.cgi from html/cgi directory
authorAlexander Marx <amarx@ipfire.org>
Wed, 8 Jan 2014 09:10:35 +0000 (10:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Jan 2014 14:03:13 +0000 (15:03 +0100)
html/cgi-bin/outgoinggrp.cgi [deleted file]
html/cgi-bin/xtaccess.cgi [deleted file]

diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi
deleted file mode 100644 (file)
index 1c3d695..0000000
+++ /dev/null
@@ -1,466 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
-#                                                                             #
-# 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';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-my %outgrpsettings = ();
-my %netsettings = ();
-my %selected= () ;
-my $errormessage = "";
-
-my $configpath = "/var/ipfire/outgoing/groups/";
-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);
-
-&Header::showhttpheaders();
-
-### Values that have to be initialized
-$outgrpsettings{'ACTION'} = '';
-$outgrpsettings{'ipgroup'} = 'none';
-$outgrpsettings{'macgroup'} = 'none';
-
-&Header::getcgihash(\%outgrpsettings);
-delete $outgrpsettings{'__CGI__'};delete $outgrpsettings{'x'};delete $outgrpsettings{'y'};
-
-$selected{'ipgroup'}{$outgrpsettings{'ipgroup'}} = "selected='selected'";
-$selected{'macgroup'}{$outgrpsettings{'macgroup'}} = "selected='selected'";
-
-&Header::openpage($Lang::tr{'outgoing firewall groups'}, 1, '');
-&Header::openbigbox('100%', 'left', '', $errormessage);
-
-###############
-# DEBUG DEBUG
-# &Header::openbox('100%', 'left', 'DEBUG');
-# my $debugCount = 0;
-# foreach my $line (sort keys %outgrpsettings) {
-# print "$line = $outgrpsettings{$line}<br />\n";
-# $debugCount++;
-# }
-# print "Count: $debugCount\n";
-# &Header::closebox();
-# DEBUG DEBUG
-###############
-
-############################################################################################################################
-############################################################################################################################
-
-if ($outgrpsettings{'ACTION'} eq 'newipgroup')
-{
-       &newipgroup();
-}elsif ($outgrpsettings{'ACTION'} eq 'editipgroup')
-{
-       &editipgroup();
-} elsif ($outgrpsettings{'ACTION'} eq 'deleteipgroup' ) {
-       unlink("$configpath/ipgroups/$outgrpsettings{'ipgroup'}");
-} elsif ($outgrpsettings{'ACTION'} eq 'addipgroup') {
-
-       if ( -e "$configpath/macgroups/$outgrpsettings{'ipgroup'}" ){
-               $errormessage =  "$Lang::tr{'outgoing firewall group error'}";
-       } elsif ( $outgrpsettings{'ipgroup'} =~ /\W/ ){
-               $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'ipgroup'};
-       } elsif ( $outgrpsettings{'ipgroup'} eq "all" || $outgrpsettings{'ipgroup'} eq "red" || $outgrpsettings{'ipgroup'} eq "blue" ||
-                       $outgrpsettings{'ipgroup'} eq "green" || $outgrpsettings{'ipgroup'} eq "orange" || $outgrpsettings{'ipgroup'} eq "ip" ||
-                       $outgrpsettings{'ipgroup'} eq "mac" || $outgrpsettings{'ipgroup'} eq "ovpn" || $outgrpsettings{'ipgroup'} eq "ipsec" ) {
-               $errormessage =  "$Lang::tr{'outgoing firewall reserved groupname'}";
-       } else {
-               open (FILE, ">$configpath/ipgroups/$outgrpsettings{'ipgroup'}") or die "Can't save $outgrpsettings{'ipgroup'} settings $!";
-               $outgrpsettings{'ipgroupcontent'} =~ s/\s*$//;
-               flock (FILE, 2);
-               print FILE $outgrpsettings{'ipgroupcontent'}."\n";
-               close FILE;
-       }
-}
-
-if ($outgrpsettings{'ACTION'} eq 'newmacgroup')
-{
-       &newmacgroup();
-}elsif ($outgrpsettings{'ACTION'} eq 'editmacgroup')
-{
-       &editmacgroup();
-}elsif ($outgrpsettings{'ACTION'} eq 'deletemacgroup' ) {
-       unlink("$configpath/macgroups/$outgrpsettings{'macgroup'}");
-} elsif ($outgrpsettings{'ACTION'} eq 'addmacgroup') {
-
-       if ( -e "$configpath/ipgroups/$outgrpsettings{'macgroup'}" ){
-               $errormessage =  "$Lang::tr{'outgoing firewall group error'}";
-       } elsif ( $outgrpsettings{'macgroup'} =~ /\W/ ){
-               $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'macgroup'};
-       } elsif ( $outgrpsettings{'macgroup'} eq "all" || $outgrpsettings{'macgroup'} eq "red" || $outgrpsettings{'macgroup'} eq "blue" ||
-                       $outgrpsettings{'macgroup'} eq "green" || $outgrpsettings{'macgroup'} eq "orange" || $outgrpsettings{'macgroup'} eq "ip" ||
-                       $outgrpsettings{'macgroup'} eq "mac" || $outgrpsettings{'macgroup'} eq "ovpn" || $outgrpsettings{'macgroup'} eq "ipsec" ) {
-               $errormessage =  "$Lang::tr{'outgoing firewall reserved groupname'}";
-       } else {
-               open (FILE, ">$configpath/macgroups/$outgrpsettings{'macgroup'}") or die "Can't save $outgrpsettings{'macgroup'} settings $!";
-               $outgrpsettings{'macgroupcontent'} =~ s/\s*$//;
-               flock (FILE, 2);
-               print FILE $outgrpsettings{'macgroupcontent'}."\n";
-               close FILE;
-       }
-}
-
-if ($errormessage)
-{
-       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-       print "<class name='base'><font color=red>$errormessage\n</font>";
-       print "&nbsp;</class>\n";
-       &Header::closebox();
-}
-
-############################################################################################################################
-############################################################################################################################
-
-my @ipgroups = qx(ls $configpath/ipgroups/);
-if ($outgrpsettings{'ipgroup'} eq "none" and $#ipgroups >= 0 ){ $outgrpsettings{'ipgroup'} = $ipgroups[0];}
-
-my $ipgroupcontent = `cat $configpath/ipgroups/$outgrpsettings{'ipgroup'} 2>/dev/null`;
-$ipgroupcontent =~ s/\n/<br \/>/g;
-
-&Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall ip groups'});
-
-print <<END
-<a name="outgoing showipgroup"></a>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
-<table width='95%' cellspacing='0'>
-       <tr>
-               <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall ip groups'}</b></td>
-       </tr>
-       <tr>
-               <td colspan='3'  align='left'><br /></td>
-       </tr>
-       <tr>
-               <td  align='left' colspan='2'><select name='ipgroup' style="width: 200px">
-END
-;
-foreach my $member (@ipgroups) {chomp $member;print"                   <option value='$member' $selected{'ipgroup'}{$member}>$member</option>\n";}
-print <<END
-               </select></td>
-               <td  align='left'>
-                               <input type='hidden' name='ACTION' value='showipgroup' />
-                               <input type='image' alt='$Lang::tr{'outgoing firewall view group'}' title='$Lang::tr{'outgoing firewall view group'}' src='/images/format-justify-fill.png' />
-               </td>
-       </tr>
-       <tr>
-               <td colspan='3' align='left'><br /></td>
-       </tr>
-       <tr>
-               <td colspan='3' align='left'><font size=1>$ipgroupcontent</font></td>
-       </tr>
-       <tr>
-               <td colspan='3' align='left'><br /></td>
-       </tr>
-       <tr>
-               <td colspan='3' align='center'><font size=1>$Lang::tr{'outgoing firewall ip groups'} - $outgrpsettings{'ipgroup'}</font></td>
-       </tr>
-</table>
-</form>
-<table width='10%' cellspacing='0'>
-<tr>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='editipgroup' />
-                       <input type='hidden' name='ipgroup' value='$outgrpsettings{'ipgroup'}' />
-                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
-               </form>
-       </td>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='newipgroup' />
-                       <input type='image' alt='$Lang::tr{'new'}' title='$Lang::tr{'new'}' src='/images/list-add.png' />
-               </form>
-       </td>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='saveipgroup' />
-                       <input type='hidden' name='ipgroup' value='$outgrpsettings{'ipgroup'}' />
-                       <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
-               </form>
-       </td>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='deleteipgroup' />
-                       <input type='hidden' name='ipgroup' value='$outgrpsettings{'ipgroup'}' />
-                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
-               </form>
-       </td>
-</tr>
-</table>
-
-END
-;
-&Header::closebox();
-
-############################################################################################################################
-############################################################################################################################
-
-my @macgroups = qx(ls $configpath/macgroups/);
-if ($outgrpsettings{'macgroup'} eq "none" and $#macgroups >= 0 ){ $outgrpsettings{'macgroup'} = $macgroups[0];}
-
-my $macgroupcontent = `cat $configpath/macgroups/$outgrpsettings{'macgroup'} 2>/dev/null`;
-$macgroupcontent =~ s/\n/<br \/>/g;
-
-&Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall mac groups'});
-
-print <<END
-<a name="outgoing showmacgroup"></a>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
-<table width='95%' cellspacing='0'>
-       <tr>
-               <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall mac groups'}</b></td>
-       </tr>
-       <tr>
-               <td colspan='3'  align='left'><br /></td>
-       </tr>
-       <tr>
-               <td  align='left' colspan='2'><select name='macgroup' style="width: 200px">
-END
-;
-foreach my $member (@macgroups) {chomp $member;print"                  <option value='$member' $selected{'macgroup'}{$member}>$member</option>\n";}
-print <<END
-               </select></td>
-               <td  align='left'>
-                               <input type='hidden' name='ACTION' value='showmacgroup' />
-                               <input type='image' alt='$Lang::tr{'outgoing firewall view group'}' title='$Lang::tr{'outgoing firewall view group'}' src='/images/format-justify-fill.png' />
-               </td>
-       </tr>
-       <tr>
-               <td colspan='3' align='left'><br /></td>
-       </tr>
-       <tr>
-               <td colspan='3' align='left'><font size=1>$macgroupcontent</font></td>
-       </tr>
-       <tr>
-               <td colspan='3' align='left'><br /></td>
-       </tr>
-       <tr>
-               <td colspan='3' align='center'><font size=1>$Lang::tr{'outgoing firewall mac groups'} - $outgrpsettings{'macgroup'}</font></td>
-       </tr>
-</table>
-</form>
-<table width='10%' cellspacing='0'>
-<tr>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='editmacgroup' />
-                       <input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
-                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
-               </form>
-       </td>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='newmacgroup' />
-                       <input type='image' alt='$Lang::tr{'new'}' title='$Lang::tr{'new'}' src='/images/list-add.png' />
-               </form>
-       </td>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='savemacgroup' />
-                       <input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
-                       <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
-               </form>
-       </td>
-       <td align='center'>
-               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='hidden' name='ACTION' value='deletemacgroup' />
-                       <input type='hidden' name='macgroup' value='$outgrpsettings{'macgroup'}' />
-                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
-               </form>
-       </td>
-</tr>
-</table>
-
-END
-;
-&Header::closebox();
-
-&Header::closebigbox();
-&Header::closepage();
-
-
-############################################################################################################################
-############################################################################################################################
-
-
-sub newipgroup
-{
-       &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall add ip group'});
-
-print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showipgroup'>
-       <table width='95%' cellspacing='0'>
-               <tr>
-                       <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall add ip group'}</b></td>
-               </tr>
-               <tr>
-                       <td colspan='3'  align='left'><br /></td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='2'>
-                               <input type='text' name='ipgroup' value='newipgroup' size="30" />
-                       </td>
-                       <td  align='left'>
-                               <input type='hidden' name='ACTION' value='addipgroup' />
-                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
-                       </td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='3'>
-                               <textarea name="ipgroupcontent" cols="40" rows="5" Wrap="off">192.168.1.0/24\n192.168.3.0/255.255.255.0\n192.168.0.1\n192.168.0.2\n</textarea>
-                       </td>
-               </tr>
-       </table>
-       </form>
-END
-;
-       &Header::closebox();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit 0;
-}
-
-sub editipgroup
-{
-my $ipgroupcontent = `cat $configpath/ipgroups/$outgrpsettings{'ipgroup'} 2>/dev/null`;
-
-       &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall edit ip group'});
-
-print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <table width='95%' cellspacing='0'>
-               <tr>
-                       <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall edit ip group'}</b></td>
-               </tr>
-               <tr>
-                       <td colspan='3'  align='left'><br /></td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='2'>
-                               <input type='text' name='ipgroup' value='$outgrpsettings{'ipgroup'}' size='30' readonly style='color:$color{'color20'}'/>
-                       </td>
-                       <td  align='left'>
-                               <input type='hidden' name='ACTION' value='addipgroup' />
-                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
-                       </td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='3'>
-                               <textarea name="ipgroupcontent" cols="40" rows="5" Wrap="off">$ipgroupcontent</textarea>
-                       </td>
-               </tr>
-       </table>
-       </form>
-END
-;
-       &Header::closebox();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit 0;
-}
-
-sub newmacgroup
-{
-       &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall add mac group'});
-
-print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing showmacgroup'>
-       <table width='95%' cellspacing='0'>
-               <tr>
-                       <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall add mac group'}</b></td>
-               </tr>
-               <tr>
-                       <td colspan='3'  align='left'><br /></td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='2'>
-                               <input type='text' name='macgroup' value='newmacgroup' size="30" />
-                       </td>
-                       <td  align='left'>
-                               <input type='hidden' name='ACTION' value='addmacgroup' />
-                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
-                       </td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='3'>
-                               <textarea name="macgroupcontent" cols="20" rows="5" Wrap="off">00:24:F6:04:5F:2b\n14:26:36:5A:5F:2B\n</textarea>
-                       </td>
-               </tr>
-       </table>
-       </form>
-END
-;
-       &Header::closebox();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit 0;
-}
-
-sub editmacgroup
-{
-my $macgroupcontent = `cat $configpath/macgroups/$outgrpsettings{'macgroup'} 2>/dev/null`;
-
-       &Header::openbox('100%', 'center', $Lang::tr{'outgoing firewall edit mac group'});
-
-print <<END
-       <form method='post' action='$ENV{'SCRIPT_NAME'}#outgoing editmacgroup'>
-       <table width='95%' cellspacing='0'>
-               <tr>
-                       <td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'outgoing firewall edit mac group'}</b></td>
-               </tr>
-               <tr>
-                       <td colspan='3'  align='left'><br /></td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='2'>
-                               <input type='text' name='macgroup' value='$outgrpsettings{'macgroup'}' size='30' readonly style='color:$color{'color20'}'/>
-                       </td>
-                       <td  align='left'>
-                               <input type='hidden' name='ACTION' value='addmacgroup' />
-                               <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' />
-                       </td>
-               </tr>
-               <tr>
-                       <td  align='left' colspan='3'>
-                               <textarea name="macgroupcontent" cols="20" rows="5" Wrap="off">$macgroupcontent</textarea>
-                       </td>
-               </tr>
-       </table>
-       </form>
-END
-;
-       &Header::closebox();
-       &Header::closebigbox();
-       &Header::closepage();
-       exit 0;
-}
diff --git a/html/cgi-bin/xtaccess.cgi b/html/cgi-bin/xtaccess.cgi
deleted file mode 100644 (file)
index 3fc2190..0000000
+++ /dev/null
@@ -1,377 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  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';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-#workaround to suppress a warning when a variable is used only once
-my @dummy = ( ${Header::colouryellow} );
-undef (@dummy);
-
-my %cgiparams=();
-my %checked=();
-my %selected=();
-my $errormessage = '';
-my $filename = "${General::swroot}/xtaccess/config";
-my $aliasfile = "${General::swroot}/ethernet/aliases";
-my $changed = 'no';
-
-my %color = ();
-my %mainsettings = ();
-&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-
-&Header::showhttpheaders();
-
-$cgiparams{'ENABLED'} = 'off';
-$cgiparams{'ACTION'} = '';
-$cgiparams{'SRC'} = '';
-$cgiparams{'DEST_PORT'} = '';
-$cgiparams{'REMARK'} ='';
-&Header::getcgihash(\%cgiparams);
-open(FILE, $filename) or die 'Unable to open config file.';
-my @current = <FILE>;
-close(FILE);
-
-if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
-{
-       unless($cgiparams{'PROTOCOL'} =~ /^(tcp|udp)$/) { $errormessage = $Lang::tr{'invalid input'}; }
-       unless(&General::validipormask($cgiparams{'SRC'}))
-       {
-               if ($cgiparams{'SRC'} ne '') {
-                       $errormessage = $Lang::tr{'source ip bad'}; }
-               else {
-                       $cgiparams{'SRC'} = '0.0.0.0/0'; }
-       }
-       unless($errormessage){ $errormessage = &General::validportrange($cgiparams{'DEST_PORT'},'dst'); }
-       if ( ! $errormessage)
-       {
-           $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
-
-               if($cgiparams{'EDITING'} eq 'no') {
-                       open(FILE,">>$filename") or die 'Unable to open config file.';
-                       flock FILE, 2;
-                       print FILE "$cgiparams{'PROTOCOL'},$cgiparams{'SRC'},$cgiparams{'DEST_PORT'},$cgiparams{'ENABLED'},$cgiparams{'DEST'},$cgiparams{'REMARK'}\n";
-               } else {
-                       open(FILE, ">$filename") or die 'Unable to open config file.';
-                       flock FILE, 2;
-                       my $id = 0;
-                       foreach my $line (@current)
-                       {
-                               $id++;
-                               if ($cgiparams{'EDITING'} eq $id) {
-                                       print FILE "$cgiparams{'PROTOCOL'},$cgiparams{'SRC'},$cgiparams{'DEST_PORT'},$cgiparams{'ENABLED'},$cgiparams{'DEST'},$cgiparams{'REMARK'}\n";
-                               } else { print FILE "$line"; }
-                       }
-               }
-               close(FILE);
-               undef %cgiparams;
-               $changed = 'yes';
-               &General::log($Lang::tr{'external access rule added'});
-               system('/usr/local/bin/setxtaccess');
-       } else {
-               # stay on edit mode if an error occur
-               if ($cgiparams{'EDITING'} ne 'no')
-               {
-                       $cgiparams{'ACTION'} = $Lang::tr{'edit'};
-                       $cgiparams{'ID'} = $cgiparams{'EDITING'};
-               }
-       }
-}
-if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'})
-{
-       my $id = 0;
-       open(FILE, ">$filename") or die 'Unable to open config file.';
-       flock FILE, 2;
-       foreach my $line (@current)
-       {
-               $id++;
-               unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; }
-       }
-       close(FILE);
-       system('/usr/local/bin/setxtaccess');
-       &General::log($Lang::tr{'external access rule removed'});
-}
-if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'})
-{
-       open(FILE, ">$filename") or die 'Unable to open config file.';
-       flock FILE, 2;
-       my $id = 0;
-       foreach my $line (@current)
-       {
-               $id++;
-               unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; }
-               else
-               {
-                       chomp($line);
-                       my @temp = split(/\,/,$line);
-                       print FILE "$temp[0],$temp[1],$temp[2],$cgiparams{'ENABLE'},$temp[4],$temp[5]\n";
-               }
-       }
-       close(FILE);
-       system('/usr/local/bin/setxtaccess');
-}
-if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'})
-{
-       my $id = 0;
-       foreach my $line (@current)
-       {
-               $id++;
-               if ($cgiparams{'ID'} eq $id)
-               {
-                       chomp($line);
-                       my @temp = split(/\,/,$line);
-                       $cgiparams{'PROTOCOL'} = $temp[0];
-                       $cgiparams{'SRC'} = $temp[1];
-                       $cgiparams{'DEST_PORT'} = $temp[2];
-                       $cgiparams{'ENABLED'} = $temp[3];
-                       $cgiparams{'DEST'} = $temp[4];
-                       $cgiparams{'REMARK'} = $temp[5];
-               }
-       }
-}
-
-if ($cgiparams{'ACTION'} eq '')
-{
-       $cgiparams{'PROTOCOL'} = 'tcp';
-       $cgiparams{'DEST'} = '0.0.0.0';
-       $cgiparams{'ENABLED'} = 'on';
-}
-
-$selected{'PROTOCOL'}{'udp'} = '';
-$selected{'PROTOCOL'}{'tcp'} = '';
-$selected{'PROTOCOL'}{$cgiparams{'PROTOCOL'}} = "selected='selected'";
-
-$selected{'DEST'}{$cgiparams{'DEST'}} = "selected='selected'";
-
-$checked{'ENABLED'}{'off'} = '';
-$checked{'ENABLED'}{'on'} = '';
-$checked{'ENABLED'}{$cgiparams{'ENABLED'}} = "checked='checked'";
-
-&Header::openpage($Lang::tr{'external access configuration'}, 1, '');
-
-&Header::openbigbox('100%', 'left', '', $errormessage);
-
-if ($errormessage) {
-       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-       print "<class name='base'>$errormessage\n";
-       print "&nbsp;</class>\n";
-       &Header::closebox();
-}
-
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-
-my $buttontext = $Lang::tr{'add'};
-if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) {
-       &Header::openbox('100%', 'left', $Lang::tr{'edit a rule'});
-       $buttontext = $Lang::tr{'update'};
-} else {
-       &Header::openbox('100%', 'left', $Lang::tr{'add a new rule'});
-}
-print <<END
-<table width='100%'>
-<tr>
-<td width='10%'>
-<select name='PROTOCOL'>
-<option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option>
-<option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option>
-</select>
-</td>
-<td class='base'><font color='${Header::colourred}'>$Lang::tr{'source network'}</font></td>
-<td><input type='text' name='SRC' value='$cgiparams{'SRC'}' size='32' /></td>
-<td class='base'><font color='${Header::colourred}'>$Lang::tr{'destination port'}:</font></td>
-<td><input type='text' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td>
-</tr>
-</table>
-<table width='100%'>
-<tr>
-<td width='10%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
-<td class='base'><font color='${Header::colourred}'>$Lang::tr{'destination ip'}:&nbsp;</font>
-<select name='DEST'>
-<option value='0.0.0.0' $selected{'DEST'}{'0.0.0.0'}>DEFAULT IP</option>
-END
-;
-
-open(ALIASES, "$aliasfile") or die 'Unable to open aliases file.';
-while (<ALIASES>)
-{
-       chomp($_);
-       my @temp = split(/\,/,$_);
-       if ($temp[1] eq 'on') {
-               print "<option value='$temp[0]' $selected{'DEST'}{$temp[0]}>$temp[0]";
-               if (defined $temp[2] and ($temp[2] ne '')) { print " ($temp[2])"; }
-               print "</option>\n";
-       }
-}
-close(ALIASES);
-print <<END
-</select>
-</td>
-</tr>
-</table>
-<table width='100%'>
-<tr>
-<td width ='10%' class='base'>
-<font class='boldbase'>$Lang::tr{'remark'}:</font>&nbsp;<img src='/blob.gif' alt='*' />
-</td>
-<td width='65%'>
-<input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' />
-</td>
-<td width='25%' align='center'>
-<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
-<input type='submit' name='SUBMIT' value='$buttontext' />
-</td>
-</tr>
-</table>
-<table width='100%'>
-<tr>
-<td class='base' width='30%'><img src='/blob.gif' alt ='*' align='top' />&nbsp;<font class='base'>$Lang::tr{'this field may be blank'}</font>
-</td>
-</tr>
-</table>
-END
-;
-if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) {
-       print "<input type='hidden' name='EDITING' value='$cgiparams{'ID'}' />\n";
-} else {
-       print "<input type='hidden' name='EDITING' value='no' />\n";
-}
-
-&Header::closebox();
-print "</form>\n";
-
-&Header::openbox('100%', 'left', $Lang::tr{'current rules'});
-print <<END
-<table width='100%'>
-<tr>
-<td width='10%' class='boldbase' align='center'><b>$Lang::tr{'proto'}</b></td>
-<td width='20%' class='boldbase' align='center'><b>$Lang::tr{'source ip'}</b></td>
-<td width='20%' class='boldbase' align='center'><b>$Lang::tr{'destination ip'}</b></td>
-<td width='15%' class='boldbase' align='center'><b>$Lang::tr{'destination port'}</b></td>
-<td width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td>
-<td width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></td>
-</tr>
-END
-;
-
-# If something has happened re-read config
-if($cgiparams{'ACTION'} ne '' or $changed ne 'no')
-{
-       open(FILE, $filename) or die 'Unable to open config file.';
-       @current = <FILE>;
-       close(FILE);
-}
-my $id = 0;
-foreach my $line (@current)
-{
-       $id++;
-       chomp($line);
-       my @temp = split(/\,/,$line);
-       my $protocol = '';
-       my $gif = '';
-       my $gdesc = '';
-       my $toggle = '';
-       if ($temp[0] eq 'udp') {
-               $protocol = 'UDP'; }
-       else {
-               $protocol = 'TCP' }
-       if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) {
-               print "<tr bgcolor='${Header::colouryellow}'>\n"; }
-       elsif ($id % 2) {
-               print "<tr bgcolor='$color{'color22'}'>\n"; }
-       else {
-               print "<tr bgcolor='$color{'color20'}'>\n"; }
-       if ($temp[3] eq 'on') { $gif='on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};}
-       else { $gif='off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'}; }
-       if ($temp[1] eq '0.0.0.0/0') {
-               $temp[1] = $Lang::tr{'caps all'}; }
-       # catch for 'old-style' rules file - assume default ip if
-       # none exists
-       if (!&General::validip($temp[4]) || $temp[4] eq '0.0.0.0') {
-               $temp[4] = 'DEFAULT IP'; }
-       $temp[5] = '' unless defined $temp[5];
-print <<END
-<td align='center'>$protocol</td>
-<td align='center'>$temp[1]</td>
-<td align='center'>$temp[4]</td>
-<td align='center'>$temp[2]</td>
-<td align='left'>&nbsp;$temp[5]</td>
-<td align='center'>
-<form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
-<input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' title='$gdesc' alt='$gdesc' />
-<input type='hidden' name='ID' value='$id' />
-<input type='hidden' name='ENABLE' value='$toggle' />
-<input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' />
-</form>
-</td>
-<td align='center'>
-<form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'>
-<input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' />
-<input type='hidden' name='ID' value='$id' />
-<input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
-</form>
-</td>
-<td align='center'>
-<form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
-<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
-<input type='hidden' name='ID' value='$id' />
-<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-</form>
-</td>
-
-</tr>
-END
-       ;
-}
-print "</table>\n";
-
-# If the xt access file contains entries, print Key to action icons
-if ( ! -z "$filename") {
-print <<END
-<table>
-<tr>
-       <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
-       <td>&nbsp; <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td>
-       <td class='base'>$Lang::tr{'click to disable'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td>
-       <td class='base'>$Lang::tr{'click to enable'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
-       <td class='base'>$Lang::tr{'edit'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-       <td class='base'>$Lang::tr{'remove'}</td>
-</tr>
-</table>
-END
-;
-}
-
-&Header::closebox();
-
-&Header::closebigbox();
-
-&Header::closepage();