Firewalloptions entfernt :D

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@805 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 019e1d6dceaf9c760508dfdb7d13838ba571437e..69357b7a07b3232b67604c736ca6fcefb0e7aa51 100644 (file)
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -34,9 +34,3 @@
                                'title' => "Universal Plug and Play",
                                'enabled' => 0,
                                };
-    $subfirewall->{'70.fwopts'} = {
-                               'caption' => $Lang::tr{'options fw'},
-                               'uri' => '/cgi-bin/optionsfw.cgi',
-                               'title' => "$Lang::tr{'options fw'}",
-                               'enabled' => 1,
-                                };

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index d8b6ccd20b57b8091352e4f1f46e3275051ac9cc..dac30e23b575e7eb1e1ef1714b96fede25d52e3c 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1296,7 +1296,6 @@ srv/web/ipfire/cgi-bin/memory.cgi
 srv/web/ipfire/cgi-bin/modem.cgi
 srv/web/ipfire/cgi-bin/network.cgi
 srv/web/ipfire/cgi-bin/networks.cgi
-srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
deleted file mode 100644 (file)
index 5e1dceb..0000000
--- a/html/cgi-bin/optionsfw.cgi
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/perl
-#
-# SmoothWall CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The SmoothWall Team
-#
-# Copyright (C) 01-02-2002 Graham Smith <grhm@grhm.co.uk>
-#
-# $Id: optionsfw.cgi,v 1.1.2.10 2005/10/03 00:34:10 gespinasse Exp $
-#
-#
-
-# 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 %checked =();     # Checkbox manipulations
-
-# File used
-my $filename = "${General::swroot}/optionsfw/settings";
-
-our %settings=();
-#Settings1
-$settings{'DISABLEPING'} = 'NO';
-$settings{'ACTION'} = '';              # add/edit/remove
-
-my $errormessage = '';
-my $warnmessage = '';
-
-&Header::showhttpheaders();
-
-#Get GUI values
-&Header::getcgihash(\%settings);
-
-if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
-       if ($settings{'DISABLEPING'} !~ /^(NO|ONLYRED|ALL)$/) {
-               $errormessage = $Lang::tr{'invalid input'};
-               goto ERROR; }
-       unless ($errormessage) {                                        # Everything is ok, save settings
-               &General::writehash($filename, \%settings);             # Save good settings
-               $settings{'ACTION'} = $Lang::tr{'save'};                # Recreate  'ACTION'
-               system('/usr/local/bin/setfilters');
-       }
-
-       ERROR:                                                          # Leave the faulty field untouched
-} else {
-       &General::readhash($filename, \%settings);                      # Get saved settings and reset to good if needed
-}
-$checked{'DISABLEPING'}{'NO'} = '';
-$checked{'DISABLEPING'}{'ONLYRED'} = '';
-$checked{'DISABLEPING'}{'ALL'} = '';
-$checked{'DISABLEPING'}{$settings{'DISABLEPING'}} = "checked='checked'";
-
-&Header::openpage($Lang::tr{'options fw'}, 1, '');
-&Header::openbigbox('100%', 'left', '', $errormessage);
-
-if ($errormessage) {
-       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-       print "<font class='base'>$errormessage&nbsp;</font>";
-       &Header::closebox();
-}
-
-&Header::openbox('100%', 'left', $Lang::tr{'options fw'});
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
-
-print <<END
-<table width='100%'>
-<tr>
-       <td class='base' width='100%' colspan='3'><b>$Lang::tr{'ping disabled'}</b></td>
-</tr>
-<tr>
-       <td class='base'><input type='radio' name='DISABLEPING' value='NO' $checked{'DISABLEPING'}{'NO'} />$Lang::tr{'no'}</td>
-       <td>&nbsp;</td>
-</tr>
-<tr>
-       <td><input type='radio' name='DISABLEPING' value='ONLYRED' $checked{'DISABLEPING'}{'ONLYRED'} />$Lang::tr{'only red'}</td>
-       <td width='80%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-</tr>
-<tr>
-       <td><input type='radio' name='DISABLEPING' value='ALL' $checked{'DISABLEPING'}{'ALL'} />$Lang::tr{'all interfaces'}</td>
-       <td class='base' width='10%' align='right'><!-- Space for future online help link --></td>
-</tr>
-</table>
-</form>
-END
-;
-&Header::closebox();
-
-&Header::closebigbox();
-
-&Header::closepage();