OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.

[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..00fa1b45a253c7637805b357e9314e7d184ff2b0 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
 }
@@ -113,7 +113,7 @@ $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected';
 $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected';
 $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected';
 
-&Header::openbox('100%', 'center', $Lang::tr{'options fw'});
+&Header::openbox('100%', 'center',);
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 
 print <<END
@@ -174,8 +174,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>