Großes Update:

Hinzugefügt:
  * L7-Protokolle
Geändert:
  * XAMPP 1.5.1 --> 1.5.3
  * Sämtliche "IPCops" durch "IPFire" im Webinterface ersetzt
  * Einige Fixes, wegen Errors im Webinterface. (Im Forum zu finden.)


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@148 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-05-31 10:09:27 +00:00
parent 548f60a5bf
commit 78331e3019
35 changed files with 654 additions and 340 deletions

View File

@@ -1,19 +1,19 @@
#!/usr/bin/perl
#
# This file is part of the IPCop Firewall.
# This file is part of the IPFire Firewall.
#
# IPCop is free software; you can redistribute it and/or modify
# IPFire 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 2 of the License, or
# (at your option) any later version.
#
# IPCop is distributed in the hope that it will be useful,
# IPFire 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 IPCop; if not, write to the Free Software
# along with IPFire; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Copyright (C) 2003-05-25 Mark Wormgoor <mark@wormgoor.com>
@@ -991,7 +991,7 @@ END
<tr><td width='30%' class='base'>$Lang::tr{'organization name'}:</td>
<td width='35%' class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_ORGANIZATION' value='$cgiparams{'ROOTCERT_ORGANIZATION'}' size='32' /></td>
<td width='35%' colspan='2'>&nbsp;</td></tr>
<tr><td class='base'>$Lang::tr{'ipcops hostname'}:</td>
<tr><td class='base'>$Lang::tr{'ipfires hostname'}:</td>
<td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_HOSTNAME' value='$cgiparams{'ROOTCERT_HOSTNAME'}' size='32' /></td>
<td colspan='2'>&nbsp;</td></tr>
<tr><td class='base'>$Lang::tr{'your e-mail'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
@@ -1250,7 +1250,7 @@ END
}
if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
$errormessage = $Lang::tr{'ipcop side is invalid'};
$errormessage = $Lang::tr{'ipfire side is invalid'};
goto VPNCONF_ERROR;
}
@@ -1749,7 +1749,7 @@ END
} else {
print <<END
<tr><input type='hidden' name='INTERFACE' value='RED' />
<td class='boldbase' nowrap='nowrap'>$Lang::tr{'ipcop side'}</td>
<td class='boldbase' nowrap='nowrap'>$Lang::tr{'ipfire side'}</td>
<td><select name='SIDE'><option value='left' $selected{'SIDE'}{'left'}>left</option>
<option value='right' $selected{'SIDE'}{'right'}>right</option></select></td>
<td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>