Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into rust

[people/mfischer/ipfire-2.x.git] / html / cgi-bin / ovpnmain.cgi

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index dc429d90c9ea256518dcad0d9c85ce8f11b6613e..42a7354fc9368efc249c24613dab2286b96de46a 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -977,7 +977,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n";
   print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n";
   print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n";
-  print SERVERCONF "dh ${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}\n";
+  print SERVERCONF "dh $dhparameter\n";
   print SERVERCONF "# Cipher\n";
   print SERVERCONF "cipher $cgiparams{'DCIPHER'}\n";
 
@@ -2710,7 +2710,7 @@ print <<END;
 <hr size='1'>
 <table width='100%'>
        <tr>
-               <td class'base'><b>$Lang::tr{'misc-options'}</b></td>
+               <td class='base'><b>$Lang::tr{'misc-options'}</b></td>
        </tr>
 
        <tr>
@@ -2765,7 +2765,7 @@ print <<END;
 <hr size='1'>
 <table width='100%'>
     <tr>
-       <td class'base'><b>$Lang::tr{'log-options'}</b></td>
+       <td class='base'><b>$Lang::tr{'log-options'}</b></td>
     </tr>
     <tr>
        <td width='20%'></td> <td width='30%'> </td><td width='25%'> </td><td width='25%'></td>
@@ -4648,7 +4648,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
        <tr><td colspan=4><hr /></td></tr><tr>
 
        <tr>
-               <td class'base'><b>$Lang::tr{'MTU settings'}</b></td>
+               <td class='base'><b>$Lang::tr{'MTU settings'}</b></td>
        </tr>
 
         <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td>
@@ -4672,7 +4672,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 
 <tr><td colspan=4><hr /></td></tr><tr>
        <tr>
-               <td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td>
+               <td class='base'><b>$Lang::tr{'ovpn crypt options'}:</b></td>
        </tr>
 
        <tr><td class='boldbase'>$Lang::tr{'cipher'}</td>
@@ -5222,7 +5222,7 @@ END
 
        <tr><td colspan='4'><br></td></tr>
        <tr>
-               <td class'base'><b>$Lang::tr{'net config'}:</b></td>
+               <td class='base'><b>$Lang::tr{'net config'}:</b></td>
        </tr>
     <tr><td colspan='1'><br></td></tr>
 
@@ -5239,7 +5239,7 @@ END
 
        <tr><td colspan='4'><br></td></tr>
        <tr>
-               <td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td>
+               <td class='base'><b>$Lang::tr{'ovpn crypt options'}:</b></td>
        </tr>
        <tr><td colspan='1'><br></td></tr>
 
@@ -5700,7 +5700,7 @@ END
 
        print <<END;
                <tr>
-                       <td class='base' $col3>$Lang::tr{'dh parameter'}</td>
+                       <td class='base' $col3>$Lang::tr{'dh'}</td>
                        <td class='base' $col3>$dhsubject</td>
                        <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
                        <input type='hidden' name='ACTION' value='$Lang::tr{'show dh'}' />
@@ -5716,7 +5716,7 @@ END
                # Nothing
                print <<END;
                <tr>
-                       <td width='25%' class='base' $col3>$Lang::tr{'dh parameter'}:</td>
+                       <td width='25%' class='base' $col3>$Lang::tr{'dh'}:</td>
                        <td class='base' $col3>$Lang::tr{'not present'}</td>
                        </td><td colspan='3' $col3>&nbsp;</td>
                </tr>