Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / html / cgi-bin / optionsfw.cgi

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 713f37f9fd7d6df885346fac97e7dddaeeae2018..34e0cdcabac6a8bb037faa65441f6d36226034a5 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -26,13 +26,13 @@ my %fwdfwsettings=();
 my %configfwdfw=();
 my %configoutgoingfw=();
 
-my $configfwdfw                = "${General::swroot}/forward/config";
-my $configoutgoing     = "${General::swroot}/forward/outgoing";
+my $configfwdfw                = "${General::swroot}/firewall/config";
+my $configoutgoing     = "${General::swroot}/firewall/outgoing";
 my $errormessage = '';
 my $warnmessage = '';
 my $filename = "${General::swroot}/optionsfw/settings";
 
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
 &Header::showhttpheaders();
 
 #Get GUI values
@@ -41,7 +41,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
        if ($settings{'defpol'} ne '1'){
                $errormessage .= $Lang::tr{'new optionsfw later'};
                &General::writehash($filename, \%settings);             # Save good settings
-               system("/usr/local/bin/forwardfwctrl");
+               system("/usr/local/bin/firewallctrl");
        }else{
                if ($settings{'POLICY'} ne ''){
                        $fwdfwsettings{'POLICY'} = $settings{'POLICY'};
@@ -54,9 +54,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                %fwdfwsettings = ();
                $fwdfwsettings{'POLICY'} = "$MODE";
                $fwdfwsettings{'POLICY1'} = "$MODE1";
-               &General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-               &General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
-               system("/usr/local/bin/forwardfwctrl");
+               &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+               &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+               system("/usr/local/bin/firewallctrl");
        }
        &General::readhash($filename, \%settings);             # Load good settings
 }
@@ -70,6 +70,17 @@ if ($errormessage) {
         &Header::closebox();
 }
 
+# Set new defaults
+if (!$settings{'MASQUERADE_GREEN'}) {
+       $settings{'MASQUERADE_GREEN'} = 'on';
+}
+if (!$settings{'MASQUERADE_ORANGE'}) {
+       $settings{'MASQUERADE_ORANGE'} = 'on';
+}
+if (!$settings{'MASQUERADE_BLUE'}) {
+       $settings{'MASQUERADE_BLUE'} = 'on';
+}
+
 $checked{'DROPNEWNOTSYN'}{'off'} = '';
 $checked{'DROPNEWNOTSYN'}{'on'} = '';
 $checked{'DROPNEWNOTSYN'}{$settings{'DROPNEWNOTSYN'}} = "checked='checked'";
@@ -112,12 +123,69 @@ $checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'";
 $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected';
 $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected';
 $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected';
+$selected{'MASQUERADE_GREEN'}{'off'} = '';
+$selected{'MASQUERADE_GREEN'}{'on'} = '';
+$selected{'MASQUERADE_GREEN'}{$settings{'MASQUERADE_GREEN'}} = 'selected="selected"';
+$selected{'MASQUERADE_ORANGE'}{'off'} = '';
+$selected{'MASQUERADE_ORANGE'}{'on'} = '';
+$selected{'MASQUERADE_ORANGE'}{$settings{'MASQUERADE_ORANGE'}} = 'selected="selected"';
+$selected{'MASQUERADE_BLUE'}{'off'} = '';
+$selected{'MASQUERADE_BLUE'}{'on'} = '';
+$selected{'MASQUERADE_BLUE'}{$settings{'MASQUERADE_BLUE'}} = 'selected="selected"';
 
-&Header::openbox('100%', 'center', $Lang::tr{'options fw'});
+&Header::openbox('100%', 'center',);
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 
-print <<END
+print <<END;
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='95%' cellspacing='0'>
+               <tr bgcolor='$color{'color20'}'>
+                       <td colspan='2' align='left'><b>$Lang::tr{'masquerading'}</b></td>
+               </tr>
+               <tr>
+                       <td align='left' width='60%'>$Lang::tr{'masquerade green'}</td>
+                       <td>
+                               <select name='MASQUERADE_GREEN'>
+                                       <option value='on' $selected{'MASQUERADE_GREEN'}{'on'}>$Lang::tr{'masquerading enabled'}</option>
+                                       <option value='off' $selected{'MASQUERADE_GREEN'}{'off'}>$Lang::tr{'masquerading disabled'}</option>
+                               </select>
+                       </td>
+               </tr>
+END
+
+       if (&Header::orange_used()) {
+               print <<END;
+                       <tr>
+                               <td align='left' width='60%'>$Lang::tr{'masquerade orange'}</td>
+                               <td>
+                                       <select name='MASQUERADE_ORANGE'>
+                                               <option value='on' $selected{'MASQUERADE_ORANGE'}{'on'}>$Lang::tr{'masquerading enabled'}</option>
+                                               <option value='off' $selected{'MASQUERADE_ORANGE'}{'off'}>$Lang::tr{'masquerading disabled'}</option>
+                                       </select>
+                               </td>
+                       </tr>
+END
+       }
+
+       if (&Header::blue_used()) {
+               print <<END;
+                       <tr>
+                               <td align='left' width='60%'>$Lang::tr{'masquerade blue'}</td>
+                               <td>
+                                       <select name='MASQUERADE_BLUE'>
+                                               <option value='on' $selected{'MASQUERADE_BLUE'}{'on'}>$Lang::tr{'masquerading enabled'}</option>
+                                               <option value='off' $selected{'MASQUERADE_BLUE'}{'off'}>$Lang::tr{'masquerading disabled'}</option>
+                                       </select>
+                               </td>
+                       </tr>
+END
+       }
+
+       print <<END
+       </table>
+
+       <br>
+
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td></tr>
 <tr><td align='left' width='60%'>$Lang::tr{'drop newnotsyn'}</td><td align='left'>on <input type='radio' name='DROPNEWNOTSYN' value='on' $checked{'DROPNEWNOTSYN'}{'on'} />/
@@ -174,8 +242,8 @@ print <<END
 </table>
 
 <br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<table width='100%' cellspacing='0'>
+<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <input type='submit' name='ACTION' value=$Lang::tr{'save'} />
 </form></td></tr>
 </table>