Forward Firewall: changed firewall modes from mode1,mode2 to "allowed" and "blocked...

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 82286feec8fe53760e805aeff4476b61b1957cd1..1ecdd6264136c5f7d387d17732b9b8824b89bdb4 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -524,14 +524,16 @@ sub base
        &hint;
        &addrule;
        &p2pblock;
-       &Header::openbox('100%', 'center', 'Policy');
+       &Header::openbox('100%', 'center', $Lang::tr{'fwdfw pol title'});
 print <<END;
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <table width='100%'>
-               <tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 1:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoing firewall mode1'}</td></tr>
-               <tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 2:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoing firewall mode2'}</td></tr>
+       <table width='100%' border='0'>
+               <tr><td colspan='3'>$Lang::tr{'fwdfw pol text'}</td></tr>
+               
                <tr><td colspan='3'><hr /></td></tr>
-               <tr><td width='10%' align='left'>       <select name='POLICY' style="width: 85px">$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>
+               <tr><td width='10%' align='left'>       <select name='POLICY' style="width: 85px">
+               <option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option>
+               <option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select>
            <td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
            <td width='45%' align='left'>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index be162245895d8fc03f6300944c243d864b3449c4..127db1e921ca8d609276a8482109d5b789a78348 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -922,6 +922,10 @@
 'fwdfw man port'               => 'Port(s) manuell:',
 'fwdfw moveup'                 => 'Hoch',
 'fwdfw movedown'               => 'Runter',
+'fwdfw pol allow'              => 'Zugelassen',
+'fwdfw pol block'              => 'Blockiert',
+'fwdfw pol title'              => 'Standardverhalten der Firewall',
+'fwdfw pol text'               => 'Standardverhalten für Verbindungen aus den lokalen Netzwerken. Bei "Zugelassen" werden sämtliche Verbindungen zugelassen mit Ausnahme der in Forward konfigurierten Regeln. Mit "Blockiert" werden alle Verbindungsversuche blockiert mit Ausnahme der in Forward erstellten Regeln. Außerdem werden hier der externe Zugang und der Zugriff auf die DMZ geregelt.',
 'fwdfw reread'                 => 'Übernehmen',
 'fwdfw rules'                  => 'Regeln',
 'fwdfw rule action'    => 'Regel Aktion:',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b4db9628b8a810fcb5cd38ad55758a275981d526..8df7bf505f891666f77a5c454673f77ae246ab81 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -948,6 +948,10 @@
 'fwdfw man port'               => 'Port(s) manual:',
 'fwdfw moveup'                 => 'Move up',
 'fwdfw movedown'               => 'Move down',
+'fwdfw pol allow'              => 'Allowed',
+'fwdfw pol block'              => 'Blocked',
+'fwdfw pol title'              => 'Firewall default behavior',
+'fwdfw pol text'               => 'Default behavior for connections from local nwtworks. "Allowed" allows all connections from local networks except the defined rules."Blocked" prohibits all connections except the defined ones.Also external access and connections to/from demilitarized zone are configurable here.',
 'fwdfw reread'                 => 'Apply',
 'fwdfw rules'                  => 'Rules',
 'fwdfw rule action'    => 'Rule action:',