firewall: Remove ALGs from UI

This change drops the UIs that could enable ALGs for various protocols.

Those have been all forcibly disabled because "NAT Slipstream".

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files
index 83979493f35fd94b3e2b0c194ec790853137d7d8..c209e54854910bd73973e96d29a0e48c75d816e1 100644 (file)
--- a/config/rootfiles/core/155/filelists/files
+++ b/config/rootfiles/core/155/filelists/files
@@ -1,4 +1,5 @@
 srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
 srv/web/ipfire/cgi-bin/zoneconf.cgi
 srv/web/ipfire/html/include/zoneconf.js

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 0e13af562610513566c1bf48da5e30ccb427f2ea..8fa34fb4c151c378d670db344ca335f3a2b49d5b 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -112,6 +112,7 @@ WARNING: translation string unused: alt information
 WARNING: translation string unused: alt ovpn
 WARNING: translation string unused: alt vpn
 WARNING: translation string unused: and
+WARNING: translation string unused: application layer gateways
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
 WARNING: translation string unused: attemps

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6e30eb9957a1f1ea6c1f7b4cec86fe4c4e3a5dee..7819541c2aeb0c12e0364dbc370e75d9de6ddde8 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -320,7 +320,6 @@ WARNING: untranslated string: alt proxy = Proxy
 WARNING: untranslated string: alt services = Services
 WARNING: untranslated string: alt system = System
 WARNING: untranslated string: apcupsd = APC-UPS status
-WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: april = April
 WARNING: untranslated string: are you sure = Are you sure?
 WARNING: untranslated string: arp table entries = ARP Table Entries

diff --git a/doc/language_issues.es b/doc/language_issues.es
index a544283629f9628f3399906306b191118257dd05..952321fbe481ca5c353bea947ec5c862035bb610 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -811,7 +811,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
-WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 942be73ecd86a7ff3d99816f8fc3ce032542ba49..9fe5ca21c160b93ceb9fe710f3f002ed32c85f29 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -117,6 +117,7 @@ WARNING: translation string unused: alt information
 WARNING: translation string unused: alt ovpn
 WARNING: translation string unused: alt vpn
 WARNING: translation string unused: and
+WARNING: translation string unused: application layer gateways
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
 WARNING: translation string unused: attemps

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 98074e59f28700d9dd2fad0e8a01a4e4885641e6..29c9c7d58e2272261974f96103970092d972d5a9 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -898,7 +898,6 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
 WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
-WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: block = Block

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 8eebbd57f3d605c87c33a19b87693396bb982cde..d6cad0deeb787bcc07885dcd7b1b6554a1676234 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -892,7 +892,6 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
 WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
-WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: autonomous system = Autonomous System

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index f1a4756482f95cd9c8d5b39a2e24b602963266e3..b8fba938f8756a3f87bb5a4b9247d994204a8393 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -826,7 +826,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
-WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 43c1f8c088c1c1690903a422aceef636757a179b..d507911f1acf9aa18a603b9759e0b9a9a4d3e3e3 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -822,7 +822,6 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
-WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 439a588906aa6f26b5ead3dbb0395c44209da1c6..04343d527d5d673608bd075ebda2562fb1994abe 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -114,6 +114,7 @@ WARNING: translation string unused: alt ovpn
 WARNING: translation string unused: alt vpn
 WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
+WARNING: translation string unused: application layer gateways
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
 WARNING: translation string unused: attemps

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 8c996802c59da47c04eb251e9cc7b1c01f1e12b7..321642e82e090b3773b6c8297a9c435ebc836926 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -128,24 +128,6 @@ $checked{'SHOWTABLES'}{$settings{'SHOWTABLES'}} = "checked='checked'";
 $checked{'SHOWDROPDOWN'}{'off'} = '';
 $checked{'SHOWDROPDOWN'}{'on'} = '';
 $checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'";
-$checked{'CONNTRACK_FTP'}{'off'} = '';
-$checked{'CONNTRACK_FTP'}{'on'} = '';
-$checked{'CONNTRACK_FTP'}{$settings{'CONNTRACK_FTP'}} = "checked='checked'";
-$checked{'CONNTRACK_H323'}{'off'} = '';
-$checked{'CONNTRACK_H323'}{'on'} = '';
-$checked{'CONNTRACK_H323'}{$settings{'CONNTRACK_H323'}} = "checked='checked'";
-$checked{'CONNTRACK_IRC'}{'off'} = '';
-$checked{'CONNTRACK_IRC'}{'on'} = '';
-$checked{'CONNTRACK_IRC'}{$settings{'CONNTRACK_IRC'}} = "checked='checked'";
-$checked{'CONNTRACK_PPTP'}{'off'} = '';
-$checked{'CONNTRACK_PPTP'}{'on'} = '';
-$checked{'CONNTRACK_PPTP'}{$settings{'CONNTRACK_PPTP'}} = "checked='checked'";
-$checked{'CONNTRACK_SIP'}{'off'} = '';
-$checked{'CONNTRACK_SIP'}{'on'} = '';
-$checked{'CONNTRACK_SIP'}{$settings{'CONNTRACK_SIP'}} = "checked='checked'";
-$checked{'CONNTRACK_TFTP'}{'off'} = '';
-$checked{'CONNTRACK_TFTP'}{'on'} = '';
-$checked{'CONNTRACK_TFTP'}{$settings{'CONNTRACK_TFTP'}} = "checked='checked'";
 $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected';
 $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected';
 $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected';
@@ -251,58 +233,6 @@ END
                                                                                                                                                                                <input type='radio' name='SHOWDROPDOWN' value='off' $checked{'SHOWDROPDOWN'}{'off'} /> $Lang::tr{'off'}</td></tr>
 </table>
 
-<br />
-
-<table width='95%' cellspacing='0'>
-       <tr bgcolor='$color{'color20'}'>
-               <td colspan='2' align='left'>
-                       <b>$Lang::tr{'application layer gateways'}</b>
-               </td>
-       </tr>
-       <tr>
-               <td align='left' width='60%'>FTP</td>
-               <td align='left'>
-                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} /> /
-                       <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> $Lang::tr{'off'}
-               </td>
-       </tr>
-       <tr>
-               <td align='left' width='60%'>H.323</td>
-               <td align='left'>
-                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} /> /
-                       <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> $Lang::tr{'off'}
-               </td>
-       </tr>
-       <tr>
-               <td align='left' width='60%'>IRC</td>
-               <td align='left'>
-                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} /> /
-                       <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> $Lang::tr{'off'}
-               </td>
-       </tr>
-       <tr>
-               <td align='left' width='60%'>PPTP</td>
-               <td align='left'>
-                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_PPTP' value='on' $checked{'CONNTRACK_PPTP'}{'on'} /> /
-                       <input type='radio' name='CONNTRACK_PPTP' value='off' $checked{'CONNTRACK_PPTP'}{'off'} /> $Lang::tr{'off'}
-               </td>
-       </tr>
-       <tr>
-               <td align='left' width='60%'>SIP</td>
-               <td align='left'>
-                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} /> /
-                       <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> $Lang::tr{'off'}
-               </td>
-       </tr>
-       <tr>
-               <td align='left' width='60%'>TFTP</td>
-               <td align='left'>
-                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} /> /
-                       <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> $Lang::tr{'off'}
-               </td>
-       </tr>
-</table>
-
 <br />
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr>